Commit Graph

5462 Commits

Author SHA1 Message Date
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 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
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
Martin Bastien 489f2f311e Add missing path for Yarn Fix 2017-01-24 14:47:43 -05:00
Taylor Otwell d9f54e3454 Merge pull request #4113 from laravel/yarn-fix
Make scripts work with Yarn
2017-01-24 10:19:25 -06:00
Taylor Otwell e0a3b26517 update composer fil 2017-01-24 10:18:57 -06:00
Jeffrey Way 3fa134d1f1 Make scripts work with Yarn 2017-01-24 11:16:56 -05:00
Taylor Otwell fa7d9df436 Merge pull request #4111 from diogoazevedos/patch-2
Use const and destructuring assignment
2017-01-23 08:09:28 -06:00
Diogo Azevedo f4bc6e531a Use const and destructuring assignment 2017-01-22 22:12:50 -02:00
Taylor Otwell 182c889736 Merge pull request #4110 from laravel/fix
Bump Mix dependency
2017-01-22 10:27:46 -06:00
Jeffrey Way b6274c97a1 Bump Mix dependency 2017-01-22 02:08:18 -05:00
Taylor Otwell 5994e24215 Merge branch 'master' into develop 2017-01-21 10:15:21 -06:00
Taylor Otwell a9fad67e1f fix spacing 2017-01-21 10:15:05 -06:00
Drew Budwin d1fd418826 Fixed a typo in a block comment queue.php
Normally, words that start with vowels (like "unified") are preceded by "an" instead of "a."  However, "unified" is an exception to the rule.

Source: https://www.a-or-an.com/a_an/unified
2017-01-20 19:51:53 -05:00
Taylor Otwell 4abe343ab9 Merge pull request #4102 from TheoKouzelis/fix/pusher-config-names
[5.4] Change PUSHER enviroment variable names
2017-01-19 08:23:59 -06:00
Theo Kouzelis 1a5f5c6159 [5.4] Change PUSHER enviroment variable names 2017-01-18 20:56:57 +00:00
Taylor Otwell c679fb1a1e fix spacing 2017-01-17 16:00:28 -06:00
Taylor Otwell 100aa01088 rename mix command to dev 2017-01-17 15:58:53 -06:00
Taylor Otwell 54c5e1585a Trim and convert strings to nulls. 2017-01-17 15:35:36 -06:00
Taylor Otwell a205b127c6 add mix settings 2017-01-17 14:30:48 -06:00
Taylor Otwell 7cf27b2146 make env variables for aws 2017-01-17 07:41:12 -06:00
Taylor Otwell 590257fbf6 Comment out by default. 2017-01-16 11:08:54 -06:00
Taylor Otwell 01ad31584b add auth session middleware to web group 2017-01-16 11:08:54 -06:00