457 Commits

Author SHA1 Message Date
Taylor Otwell
48fb9517d2 fix conclits 2015-12-07 12:04:59 -06:00
Taylor Otwell
4fba29c0ec fix problems 2015-12-07 12:03:49 -06:00
Taylor Otwell
b6625f5ced Merge remote-tracking branch 'origin/develop' into develop 2015-12-06 14:46:56 -06:00
Taylor Otwell
36db347a0c remove iron config. moved to package 2015-12-06 14:46:51 -06:00
Graham Campbell
b81af30b93 Remove default key 2015-12-06 19:50:14 +00:00
Taylor Otwell
2adbbbd91e update config 2015-12-04 22:50:20 -06:00
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
Cory Fowler
a33c66cf47 changed redis support to load config from env 2015-12-01 14:15:22 -08:00
Pulkit Jalan
72158f4a8f added queue prefix to match the framework 2015-12-01 20:27:51 +00:00
Taylor Otwell
b847ee7486 Revert "added queue prefix to match the framework" 2015-12-01 14:08:26 -06:00
Pulkit Jalan
40ab9090aa added queue prefix to match the framework 2015-12-01 19:31:16 +00:00
Antério Vieira
f663e25b72 Remove alias inspire 2015-11-25 10:51:14 -02:00
ARCANEDEV
9a7145e495 Updating the log system with env variable 2015-11-05 18:08:21 +00: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 Collins
2aa135c01e Set Mail pretend config from .env 2015-10-29 12:36:54 -04:00
Roman Kinyakin
86d1dfcf51 Redis connection setup in .env 2015-10-26 22:13:51 +06: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
f6b05ee3ce tweak options 2015-10-08 09:45:11 -05: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
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
Taylor Otwell
7d4b5d75ef Default auth service provider. 2015-08-29 20:27:18 -05:00
Taylor Otwell
c82c5eceda acl changes 2015-08-29 16:36:22 -05:00
Taylor Otwell
8061c2132c Convert some variables to env variables in services.php. 2015-07-23 10:58:17 -05:00
Graham Campbell
7e303014b6 Sync with 5.0 2015-06-15 22:22:23 +01:00
Bas Peters
2c4964e159 Set default charset for sqlsrv driver to utf8 2015-06-11 17:20:30 +02:00
Taylor Otwell
bacda07552 Change default cipher. 2015-06-06 13:20:49 -05:00
Romain Lanz
4b3391f6f0 Use PHP 5.5 ::class property in config files
See https://github.com/laravel/laravel/pull/3402
2015-06-05 14:58:10 +02:00
Graham Campbell
4c291abfe8 Added back cipher config 2015-06-04 16:40:28 +01:00
Taylor Otwell
f0cad014cf remove cipher option 2015-06-03 15:08:26 -05:00
Graham Campbell
bf3785d0bc Additional cs fixes
Signed-off-by: Graham Campbell <graham@cachethq.io>
2015-06-01 15:46:45 +01:00
Graham Campbell
060938bc66 PSR-2
Signed-off-by: Graham Campbell <graham@cachethq.io>
2015-06-01 15:46:32 +01:00
Jimmy Puckett
4ee6523dfa Using the path parameter in the path method. 2015-05-28 15:31:26 -04:00
Taylor Otwell
2e2ead5915 Merge branch 'develop' of github.com:laravel/laravel into develop 2015-05-26 16:15:35 -05:00
Taylor Otwell
dff91c9f44 update filesystem config. 2015-05-26 16:15:28 -05:00
Marcelo Canina
5c16c21817 Add env variable to database default connection 2015-05-25 15:46:57 -03:00
Mulia Arifandi Nasution
4341e3c933 Remove unnecessary whitespace 2015-05-10 13:56:52 +07:00
Patrick Brouwers
1c4dcea2a2 Add log driver to broadcasting connections 2015-05-06 11:02:13 +02:00
Taylor Otwell
71e339146e Merge pull request #3351 from fideloper/patch-1
Documented availability of SES mail driver in mail config
2015-04-28 09:18:56 -05:00
Taylor Otwell
b7c237397b Redis configuration. 2015-04-27 15:52:54 -05:00