phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,385 Commits 3 Branches 0 Tags
6db0f350fbaa21b2acf788d10961aba983a19be2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 6db0f350fb no longer needed with autodiscovery 2017-06-01 11:39:13 -05:00
Taylor Otwell 2f4d72699c update composer json 2017-06-01 11:26:43 -05:00
Taylor Otwell 38a8390ce7 Merge pull request #4275 from themsaid/updateAuthJSONError 
Update JSON error message structure
 2017-05-25 08:00:22 -05:00
Taylor Otwell 640293f297 Merge pull request #4278 from m1guelpf/patch-2 
Use current PHP version instead of using PATH
 2017-05-25 08:00:09 -05:00
Taylor Otwell 11dfcf6d1a fix conflicts 2017-05-07 09:56:20 -05:00
Taylor Otwell 6c1e42647e Merge pull request #4254 from FrittenKeeZ/patch-1 
Added port to sqlsrv settings
 2017-05-03 22:22:40 -05:00
Taylor Otwell 6dde426075 Merge pull request #4253 from insign/patch-1 
Add sqlsrv as group connection
 2017-05-03 13:25:52 -05:00
Taylor Otwell 2c6d76469a Merge pull request #4247 from laurencei/patch-1 
Revert Queue Prefix
 2017-04-28 16:46:22 -05:00
Taylor Otwell 1193702eea Merge branch 'master' of github.com:laravel/laravel 2017-04-27 15:05:30 -05:00
Taylor Otwell 1598e7cb70 fix wording 2017-04-27 15:05:22 -05:00
Taylor Otwell b3725e97b6 Merge pull request #4244 from B-07/patch-5 
fix typo
 2017-04-27 07:37:37 -05:00
Taylor Otwell b9c6353501 add sponsor 2017-04-26 09:04:12 -05:00
Taylor Otwell e605f54b92 Merge pull request #4240 from B-07/patch-1 
Update readme.md
 2017-04-26 07:42:33 -05:00
Taylor Otwell a521d4e718 Merge pull request #4241 from B-07/patch-2 
doctype uppercase to lowercase
 2017-04-26 07:42:00 -05:00
Taylor Otwell 859479a033 Merge pull request #4236 from caiquecastro/master 
Allow filesystem to be changed on config
 2017-04-24 07:50:02 -05:00
Taylor Otwell 6869a880b7 adjust wording 2017-04-21 11:39:59 -05:00
Taylor Otwell 743b13d952 Merge branch 'queue-prefix' of https://github.com/browner12/laravel into browner12-queue-prefix 2017-04-21 11:38:41 -05:00
Taylor Otwell 49a9f5fd50 Merge pull request #4234 from tillkruss/master 
Updated changelog
 2017-04-20 12:56:40 -05:00
Taylor Otwell 99da499cc8 Merge pull request #4232 from JuanDMeGon/patch-1 
Ignore the npm debug log
 2017-04-19 07:14:24 -05:00
Taylor Otwell b699ffabce Merge pull request #4229 from ebuster/patch-1 
More clear way to assign middleware in controller
 2017-04-18 07:41:14 -05:00
Taylor Otwell 164acc8d7a Merge pull request #4227 from joshmanders/patch-1 
Fix break from #4226
 2017-04-18 07:25:35 -05:00
Taylor Otwell 100f71e71a fix artisan 2017-04-18 07:24:50 -05:00
Taylor Otwell cae94000ca Merge pull request #4226 from diogoazevedos/develop 
Remove extra autoload file
 2017-04-17 17:06:12 -05:00
Taylor Otwell 0be3c212c4 Merge branch 'master' into develop 2017-04-17 15:32:01 -05:00
Taylor Otwell d905b2e7be only load libraries if present 2017-04-17 15:31:48 -05:00
Taylor Otwell 2f111d54ba Merge branch 'master' into develop 2017-04-17 15:30:50 -05:00
Taylor Otwell 17ec5c51d6 Move the location of Vue inclusion. 2017-04-17 15:30:36 -05:00
Taylor Otwell 15f8e2d45e Merge pull request #4219 from laravel/analysis-X0W3an 
Apply fixes from StyleCI
 2017-04-11 10:43:48 -05:00
Taylor Otwell bc91dcab93 Merge pull request #4212 from laurencei/patch-1 
Add string to validation
 2017-04-07 16:44:45 -05:00
Taylor Otwell 4696e7bcb6 fix conflicts 2017-04-07 08:11:06 -05:00
Taylor Otwell c6e3d6e5b4 Merge pull request #4208 from misenhower/fix-axios-defaults 
Add to axios defaults instead of overwriting them
 2017-04-06 21:13:00 -05:00
Taylor Otwell f7b9a590f9 Merge pull request #4203 from KristofMorva/sort-gitignore 
Sorting gitignore file
 2017-04-03 15:13:58 -05:00
Taylor Otwell d870a0c2ce Merge pull request #4204 from mdavis1982/make-app-name-configurable 
Make app name configurable in environment file
 2017-04-03 15:13:45 -05:00
Taylor Otwell 4882961b41 Merge pull request #4196 from DojoGeekRA/patch-1 
DRY some npm scripts
 2017-03-31 08:05:21 -05:00
Taylor Otwell 33c4cab6b7 adjust wording 2017-03-29 10:06:39 -05:00
Taylor Otwell e23a1d284f add trust proxy middleware 2017-03-29 10:05:16 -05:00
Taylor Otwell f5fd03d705 Merge pull request #4193 from KristofMorva/npm-windows 
NPM scripts should support Windows
 2017-03-29 08:14:37 -05:00
Taylor Otwell f16fbd1f8f Merge pull request #4190 from michaeldyrynda/master 
Provide consistency with NPM scripts
 2017-03-28 07:49:30 -05:00
Taylor Otwell f5b68b1fc5 Update package.json 2017-03-28 07:49:22 -05:00
Taylor Otwell 7ae5c3fcf8 Merge pull request #4191 from daylerees/add-vagrant-to-ignore 
Add vagrant virtual machine directory to git ignore list.
 2017-03-28 07:47:36 -05:00
Taylor Otwell 228bc47237 Merge pull request #4186 from tillkruss/patch-1 
Added changelog
 2017-03-27 11:24:35 -05:00
Taylor Otwell 643248834f Merge pull request #4189 from tabuna/patch-1 
Composer -o
 2017-03-27 08:59:32 -05:00
Taylor Otwell bc368c627b Merge pull request #4188 from themsaid/laravelMix 
Require laravel-mix v0.*
 2017-03-26 10:08:51 -05:00
Taylor Otwell 605ffb9ba9 rename example event 2017-03-25 21:17:15 -05:00
Taylor Otwell 5052f14fc4 Merge pull request #4187 from lioannou/patch-1 
Possible URL fix?
 2017-03-25 20:37:49 -05:00
Taylor Otwell dd8fd39055 correct link 2017-03-24 14:22:49 -05:00
Taylor Otwell d3760f7fbf Add sponsors to readme. 2017-03-24 14:22:06 -05:00
Taylor Otwell e83b2c795b Merge pull request #4184 from JuanDMeGon/patch-1 
The .js files should be vendored too
 2017-03-22 09:21:04 -05:00
Taylor Otwell 2312580af8 Merge pull request #4180 from halaei/unindex-token 
unindex token
 2017-03-17 13:04:12 -05:00
Taylor Otwell 1447a0ef50 Merge pull request #4182 from bbashy/patch-1 
Mailtrap now reference smtp. for their host value.
 2017-03-17 13:02:54 -05:00
Taylor Otwell 0c4f0f0a97 Merge pull request #4179 from bshaffer/add-socket-to-database-config 
Adds unix_socket to config/database.php for consistency
 2017-03-16 08:01:19 -05:00
Taylor Otwell fe5146f854 Merge pull request #4177 from al0mie/al0mie-patch-1 
common js style
 2017-03-14 11:21:33 -05:00
Taylor Otwell 31c2623018 update example 2017-03-14 08:31:54 -05:00
Taylor Otwell 05575687e0 Merge pull request #4174 from kossa/upgrade-mix 
Upgrade laravel-mix to 0.8.3
 2017-03-09 11:40:53 -06: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
Taylor Otwell 864a82918e fix comment 2017-03-06 08:50:01 -06: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
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
Taylor Otwell 48f44440f7 ignore testing dir 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
Taylor Otwell c1643bf0c5 Merge pull request #4151 from laravel/fix 
Refactor npm scripts
 2017-02-21 15:15:33 -06: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
Taylor Otwell 9b02e5fab8 Merge pull request #4141 from coolpraz/patch-1 
Update package.json
 2017-02-16 07:55:54 -06:00
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
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
Taylor Otwell d2d89124e6 Merge pull request #4135 from laravel/analysis-qJgPYE 
Apply fixes from StyleCI
 2017-02-03 10:07:05 -06:00
Taylor Otwell 6574b9dd75 Merge pull request #4133 from luisdalmolin/master 
Updated laravel-mix version
 2017-02-02 07:32:29 -06: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
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
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
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
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
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
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
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
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
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
Taylor Otwell fa7d9df436 Merge pull request #4111 from diogoazevedos/patch-2 
Use const and destructuring assignment
 2017-01-23 08:09:28 -06:00
Taylor Otwell 182c889736 Merge pull request #4110 from laravel/fix 
Bump Mix dependency
 2017-01-22 10:27:46 -06: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
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
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
Taylor Otwell a6d2034c91 Merge pull request #4098 from KennedyTedesco/compiled-5.4 
[5.4] Remove compile.php
 2017-01-14 19:13:35 -06:00
Taylor Otwell 1a48254e83 Merge pull request #4095 from laravel/revert-4093-fix/pusher-config 
Revert "[5.4] Change PUSHER enviroment variable names"
 2017-01-04 15:40:04 -06:00
Taylor Otwell 7b3e884757 Revert "[5.4] Change PUSHER enviroment variable names" 2017-01-04 15:39:53 -06:00
Taylor Otwell 251140ef8b use env var 2017-01-04 12:09:43 -06:00
Taylor Otwell 65d551002e remove url 2017-01-04 10:16:05 -06:00