Commit Graph

4965 Commits

Author SHA1 Message Date
Taylor Otwell fc12337663 Merge pull request #3675 from yava9221/master
clearing redundancy
2016-02-29 10:00:41 -06:00
yava9221 b51630005b clearing redundancy 2016-02-29 08:42:43 -07:00
Taylor Otwell 7093812f80 Merge pull request #3674 from themsaid/language-for-distinct
Add language line to the validation "distinct" rule
2016-02-28 11:11:09 -06:00
Mohamed Said c36799ddde Add language line to the validation "distinct" rule 2016-02-28 17:08:13 +00:00
Taylor Otwell 83fd3f29e7 Merge pull request #3672 from themsaid/add-language-line-for-present-validation-rule
Add language line for the "present" validation rule.
2016-02-26 09:27:48 -06:00
Mohamed Said fa6c48d27c keep the lines sorted 2016-02-26 14:59:54 +00:00
Mohamed Said ef6b5a6343 Add language line for the "present" validation rule. 2016-02-26 08:49:55 +00:00
Taylor Otwell aa07b0c699 Merge pull request #3670 from SammyK/password-column-fix
Fix password column for future hashing
2016-02-23 21:12:28 -06:00
SammyK 531629e442 Fix password column for future hashing 2016-02-23 20:07:18 -06:00
Taylor Otwell 754d78ec8e Merge remote-tracking branch 'origin/master' 2016-02-22 22:19:36 -06:00
Taylor Otwell 62d62a0524 update method call 2016-02-22 22:19:31 -06:00
Taylor Otwell dec392623a Merge pull request #3668 from lucasmichot/feature/master/eof
Ensure files finish with a LB
2016-02-22 10:38:04 -06:00
Lucas Michot 73c6898e1d Ensure files finish with a LB 2016-02-22 10:23:06 +01:00
Graham Campbell 413c88f114 Merge pull request #3666 from krienow/patch-56c8bf
Add newline character.
2016-02-20 20:27:42 +00:00
krienow e8e73c8866 Add newline character. 2016-02-20 20:37:02 +01:00
Taylor Otwell e4f7ff9ef1 Merge pull request #3661 from AdenFraser/AppUrlEnv
APP_URL added to Environment Configuration
2016-02-17 20:29:42 -06:00
Aden Fraser 278c41887c APP_URL added to Environment Configuration 2016-02-17 23:29:24 +00:00
Taylor Otwell 770f8a7453 Merge pull request #3660 from anthonyholmes/master
Rename commented default seeder call
2016-02-16 13:53:22 -06:00
Anthony Holmes 94b568b59d Rename commented default seeder call
Rename commented default seeder call to be consistent with official docs
2016-02-16 13:42:33 -06:00
Taylor Otwell b1ccb8f0de Merge pull request #3659 from camilorojas/patch-1
Missing point
2016-02-16 13:37:39 -06:00
Camilo Rojas 0ab4b1d5aa MIssing point 2016-02-16 14:45:04 -03:00
Taylor Otwell 40f9630449 Merge pull request #3658 from martinbean/patch-2
Use safeEmail() in user factory instead
2016-02-16 07:42:37 -06:00
Martin Bean 00e5c4465c Use safeEmail instead
Faker’s `email` method can accidentally generate email addresses. This ensures “safe” addresses are only ever generated by the factory, to avoid spamming actual mailboxes if mail was sent in a loop etc.
2016-02-16 12:02:26 +00:00
Taylor Otwell c751b33d01 add to gitignore 2016-02-12 09:05:19 -06:00
Taylor Otwell 85e6774d2e simplify filesystem default config 2016-02-11 10:19:57 -06:00
Taylor Otwell 00f07ff382 Merge remote-tracking branch 'origin/master' 2016-02-10 16:56:42 -06:00
Taylor Otwell 8e137b525c adding public directory to app storage 2016-02-10 16:55:42 -06:00
Graham Campbell 6654309ed2 Merge branch 'master' into develop 2016-02-05 14:33:51 +00:00
Taylor Otwell 7aa988d491 Merge pull request #3645 from david-ridgeonnet/patch-1
Added default engine in configuration
2016-02-04 08:36:50 -06:00
david-ridgeonnet 89d693b5e6 Added default engine in configuration 2016-02-03 14:34:03 +00:00
Graham Campbell e18a57c1ff Merge branch 'master' into develop 2016-01-29 22:23:05 +00:00
Taylor Otwell 01e3d8f288 Merge pull request #3640 from martinbean/patch-1
[5.2] Make Memcached options configurable.
2016-01-29 13:17:29 -06:00
Taylor Otwell ce7c1fedb3 Merge pull request #3641 from jspringe/fix-envexample
.env.example - Changed localhost to 127.0.0.1
2016-01-29 08:22:20 -06:00
jspringe 2b1cc83171 Changed localhost to 127.0.0.1 2016-01-28 13:42:43 -05:00
Martin Bean db6bb6a369 Make Memcached options configurable. 2016-01-28 15:38:52 +00:00
Taylor Otwell eb59458d17 Merge pull request #3637 from gaomd/fix-readme
Fix title heading level in readme.md
2016-01-24 13:08:28 -06:00
Taylor Otwell 70355f3066 Merge pull request #3636 from paulvl/master
Handle authorization header
2016-01-23 11:32:08 -06:00
Paul Vidal 85e8d21ef2 handle authorization header 2016-01-23 12:02:55 -05:00
Mengdi Gao ccdba9ff6f Fix title heading level in readme.md 2016-01-24 00:55:54 +08:00
Taylor Otwell c6931d266a Merge pull request #3635 from JacobBennett/patch-1
[5.2] Don't return a login page to a JSON request
2016-01-22 12:00:37 -06:00
Jacob Bennett 5b3c5f3f4e Don't return a login page to a JSON request
Currently, any unauthorized API requests that pass through the `auth` middleware get a redirect to the login page. Adding the `wantsJson` flag to the conditional corrects this behavior.
2016-01-22 10:01:39 -06:00
Graham Campbell 6cccc9ccc2 Merge branch 'master' into develop 2016-01-14 16:12:06 +00:00
Taylor Otwell e46a73ddb7 Merge remote-tracking branch 'origin/master' 2016-01-14 10:08:58 -06:00
Taylor Otwell c83c0b97f1 change exception 2016-01-14 10:08:49 -06:00
Taylor Otwell a07fcf2803 Merge pull request #3613 from n1c/patch-1
Fix tab to spaces in web.config
2015-12-30 07:15:01 -06:00
Nic 115083bdf2 Fix tab to spaces in web.config 2015-12-30 12:06:35 +02:00
Graham Campbell 84c7435dee Updated for 5.3 2015-12-27 16:11:56 +00:00
Taylor Otwell e6dff08752 Merge pull request #3606 from phecho/patch-1
Change redirecTo in AuthController
2015-12-25 07:10:59 -06:00
phecho 99b97ca7ca Change redirecTo in AuthController 2015-12-25 15:41:28 +08:00
Taylor Otwell 2b940ce5ec return statement not needed here 2015-12-23 12:02:21 -06:00