Commit Graph

4845 Commits

Author SHA1 Message Date
hikouki 2f0ec593bc Modify post-root-package-install script.
Idempotence.
2016-07-28 12:10:54 +09:00
Graham Campbell e72d4a86e8 Merge branch '5.1' 2016-07-14 11:22:46 -07:00
Taylor Otwell 02274da8fd code formatting 2016-07-09 11:27:46 -05:00
Kamaro Lambert e3bd984b01 Removed unnecessary else 2016-07-09 11:44:42 +02:00
Taylor Otwell 98ca59dc8c Merge pull request #3826 from ngyikp/master
Add a fallback sans-serif font in case the custom font fails to load
2016-07-05 08:46:57 -05:00
Ng Yik Phang a2c081fd58 Add fallback sans-serif font in case the custom font fails to load 2016-07-05 19:31:21 +08:00
Taylor Otwell ba1e9ad828 Merge pull request #3824 from byCedric/master
Add language line for file validation rule
2016-07-01 08:16:37 -05:00
Cedric van Putten cd03204044 Add language line for file validation rule. 2016-07-01 10:52:07 +02:00
Taylor Otwell 2051351626 Merge pull request #3822 from halaei/expire-90
expire jobs after 90 seconds
2016-06-29 08:39:32 -05:00
halaei d3aff652bd expire jobs after 90 seconds 2016-06-29 12:11:40 +04:30
Taylor Otwell d6ca0a6dc6 Merge pull request #3819 from jrean/patch-1
Added session domain env configuration
2016-06-24 15:55:04 -05:00
Taylor Otwell 6e380aa8f2 Merge pull request #3820 from sbine/master
Make password_resets.created_at nullable
2016-06-24 10:33:14 -05:00
Sara Bine be7b2627ae Make password_resets.created_at nullable
Prevents MySQL assigning default CURRENT_TIMESTAMP
Related issue: laravel/framework#11518
2016-06-23 17:14:50 -06:00
Jean Ragouin 7e4c6e84df Added session domain env configuration
Session domain value available with env configuration
https://github.com/laravel/laravel/pull/3806
2016-06-22 23:10:07 +08:00
Taylor Otwell 47d7e2d490 Merge pull request #3811 from jerguslejko/fix/supported-drivers-docs
List supported drives in cache and broadcasting configs
2016-06-14 20:20:03 -04:00
Jerguš Lejko a20533c511 List supported drives in cache and broadcasting configs 2016-06-14 20:15:26 +02:00
Taylor Otwell 767801a317 working on formatting 2016-06-04 09:37:32 -05:00
Michael Dyrynda 7259c265e6 Add application log level configuration
This config option ties in with changes in fbd6e77 that were tagged in
v5.2.35 of the framework.
2016-06-04 09:58:04 +09:30
Taylor Otwell bee4dc1632 Merge pull request #3799 from drawmyattention/patch-1
Make TestCase abstract
2016-06-02 07:47:40 -05:00
Amo Chohan 7a449f86b9 Make TestCase abstract 2016-06-02 13:14:42 +01:00
Taylor Otwell b4024058bb Merge pull request #3789 from luqmanrom/master
Add missing Mandrill secret keys in config.services
2016-05-29 15:03:07 -05:00
Luqman Rom 9352968734 Add missing Mandrill secret keys in config.services 2016-05-29 21:47:02 +08:00
Taylor Otwell b6b948aaf7 Merge pull request #3767 from sadika9/fix_password_reset_guest_middleware
[5.2] Get guest middleware using guestMiddleware() method in ResetsPasswords
2016-05-18 09:22:14 -07:00
Taylor Otwell 0d762a22da Merge pull request #3775 from themsaid/dimensions-lang-line
Add language line for image dimensions validation rule
2016-05-11 09:31:04 -05:00
Mohamed Said da64a014e7 Add language line for image dimensions validation rule 2016-05-09 17:50:13 +02:00
Taylor Otwell f8cddc0000 Merge pull request #3770 from tillkruss/patch-2
Use Bootstrap 3.3
2016-05-01 22:13:00 -05:00
Till Krüss 382857a8a7 Use Bootstrap 3.3
Unless there is a reason why not?
2016-05-01 16:23:09 -07:00
Sadika Sumanapala 336d80c1f1 Get guest middleware using guestMiddleware() method
guestMiddleware() defined on ResetsPasswords trait

This change is required to fix issue #13383

Depends on pull request laravel/framework#13384
2016-04-30 12:39:22 +05:30
Taylor Otwell 76b8ef7204 remove post install just in case it causes problems 2016-04-27 08:01:12 -05:00
Taylor Otwell eee2a8b7c8 Merge pull request #3763 from vinkla/npm
Add npm scripts
2016-04-27 08:00:19 -05:00
Vincent Klaiber 909f063c28 Add npm scripts 2016-04-27 14:43:47 +02:00
Taylor Otwell d359343ca2 Merge pull request #3760 from tillkruss/patch-1
Switch to `.scss`
2016-04-24 20:16:16 -05:00
Till Krüss cf1c148778 Switch to `.scss` 2016-04-22 19:39:28 -07:00
Graham Campbell 2c834ad59c Respect PSR-2 2016-04-15 22:49:14 +01:00
Taylor Otwell 70f8bb6e08 Merge pull request #3738 from laravel/backport
[5.1] Backport various changes
2016-04-05 09:06:24 -05:00
Graham Campbell a6e0a2d190 Backport the composer script fixes 2016-04-05 11:23:29 +01:00
Graham Campbell 2dd40dfb40 Backport the phpunit fixes 2016-04-05 11:22:53 +01:00
Graham Campbell 3a2cfbc2f4 Backport the better faker default 2016-04-05 11:22:29 +01:00
Graham Campbell 2c446984a1 Backport some env tweaks 2016-04-05 11:22:18 +01:00
Graham Campbell b2ca69f318 Merge pull request #3737 from laravel/tweak
Tweaked config
2016-04-05 11:15:13 +01:00
Graham Campbell ce25be19eb Tweaked config 2016-04-05 11:15:06 +01:00
Graham Campbell 9fa63f8ce8 Merge pull request #3733 from jcxm360/patch-1
Update Kernel.php
2016-04-01 22:06:45 +01:00
Juan Martinez 0d8e71cd92 Update Kernel.php 2016-04-01 16:00:36 -05:00
Graham Campbell 933e6c61eb Merge pull request #3730 from laravel/typo
Fixed typo
2016-04-01 20:44:55 +01:00
Graham Campbell 541e66789b Fixed typo 2016-04-01 20:27:17 +01:00
Taylor Otwell 5450b3180f Merge pull request #3725 from laravel/phpunit
Fixed up the phpunit config
2016-04-01 13:25:56 -05:00
Taylor Otwell 72581c0b98 Merge pull request #3723 from JosephSilber/authorize-middleware
Add support for the authorize middleware and AuthorizesRequests trait
2016-04-01 13:19:40 -05:00
Taylor Otwell 32318c385a Merge pull request #3726 from laravel/patch
Bump package versions
2016-03-30 18:50:41 -05:00
Jeffrey Way ae1f392309 Bump package versions 2016-03-30 16:17:01 -04:00
Graham Campbell 28ea52d10b Fixed up the phpunit config 2016-03-30 19:52:07 +01:00