4647 Commits

Author SHA1 Message Date
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
v5.1.33
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
Taylor Otwell
94c9db25c3 Merge pull request #3717 from mauri870/5.1
[5.1] Fix clear-compiled error during composer installation
2016-03-28 08:16:22 -05:00
Mauri de Souza Nunes
3a555f9214 Fix clear-compiled on composer install 2016-03-28 07:08:48 -03:00
Taylor Otwell
8c27cb56d0 default to null 2015-12-07 12:05:42 -06:00
Taylor Otwell
4fba29c0ec fix problems 2015-12-07 12:03:49 -06:00
Taylor Otwell
1173e19293 Merge branch 'master' of https://github.com/SyntaxC4/laravel into SyntaxC4-master 2015-12-07 12:02:49 -06:00
Graham Campbell
6722b10051 Fixed typo 2015-12-02 18:24:00 +00:00
Graham Campbell
5d6a3cf2ce Merge pull request #3580 from jspekken/patch-1
Create a new middlware instance instead of filter.
2015-12-02 08:19:52 +00:00
Jelle Spekken
39f0cd727a Create a new middlware instance instead of filter.
Shouldn't this be middleware?
2015-12-02 08:59:51 +01:00
Cory Fowler
a33c66cf47 changed redis support to load config from env 2015-12-01 14:15:22 -08:00
Cory Fowler
e78d1af0fa added web.config 2015-12-01 14:15:02 -08:00
Taylor Otwell
90b6578e3e Merge pull request #3577 from laravel/revert-3576-patch-1
Revert "added queue prefix to match the framework"
2015-12-01 14:08:32 -06:00
Taylor Otwell
b847ee7486 Revert "added queue prefix to match the framework" 2015-12-01 14:08:26 -06:00
Taylor Otwell
7f216a4213 Merge pull request #3576 from pulkitjalan/patch-1
added queue prefix to match the framework
2015-12-01 14:07:57 -06:00
Pulkit Jalan
40ab9090aa added queue prefix to match the framework 2015-12-01 19:31:16 +00:00
Taylor Otwell
49c1a0dc44 Merge pull request #3568 from rspahni/patch-1
Wording "Reminder" => "Reset"
2015-11-25 16:05:00 -06:00
Taylor Otwell
7b263997e7 Merge pull request #3570 from anik786/patch-2
Remove unnecessary fully quantified name
2015-11-25 16:03:44 -06:00
Taylor Otwell
5cd4ba7255 Merge pull request #3573 from owen-it/master
[5.1] Remove alias Inspiring
2015-11-25 16:02:28 -06:00
Antério Vieira
f663e25b72 Remove alias inspire 2015-11-25 10:51:14 -02:00
Yahya Uddin
7398548320 Remove unnecessary fully quantified name
The class is unnessarily fully quantified and is an warning that is also flagged up in popular IDE's such as PHPStorm. It is also arguably bad practice as it can lead to problems if directories are moved in the future.
2015-11-25 00:12:44 +00:00
rspahni
8bf110f28d Update passwords.php 2015-11-24 16:32:01 +01:00
Taylor Otwell
1fac29099e Merge pull request #3567 from phleobon/patch-1
Bump Laravel Elixir version
2015-11-22 22:06:41 -06:00
Leobon Paul-Henri
6973c86f55 Bump Laravel Elixir version
Laravel elixir is now at version 4
2015-11-23 02:45:13 +01:00
Taylor Otwell
091489d17b Merge pull request #3564 from martinbean/patch-1
Change redirect when authenticated
2015-11-21 12:31:47 -06:00
Martin Bean
223191a9b0 Change redirect when authenticated
The route /home doesn’t exist in a default Laravel application, whereas / does.
2015-11-19 23:01:29 +00:00
Taylor Otwell
8476df5c9e Merge pull request #3551 from arcanedev-maroc/master
Updating the log system with env variable
2015-11-06 09:23:30 -06:00
ARCANEDEV
9a7145e495 Updating the log system with env variable 2015-11-05 18:08:21 +00:00
Taylor Otwell
270f0878a9 Merge pull request #3548 from CupOfTea696/master
required_unless lang line fix
2015-11-01 19:18:35 -06:00
CupOfTea696
f8e58cedb2 required_unless lang line fix 2015-11-01 17:54:19 +00:00
Taylor Otwell
8a49b4f137 add required_unless lang line 2015-10-31 13:38:22 -05:00
Graham Campbell
f2348b7897 Tweaked alignment 2015-10-30 18:19:00 +00:00
Taylor Otwell
e21667f2a6 Merge pull request #3543 from anakadote/master
Set Mail pretend config from .env
2015-10-29 16:24:47 -05:00
Taylor Collins
2aa135c01e Set Mail pretend config from .env 2015-10-29 12:36:54 -04:00
Taylor Otwell
54533fc037 spacing 2015-10-20 13:57:31 -07:00
Tuomas Koponen
77c5c1726f Change default value for queue.failed.database
Use same DB_CONNECTION enviroment variable for queue.failed.database config
2015-10-20 22:23:54 +03: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
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