Commit Graph

6027 Commits

Author SHA1 Message Date
Dries Vints 7e6af5c031
Merge branch 'master' into develop 2019-05-07 17:52:54 +02:00
Dries Vints fbd3ad7bbb
Update changelog 2019-05-07 17:19:27 +02:00
Taylor Otwell b0e0bdc060 formatting 2019-05-07 07:38:15 -05:00
Mathieu TUDISCO 1086e26b32
Update database config relating to Url addition. 2019-05-07 13:49:22 +02:00
Taylor Otwell 4b78ba61ea fix conflicts 2019-05-06 08:30:56 -05:00
Taylor Otwell 65f8271032 update version 2019-05-06 08:30:33 -05:00
Dries Vints af15618b57
Merge pull request #5013 from laravel/revert-5012-feature/exported-files
Revert "Exclude StyleCI config from exported files"
2019-04-30 14:02:22 +02:00
Dries Vints ccea56b6f9 Revert "Exclude StyleCI config from exported files (#5012)"
This reverts commit a6bf24134d.
2019-04-30 14:02:09 +02:00
Roberto Aguilar a6bf24134d Exclude StyleCI config from exported files (#5012)
I noticed that this file was being included when i ran the
`laravel new` command and even though some developers will run StyleCI,
the purpose of this file seems more like it ensures the repository
quality rather than providing an starting point for this service.
2019-04-29 16:21:59 -05:00
Diego 3995828c13 [5.9] Minor grammar fix in readme.md (#5010)
* Fix grammar ('Boost *your* skills')

* Update readme.md
2019-04-26 07:26:45 -05:00
Dries Vints f70fff8ad2
Merge branch 'master' into develop 2019-04-25 13:28:34 +02:00
Taylor Otwell 50176732d6
Apply fixes from StyleCI (#5006) 2019-04-24 07:38:42 -05:00
Stefan Bauer 12a4885a47 Fix phpdoc to order by syntax convention (#5005)
Reorder the `@var` phpdoc syntax by convention, see http://docs.phpdoc.org/references/phpdoc/tags/var.html
2019-04-24 07:38:18 -05:00
Graham Campbell 60db703a27 [5.8] Enable JS on StyleCI (#5000)
* Enable JS on StyleCI
2019-04-23 07:44:51 -05:00
Dries Vints cedcbc863d
Merge branch 'master' into develop 2019-04-22 21:26:54 +02:00
Dries Vints f574aa76e3
Disable JS checks for now 2019-04-22 21:26:44 +02:00
Dries Vints bdc205c830
Merge branch 'master' into develop 2019-04-22 16:07:04 +02:00
Dries Vints 81fba471af
Merge pull request #4998 from laravel/analysis-z9QV6a
Apply fixes from StyleCI
2019-04-22 16:06:16 +02:00
Dries Vints 43b09ad0f3
Add file exclusions for styleci 2019-04-22 16:06:06 +02:00
Dries Vints 91dc5ed286 Apply fixes from StyleCI 2019-04-22 14:06:03 +00:00
Dries Vints 597201a049
Add StyleCI config 2019-04-22 15:55:40 +02:00
Taylor Otwell 06162adc98
Merge pull request #4990 from SjorsO/patch-1
Add IDE typehint to UserFactory
2019-04-14 15:41:37 -05:00
Sjors Ottjes ef1ce665ee
Update UserFactory.php 2019-04-14 13:30:53 +02:00
Dries Vints 0f58190c7b
Merge pull request #4989 from DrewRoberts/update-readme-laracasts
Update readme with Laracasts count
2019-04-12 12:06:24 +02:00
DrewRoberts 14b0a07d79 Update readme with Laracasts count 2019-04-12 01:34:48 -04:00
Taylor Otwell 20cdf65ae6
Merge pull request #4987 from DivineOmega/patch-1
[5.8] Remove underscore from cache prefix
2019-04-10 07:31:29 -05:00
Jordan Hall 1bed031c1f
Remove underscore as cache prefixes automatically have a colon appended to them 2019-04-10 12:01:28 +01:00
Taylor Otwell 005ec1301e
Merge pull request #4986 from DivineOmega/patch-1
[5.8] Add underscores to cache and redis database prefixes
2019-04-08 07:47:02 -05:00
Jordan Hall 3cbc5ac640
Additional underscore on cache prefix 2019-04-08 08:52:06 +01:00
Jordan Hall 159b0e79cd
Additional underscore on redis database prefix 2019-04-08 08:50:48 +01:00
Taylor Otwell 35374927bd
Merge pull request #4982 from DivineOmega/patch-1
[5.8] Prefix redis database connection by default
2019-04-05 08:55:41 -05:00
Jordan Hall e68ff0c66a
Use Str class instead of helper function 2019-04-04 22:18:28 +01:00
Jordan Hall c8bc79e94e
Prefix redis database connection by default to mitigate multiple sites on the same server potentially sharing the same queued jobs 2019-04-04 15:11:18 +01:00
Taylor Otwell ae44ee0059
Merge pull request #4979 from hyperhost/add-hyper-host-sponsor
Added Hyper Host sponsor
2019-04-01 10:54:27 -07:00
Tony James 88636c2268
Added Hyper Host sponsor
Added Hyper Host name and url
2019-04-01 16:23:23 +01:00
Taylor Otwell 3886012c0f
Merge pull request #4971 from Lenophie/patch-1
Ignore SQLite journals
2019-03-24 08:11:19 -07:00
Lenophie ccc1457e57
Ignore SQLite journals 2019-03-24 12:01:21 +01:00
Dries Vints e80327f299
Update changelog 2019-03-12 17:25:28 +01:00
Dries Vints cfd5929785
Merge branch 'master' into develop 2019-03-12 17:23:52 +01:00
Dries Vints 4997f08105
Update changelog 2019-03-12 17:23:00 +01:00
Taylor Otwell 3b852a1f7f
Merge pull request #4963 from chapeupreto/patch-1
[5.8] upgrade the collision dependency from v2 to v3
2019-03-08 08:03:29 -06:00
Rod Elias 54cd6d90bb
upgrade the collision dependency from v2 to v3 2019-03-07 23:20:15 -03:00
Dries Vints 3d325b8485
Update changelog 2019-03-05 15:12:13 +01:00
Taylor Otwell 3001f3c6e2 check if extension loaded 2019-02-28 14:31:42 -06:00
Taylor Otwell a0f6bcc773 comment out options 2019-02-28 08:34:10 -06:00
Taylor Otwell f4ff4f4176 comment 2019-02-27 07:24:37 -06:00
Taylor Otwell d4d4a69b76
Merge pull request #4956 from akalongman/master
[5.8] Use correct env name for AWS region from env.example
2019-02-27 07:20:20 -06:00
Avtandil Kikabidze b34328a166
Use correct env name for AWS region from env.example 2019-02-27 14:05:01 +04:00
Taylor Otwell f84a69ee85 add bucket to env example 2019-02-26 16:37:18 -06:00
Taylor Otwell ff4f40fbab set default region 2019-02-26 14:47:40 -06:00