Commit Graph

4729 Commits

Author SHA1 Message Date
Taylor Otwell 3fa12671ce adjusting comments 2015-12-03 22:26:09 -06:00
Taylor Otwell ff35b10a3d working on config 2015-12-03 22:08:12 -06:00
Taylor Otwell b0160f5ed6 update defaults 2015-12-03 17:10:09 -06:00
Taylor Otwell 0898381839 update name to reflect purpose 2015-12-03 12:28:41 -06:00
Taylor Otwell a690bb7552 fix conflicts 2015-12-03 12:26:26 -06:00
Taylor Otwell 8414d45cdc update middleware and config 2015-12-03 12:25:38 -06:00
Graham Campbell f426638445 Merge branch 'master' into develop 2015-12-02 18:24:27 +00:00
Graham Campbell 6722b10051 Fixed typo 2015-12-02 18:24:00 +00:00
Taylor Otwell 4eb28ba069 base controller doesn't have to be abstract. 2015-12-02 08:21:23 -06: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 b685435ecc Merge pull request #3578 from pulkitjalan/patch-1
added queue prefix to match the framework
2015-12-01 14:53:31 -06:00
Pulkit Jalan 72158f4a8f added queue prefix to match the framework 2015-12-01 20:27:51 +00: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 8611ded0cc Merge pull request #3558 from GrahamForks/deps
[5.2] Added two symfony deps to require-dev
2015-11-14 12:24:35 -06:00
Taylor Otwell 10f242eaa5 remove lock 2015-11-13 16:17:17 -06:00
Graham Campbell 99a11eafb2 Added symfony deps to require-dev 2015-11-13 22:12:11 +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 9ad221b15c Merge pull request #3547 from laravel/analysis-8b2da8
Applied fixes from StyleCI
2015-10-31 13:40:39 -05:00
Taylor Otwell a383c8447c Applied fixes from StyleCI 2015-10-31 14:40:32 -04:00
Taylor Otwell c6ed15e126 Merge branch 'master' into develop 2015-10-31 13:38:28 -05:00
Taylor Otwell 8a49b4f137 add required_unless lang line 2015-10-31 13:38:22 -05:00
Taylor Otwell b89502ed82 Just use base user by default. 2015-10-30 14:14:51 -05:00
Graham Campbell 13b799196b Revert bad changes to the exception handler 2015-10-30 18:54:41 +00:00
Taylor Otwell c18ee4917d Remove unneeded table name. 2015-10-30 13:39:07 -05:00
Graham Campbell 4cefc88f4b Merge branch 'master' into develop 2015-10-30 18:20:17 +00:00
Graham Campbell f2348b7897 Tweaked alignment 2015-10-30 18:19:00 +00:00
Graham Campbell 1aefbc9a54 Merge branch 'master' into develop
Conflicts:
	config/mail.php
2015-10-30 18:17:48 +00:00
Graham Campbell ed18fd99fd Removed config option for deleted feature 2015-10-30 18:15:40 +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 4b1322e9a0 Merge remote-tracking branch 'origin/develop' into develop 2015-10-29 09:59:38 -05:00