Commit Graph

5128 Commits

Author SHA1 Message Date
Taylor Otwell 31fce5c503 change wording 2016-09-06 20:49:16 -05:00
Francisco Daniel 30d0e2dcca fix comments 2016-09-06 17:39:17 -05:00
Taylor Otwell 7f06559971 Merge pull request #3929 from bryceadams/patch-map-api-before-web
[5.3] Map API routes before Web routes
2016-09-05 09:41:38 -05:00
Bryce Adams 78f4e85f74 Map API routes before Web routes 2016-09-05 20:54:21 +10:00
Taylor Otwell 7da6edf8c1 working on message 2016-09-02 08:48:07 -05:00
Mohamed Said 1562407562 add langiage line for uploaded validation rule 2016-09-02 15:41:18 +02:00
Taylor Otwell a4b53b394c Merge pull request #3922 from jasonmccreary/https-only-cookie-env
Environment configuration for HTTPS only cookie
2016-09-02 07:53:55 -05:00
Taylor Otwell a70dd5622b Merge pull request #3923 from fernandobandeira/patch-1
Lang Alphabetical Order
2016-09-02 07:37:19 -05:00
Fernando Henrique Bandeira dd1e64a7a4 Changing order 2016-09-02 08:39:34 -03:00
Jason McCreary 41b0560375 Environment configuration for HTTPS only cookie 2016-09-01 21:22:34 -04:00
Taylor Otwell c92c724dbf Merge pull request #3921 from jackmu95/add-mimetypes-translation
Add missing translation for `mimetypes` validation
2016-09-01 13:21:39 -05:00
Jacob Müller 537b6288fb Add missing translation for `mimetypes` validation 2016-09-01 17:25:33 +02:00
Taylor Otwell d09efa26d2 remove irrelevant comment 2016-09-01 09:01:57 -05:00
Taylor Otwell 07360db40a Merge pull request #3913 from ngyikp/master
Add fallback sans-serif font in case the custom font fails to load
2016-08-28 18:11:47 +01:00
Taylor Otwell d7fb66ca9b Merge pull request #3914 from dersvenhesse/patch-1
Adding description for default inspire command
2016-08-28 18:08:19 +01:00
dersvenhesse 330a9aaa96 Adding description for default inspire command 2016-08-28 13:17:43 +02:00
Ng Yik Phang 8fc2e7e0a4 Add fallback sans-serif font in case the custom font fails to load 2016-08-28 13:53:23 +08:00
Taylor Otwell 1cb19ac911 Merge pull request #3910 from restored18/master
Add web.config for IIS
2016-08-26 22:20:33 +01:00
restored18 366f8ab23a Add web.config 2016-08-26 14:33:46 -05:00
Taylor Otwell 63e0cdc493 Merge pull request #3909 from Rkallenkoot/patch-1
Sorted the Application Service Providers alphabetically
2016-08-26 12:39:50 +01:00
Roelof Kallenkoot f19c16c023 Sorted the Application Service Providers alphabetically
Minor change to stay consistent
2016-08-26 00:16:58 +02:00
Taylor Otwell de81dd38d1 Merge pull request #3906 from greabock/patch-1
Change .env PUSHER_* params order
2016-08-25 01:21:58 +02:00
Роман Сохарев 9c7fad23e7 Change .env PUSHER_* params order
jsut same order ![](http://dl2.joxi.net/drive/2016/08/25/0005/0117/381045/45/81e6171678.jpg)
2016-08-25 05:57:45 +07:00
Taylor Otwell 362383d7c5 Merge pull request #3904 from scrubmx/patch-5
[5.3] Remove extra whitespace in config/cache.php
2016-08-24 10:28:57 +02:00
Jorge González 82357a563a Remove extra whitespace in config/cache.php 2016-08-23 22:39:29 -05:00
Taylor Otwell f5dfa2057e fix typo 2016-08-23 15:14:23 +02:00
Taylor Otwell 99de565ae7 change composer file 2016-08-23 15:09:36 +02:00
Taylor Otwell 6f6851946b fix conflicts 2016-08-23 15:08:01 +02:00
Taylor Otwell e959c22840 Merge pull request #3899 from heruputra/patch-1
Fix order
2016-08-22 05:05:17 -05:00
Heru Hang Tryputra a14dc56a7f Fix order
Fix .gitignore items in alphabetical order.
2016-08-22 17:02:27 +07:00
Taylor Otwell b05598b57b Merge remote-tracking branch 'origin/develop' into develop 2016-08-21 07:49:47 -05:00
Taylor Otwell cf0875a655 move middleware to route 2016-08-21 07:49:37 -05:00
Taylor Otwell a2c075bd30 Merge pull request #3894 from adamwathan/53-precomputed-hash
Use precomputed hash instead of bcrypt in ModelFactory
2016-08-21 07:35:24 -05:00
Adam Wathan 3435710575 Use implicit null instead of explicit 2016-08-21 14:29:10 +02:00
Adam Wathan 792dcd48c8 Compute hash only once and store in static variable 2016-08-21 14:23:50 +02:00
Adam Wathan b041a03878 Use precomputed hash instead of bcrypt in ModelFactory 2016-08-21 12:31:02 +02:00
Mohamed Said aed59d9f7a remove brackets 2016-08-21 01:17:41 +02:00
Mohamed Said c0b95238c9 Remove defalut auth:api middleware 2016-08-21 01:01:52 +02:00
Taylor Otwell 268953862f fix order 2016-08-19 16:24:19 -05:00
Taylor Otwell d84c4990fd Merge pull request #3891 from socieboy/develop
[5.3] Add BROADCAST_DRIVER on .env
2016-08-19 16:24:03 -05:00
Frank Sepulveda 8998cf5533 Add BROADCAST_DRIVER on .env
Having pusher keys, the file should contain the key for the broadcast also.
2016-08-19 10:42:01 -07:00
Taylor Otwell e596cef035 Merge pull request #3889 from adriaanzon/patch-1
Use module name instead of path
2016-08-19 11:09:53 -05:00
Taylor Otwell ffd7ad912e Revert recent changes to env file. 2016-08-19 07:20:12 -05:00
Adriaan Zonnenberg 7571f2b5b4 Use module name instead of path 2016-08-18 21:46:38 +02:00
Taylor Otwell c7a1c7d773 Ship a console routes file by default. 🌊 2016-08-16 19:44:31 -05:00
Taylor Otwell 57b57bf1b3 Merge pull request #3880 from BrandonSurowiec/patch-2
Update email address
2016-08-16 07:39:01 -05:00
Taylor Otwell 9fb8af19d7 Merge pull request #3881 from BrandonSurowiec/patch-4
Update server.php email address
2016-08-16 07:38:53 -05:00
Brandon Surowiec 6f055a9b47 Update server.php email address 2016-08-16 00:13:51 -04:00
Brandon Surowiec 97fde5bff9 Update email address 2016-08-16 00:11:58 -04:00
Taylor Otwell 982e769d2a Merge pull request #3874 from lancepioch/patch-1
[5.2] Add TokenMismatchException to the dontReport array
2016-08-15 19:21:15 -05:00