Commit Graph

4550 Commits

Author SHA1 Message Date
Taylor Otwell 69076cb13f Merge remote-tracking branch 'origin/master' 2015-06-20 14:56:33 -05:00
Taylor Otwell 7a8800c6b4 add Homestead.yaml to gitignore 2015-06-20 14:56:23 -05:00
Taylor Otwell 3b0d03920e Merge pull request #3426 from Phyxsius/patch-2
Maintain alphabetical order
2015-06-16 09:38:18 -05:00
Andy d64b5a52af Maintain alphabetical order 2015-06-16 08:46:07 -05:00
Graham Campbell 7e303014b6 Sync with 5.0 2015-06-15 22:22:23 +01:00
Taylor Otwell 15d6f3fe15 remove stability setting 2015-06-14 17:53:36 -05:00
Taylor Otwell 63ba6decb3 remove prefer stable 2015-06-14 17:46:57 -05:00
Taylor Otwell 5033b85080 Merge pull request #3421 from barryvdh/patch-1
Set minimum stability to stable
2015-06-14 17:45:10 -05:00
Barry vd. Heuvel 26b6b8e5ff Set minimum stability to stable 2015-06-14 20:55:13 +02:00
Taylor Otwell 136d7fa8ef Merge pull request #3418 from baspeters/feature/sqlsrv-default-charset
Set default charset for sqlsrv driver to utf8
2015-06-11 13:28:25 -05:00
Bas Peters 2c4964e159 Set default charset for sqlsrv driver to utf8 2015-06-11 17:20:30 +02:00
Taylor Otwell f6e6508b4e Merge pull request #3416 from krienow/doctype
Fix doctype declarations
2015-06-11 09:17:39 -05:00
Kai Rienow 44787b0c10 fix css 2015-06-11 13:18:02 +02:00
Kai Rienow 936aa9159e fix doctype declarations 2015-06-11 12:43:52 +02:00
Taylor Otwell fa756ff4c2 Merge pull request #3415 from martinssipenko/master
Added whitelist to remove warning for upcoming phpunit 4.8
2015-06-10 12:52:22 -05:00
Martins Sipenko 19e97fc9db Added whitelist to remove warning for upcoming phpunit 4.8 2015-06-10 18:13:13 +01:00
Taylor Otwell 347b928a0f Bump elixir requirement. 2015-06-09 09:16:53 -05:00
Taylor Otwell ff441abd62 fix conflicts 2015-06-09 07:48:02 -05:00
Taylor Otwell f9ed4ff7ac Override cookie encrypter by default. 2015-06-08 21:16:01 -05:00
Taylor Otwell 9a70a4b2b1 Update PHP dependencies. 2015-06-08 20:40:07 -05:00
Taylor Otwell a1a55fe274 Merge pull request #3410 from pespantelis/class-notation
Use the ::class notation
2015-06-08 10:02:51 -05:00
Pantelis Peslis 16e37cb370 Use the ::class notation 2015-06-08 10:29:33 +03:00
Taylor Otwell 6df868a123 Merge pull request #3409 from antonybudianto/patch-1
Update latest CDN
2015-06-07 22:28:19 -05:00
Antony Budianto 6ab4004af9 Update latest CDN
If needed.
2015-06-08 09:50:22 +07:00
Taylor Otwell bacda07552 Change default cipher. 2015-06-06 13:20:49 -05:00
Taylor Otwell e4796a2608 Merge pull request #3405 from nWidart/patch-1
Use the ::class notation
2015-06-05 08:51:20 -05:00
Nicolas Widart 58db25b9f5 Use the ::class notation
Prefix the namespace with \
2015-06-05 15:45:08 +02:00
Taylor Otwell 86e53af851 Merge pull request #3403 from RomainLanz/patch-1
Use PHP 5.5 ::class property in config files
2015-06-05 08:04:22 -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 1ba2816d37 Merge remote-tracking branch 'origin/develop' into develop 2015-06-03 15:08:32 -05:00
Taylor Otwell f0cad014cf remove cipher option 2015-06-03 15:08:26 -05:00
Taylor Otwell 9293247585 Merge pull request #3398 from crynobone/feature/root-install
[5.1] Move copying .env.example to post-root-package-install
2015-06-02 08:19:11 -05:00
crynobone 2ac993f8d3 [5.1] Move copying .env.example to post-root-package-install
post-create-project-cmd is executed only after post-install-cmd and this
could cause issue on the first installation (via composer
create-project) where environment is not prepared hence `php artisan
optimize` would generate `compiled.php`.

Signed-off-by: crynobone <crynobone@gmail.com>
2015-06-02 10:26:07 +08:00
Taylor Otwell 9b6d5f4237 Merge pull request #3399 from GrahamForks/cs
CS
2015-06-01 09:49:27 -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
Graham Campbell c77a389277 Tabs to spaces
Signed-off-by: Graham Campbell <graham@cachethq.io>
2015-06-01 15:46:23 +01:00
Taylor Otwell f871b7d0f3 Merge pull request #3397 from phaza/patch-2
Enable model guarding after doing seeds
2015-05-31 13:57:08 -05:00
Peter Haza 03a27fa0b2 Enable model guarding after doing seeds
Leaving models unguarded can cause all kinds of havoc if someone uses seeds in their tests.
Best to default to reguard after doing the seeds.
2015-05-31 20:33:11 +02:00
Taylor Otwell 6575cb74f8 Merge pull request #3395 from spinen/feature/usePathParameter
Using the path parameter in the path method.
2015-05-28 14:45:11 -05:00
Jimmy Puckett 4ee6523dfa Using the path parameter in the path method. 2015-05-28 15:31:26 -04:00
Taylor Otwell c3128ad92a import trait 2015-05-28 10:15:09 -05: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
Taylor Otwell bb6c23c2eb Merge pull request #3392 from Fuxy22/patch-1
Fix occasional clear-compiled failure after update
2015-05-26 10:46:34 -05:00
Norbert Fuksz c334e47219 Update composer.json
Clear compiled can fail after update it should be run before update
2015-05-26 16:38:42 +01:00
Taylor Otwell 685e3cf0fa Merge pull request #3390 from marcanuy/develop
Add env variable to database default connection
2015-05-25 16:47:03 -05:00
Marcelo Canina 5c16c21817 Add env variable to database default connection 2015-05-25 15:46:57 -03:00
Taylor Otwell d68b5b883f Merge pull request #3388 from GrahamForks/faker
Add faker to require-dev
2015-05-25 08:43:36 -05:00