Commit Graph

4623 Commits

Author SHA1 Message Date
Ben Sampson
2a3743b0fa PSR-2 formatting of User model?
> Lists of implements MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one interface per line.

https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md#41-extends-and-implements
2015-10-26 13:21:38 +00:00
Taylor Otwell
d15ab4b82e Alpha order. 2015-10-14 09:34:10 -05:00
Taylor Otwell
68738b5015 Change exceptions to ignore. 2015-10-14 09:09:56 -05:00
Taylor Otwell
37363acacd Clean up exception handler. Add new ignores. 2015-10-14 08:46:25 -05:00
Taylor Otwell
5b08ff0b34 Merge branch 'master' into develop 2015-10-14 08:43:14 -05:00
Taylor Otwell
421c0d0aba Merge remote-tracking branch 'origin/master' 2015-10-08 09:45:20 -05:00
Taylor Otwell
f6b05ee3ce tweak options 2015-10-08 09:45:11 -05:00
Graham Campbell
69c33f8928 Merge pull request #3518 from martinssipenko/phpunit-fix
Removed unused option
2015-10-07 14:09:15 +01:00
Martins Sipenko
8ac73d90f2 Removed unused option 2015-10-07 14:19:49 +03:00
Ian Olson
bcbc2f8265 Updated trailing comma on array key => value to pass StyleCI. 2015-10-04 23:53:11 -05:00
Ian Olson
6917c35c33 Added options to the broadcasting pusher configuration file. 2015-10-04 23:46:56 -05:00
Taylor Otwell
b1b33c8527 Merge pull request #3511 from JosephSilber/no-unguard
Remove unguard call
2015-10-04 17:55:13 -05:00
Joseph Silber
d0a6e8818a Remove unguard call 2015-10-04 10:50:12 -04:00
Taylor Otwell
b0a22fc511 Merge pull request #3501 from crynobone/feature/use-this
[5.1] Use $this instead of parent.
2015-09-21 12:43:32 -05:00
crynobone
50357d8bab Use $this instead of parent.
Signed-off-by: crynobone <crynobone@gmail.com>
2015-09-21 12:00:44 +08:00
Taylor Otwell
24575f4b89 Merge pull request #3500 from pedes42/master
Replace storage_path with database_path helper
2015-09-18 07:56:38 -05:00
pedes42
879bc14650 Replace storage_path with database_path helper
According to the docs, the sqlite database should be located within the "database" folder.
2015-09-18 14:16:52 +02:00
Graham Campbell
e20ad70463 Merge branch 'master' into develop 2015-08-30 12:33:04 +01:00
Graham Campbell
716e65268a Merge pull request #3491 from laravel/analysis-zObJlq
Applied fixes from StyleCI
2015-08-30 12:31:33 +01:00
Graham Campbell
35654d761d Applied fixes from StyleCI 2015-08-30 07:31:25 -04:00
Taylor Otwell
7d4b5d75ef Default auth service provider. 2015-08-29 20:27:18 -05:00
Taylor Otwell
420e813498 Implement interface. 2015-08-29 16:51:13 -05:00
Taylor Otwell
72a10c64c2 Define HasAbilities trait on default user. 2015-08-29 16:42:19 -05:00
Taylor Otwell
9bb3c9fb3e Merge remote-tracking branch 'origin/master' 2015-08-29 16:36:28 -05:00
Taylor Otwell
c82c5eceda acl changes 2015-08-29 16:36:22 -05:00
Taylor Otwell
f40e72fa2f Merge pull request #3484 from Zarthus/patch/views-use-https
Use https rather than // for google fonts in default views.
2015-08-17 11:33:03 -05:00
Jos Ahrens
b8790d5352 Use https rather than // for google fonts in default views.
Ensure the default views always use HTTPS for the loading of fonts. This is overall a good practise to follow.
2015-08-17 18:05:47 +02:00
Taylor Otwell
2ddeae9c71 Merge pull request #3480 from bmitch/JsonErrorMsg
Error message for JSON validation
2015-08-16 12:17:00 -05:00
Bill Mitchell
33272b3d8b Error message for JSON validation 2015-08-16 16:34:28 +01:00
Taylor Otwell
749bb11ab9 Merge pull request #3478 from krienow/remove-phpspec-yml
remove phpspec.yml
2015-08-08 19:34:58 -05:00
Kai Rienow
5e9398f497 remove phpspec yml 2015-08-09 02:26:00 +02:00
Taylor Otwell
f047f80dc0 fix incorrect method name in comment. 2015-08-08 08:07:23 -05:00
Taylor Otwell
9c66082972 fix type hitns 2015-08-06 12:49:41 -05:00
Taylor Otwell
58e4045f6d remove phpspec 2015-08-06 12:44:12 -05:00
Taylor Otwell
c131299976 fix conflicts 2015-08-06 12:43:57 -05:00
Taylor Otwell
395b69b540 fix status code 2015-08-06 12:07:35 -05:00
Taylor Otwell
f478406894 Merge remote-tracking branch 'origin/master' 2015-08-06 12:07:10 -05:00
Taylor Otwell
da7376d461 working on exception handling for model not found. 2015-08-06 12:07:04 -05:00
Graham Campbell
350a0f18df Merge branch 'master' into develop 2015-08-01 11:10:45 +01:00
Taylor Otwell
51299e78cd Merge pull request #3468 from laracasts/patch-1
Bump Laravel Elixir version
2015-07-28 09:04:45 -05:00
Laracasts
64e1cf9812 Bump Laravel Elixir version 2015-07-27 13:42:38 -04:00
Taylor Otwell
9d82fc6007 Merge pull request #3467 from andrewhood125/homestead-json
Ignore Homestead.json
2015-07-25 21:04:59 -05:00
Andrew Hood
12386cf670 Ignore Homestead.json 2015-07-25 12:57:52 -07:00
Taylor Otwell
8061c2132c Convert some variables to env variables in services.php. 2015-07-23 10:58:17 -05:00
Taylor Otwell
0cf34a3bc0 Merge pull request #3465 from jumilla/patch-1
Sorted by alphabetic.
2015-07-23 08:47:41 -05:00
Fumio Furukawa
191c68766d Sorted by alphabetic.
Sorted by alphabetic.
2015-07-23 15:34:28 +09:00
Taylor Otwell
9b359ba24c Merge pull request #3459 from jonathantorres/new-line
Newline on .env.example
2015-07-17 21:45:57 -05:00
Jonathan Torres
fef3aa0709 Newline. 2015-07-17 23:27:24 +00:00
Taylor Otwell
5964dcf97a Merge pull request #3456 from sileence/bcrypt_password_factory
Using the bcrypt function in users generated by the model factory
2015-07-13 20:40:02 -05:00
Graham Campbell
614edf79d3 Fixed the exception handler 2015-07-13 19:51:20 +01:00