5332 Commits

Author SHA1 Message Date
Kouceyla
29db165c6a Upgrade laravel-mix to 0.8.3 2017-03-09 17:58:00 +01:00
Taylor Otwell
76480e1115 Merge branch 'master' of github.com:laravel/laravel 2017-03-08 11:20:29 -06:00
Taylor Otwell
b0846539b1 fix cascade 2017-03-08 11:20:18 -06:00
Taylor Otwell
bd35127413 Merge pull request #4167 from driesvints/fix-cross-env-bin
Fix cross-env binary
2017-03-06 13:00:33 -06:00
Dries Vints
65c4d16d04
Do not use full paths 2017-03-06 12:39:46 +01:00
Dries Vints
f0374e4fe6
Add cross-env as a dependency and update paths 2017-03-06 12:36:45 +01:00
Taylor Otwell
d0a6dbf1a2 Merge pull request #4165 from zlatevbg/use-consistent-config-paths
[5.4] Use consistent config paths
2017-03-05 10:33:18 -06:00
Dimitar Zlatev
63dc985f2f Use consistent config paths 2017-03-05 13:30:16 +02:00
Taylor Otwell
9ce2f8ebc9 Merge pull request #4162 from eklundkristoffer/crossenv
[5.4] Fix cross-env bin path
2017-03-04 16:50:23 -06:00
Kristoffer Eklund
df1f0f912a Fix cross-env bin path 2017-03-04 18:54:33 +01:00
Kristoffer Eklund
eab39557ac Fix cross-env bin path 2017-03-04 17:57:34 +01:00
Taylor Otwell
48f44440f7 ignore testing dir v5.4.15 2017-03-03 08:39:45 -06:00
Taylor Otwell
95505693a2 Merge pull request #4157 from driesvints/patch-1
[5.4] Update description of filled rule
2017-03-01 09:53:33 -06:00
Dries Vints
90886732cf Update description of filled rule
`filled` isn't really required. It just implies that it needs a value.
2017-03-01 16:52:59 +01:00
Jeffrey Way
c76716f228 Revert npm script refactor 2017-02-23 09:50:35 -05:00
Taylor Otwell
c1643bf0c5 Merge pull request #4151 from laravel/fix
Refactor npm scripts
2017-02-21 15:15:33 -06:00
Jeffrey Way
96f662a625 Refactor npm scripts
Per #4147, this adds a new `npm run watch-poll` command, and dries up some of those long repetitive commands.
2017-02-21 13:57:31 -05:00
Taylor Otwell
da9760fd09 Merge pull request #4143 from kneipp/master
Change hard-coded '/login' param to named route
2017-02-17 13:38:43 -06:00
Fabrício Kneipp
39338373b9 Change hard-coded '/login' string to named route 2017-02-17 15:36:28 -02:00
Taylor Otwell
9b02e5fab8 Merge pull request #4141 from coolpraz/patch-1
Update package.json
2017-02-16 07:55:54 -06:00
Prabhat Shahi
e8b4f0e6ce Update package.json
update laravel mix to new version
2017-02-16 11:51:31 +05:45
Taylor Otwell
6dbde06814 Merge pull request #4138 from rickbolton/master
Updated axios, jQuery, Laravel Mix, Lodash and Vue.js versions
2017-02-08 08:27:49 -06:00
Rick Bolton
0257612e8a Updated axios, jQuery, Laravel Mix, Lodash and Vue.js versions 2017-02-08 09:30:06 +00:00
Taylor Otwell
0cb107c84c move fontsls v5.4.9 2017-02-03 15:49:27 -06:00
Taylor Otwell
f0f1a13f61 Merge pull request #4136 from ahmed3mar/patch-1
Add font path variable
2017-02-03 15:48:51 -06:00
Ahmed M. Ammar
2cc5f349d4 Add font path variable 2017-02-03 18:21:04 +02:00
Taylor Otwell
d2d89124e6 Merge pull request #4135 from laravel/analysis-qJgPYE
Apply fixes from StyleCI
2017-02-03 10:07:05 -06:00
Mohamed Said
be631a6693 Apply fixes from StyleCI 2017-02-03 16:06:59 +00:00
Mohamed Said
a6fdc9472f Put back configuration for sendmail 2017-02-03 18:06:39 +02:00
Taylor Otwell
6574b9dd75 Merge pull request #4133 from luisdalmolin/master
Updated laravel-mix version
2017-02-02 07:32:29 -06:00
Luis Dalmolin
ae03042300 Updated laravel-mix version 2017-02-02 10:01:16 -02:00
Taylor Otwell
1f4bf240a6 Merge pull request #4131 from crynobone/patch-1
Laravel 5.4 explicitly require phpunit 5.7.0+
2017-01-31 19:25:16 -06:00
Mior Muhammad Zaki
926f53bcc0 Laravel 5.4 explicitly require phpunit 5.7.0+
As demonstrated in laravel/framework#17699 it is possible to have phpunit being installed with a lower than `5.7.0`, which doesn't work at all on 5.4 due to the changes with PHPUnit namespaced class.
2017-02-01 09:04:07 +08:00
Taylor Otwell
1306ff2583 Merge pull request #4130 from atefBB/patch-1
Add App locale as default value of 'lang' attribute
2017-01-31 07:41:46 -06:00
Atef Ben Ali
72a76c021e Add App locate as default value of 'lang' attribute
Add App locate as default lang in the app.php config file instead of 'en' of 'lang' attribute in the main view.
2017-01-31 14:10:21 +01:00
Taylor Otwell
64bea7ca71 Merge pull request #4129 from laravel/revert-4126-patch-1
Revert "Append '@' to let composer resolve PHP executable"
2017-01-30 16:29:47 -06:00
Taylor Otwell
095fa50f7b Revert "Append '@' to let composer resolve PHP executable" 2017-01-30 16:29:40 -06:00
Taylor Otwell
7a44ebefe3 Merge pull request #4128 from monomichael/master
Make Axios automatically send `X-CSRF-TOKEN` in the header
2017-01-30 14:39:52 -06:00
Michael Zhang
0cdcc779bf Make axios automatically send the X-CSRF-TOKEN 2017-01-30 12:07:53 -05:00
Taylor Otwell
d0c5c041f2 Merge pull request #4126 from timgws/patch-1
Append '@' to let composer resolve PHP executable
2017-01-30 07:46:35 -06:00
Tim Groeneveld
cc42c3fe0a Append '@' to let composer resolve PHP executable
To execute PHP scripts, you can use `@php` which will automatically resolve to whatever
php process is currently being used.

See https://getcomposer.org/doc/articles/scripts.md#executing-php-scripts
for more information.
2017-01-30 17:26:30 +10:00
Taylor Otwell
1e6859799b Merge pull request #4124 from vantoozz/vantoozz-patch-1
Remove redundant check from bootstrap/autoload.php
2017-01-28 06:58:02 -06:00
Ivan Nikitin
1078776e95 Remove redundant check from bootstrap/autoload.php
Redundant check removed since compiled class file generation was removed
09964cc8c0 (diff-7b18a52eceff5eb716c1de268e98d55dL870)
2017-01-28 14:18:03 +03:00
Taylor Otwell
547bb962f9 Merge pull request #4121 from jpmurray/patch-1
Remove the hot file from versionning
2017-01-26 20:54:50 -06:00
Jean-Philippe Murray
d4d5330bbb Remove the hot file from versionning
Following https://github.com/laravel/framework/pull/17571, I was correctly pointed that the small proposition should be made over here. Here's a copy / past of my message, for clarity's sake.
---

When you run `npm run hmr`, a `hot` file is created to the public folder for the `mix()` helper to know if it has to server from the webpack server or not. This file does not go away until we run `npm run dev` (or `watch`). 

True, if we use `npm run production` in our production server it goes away too, but in case we don't make it go away in development, I don't think it's necessary to version it.
2017-01-26 21:22:52 -05:00
Taylor Otwell
8c6e40caee Merge pull request #4117 from fzoske/windows-fix
Ensure cross-env gets executed by node
v5.4.3
2017-01-25 07:08:04 -06:00
fzoske
c55b8efe72 Ensure cross-env gets executed by node 2017-01-25 11:05:42 +01:00
Taylor Otwell
99ec094434 Merge pull request #4115 from ericdowell/ericdowell-patch-1
Update composer.json to contain autoload-dev for Test namespace
2017-01-24 16:47:33 -06:00
Eric Dowell
bf33e17022 Update composer.json
Only autoload the tests namespace in dev.
2017-01-24 15:44:09 -06:00
Taylor Otwell
f1430cedce Merge pull request #4114 from yuters/patch-2
Add missing path for Yarn Fix
2017-01-24 14:46:55 -06:00