phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,474 Commits 3 Branches 0 Tags
bf59cd3ce1d750a4fe4b67af984fdfb5f2a6e1d7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell b96b152998 sponsor 2017-09-18 07:24:16 -05:00
Taylor Otwell 392ece3e4f Merge pull request #4416 from laravel/revert-4413-master 
Revert "Use database_path helper for sqlite database filename specified in .env"
 2017-09-11 08:04:20 -05:00
Taylor Otwell 80e96d276a Revert "Use database_path helper for sqlite database filename specified in .env" 2017-09-11 08:04:12 -05:00
Taylor Otwell d1cfd416ca Merge pull request #4413 from adrianharabula/master 
Use database_path helper for sqlite database filename specified in .env
 2017-09-09 23:12:43 +02:00
Taylor Otwell 26a0e8d758 remove sponsor 2017-09-06 10:20:27 -05:00
Taylor Otwell d93c8f177a Merge pull request #4409 from ThunderBirdsX3/master 
Update cache prefix.
 2017-09-06 14:20:04 +02:00
Taylor Otwell d4c622a0b8 add sponsor 2017-09-05 08:01:13 -05:00
Taylor Otwell 26eed641eb add sponsor 2017-08-23 12:32:36 -05:00
Taylor Otwell 37d39a7cf5 Merge pull request #4383 from scrubmx/patch-8 
Fix in comment in config/app.php
 2017-08-18 08:00:12 -05:00
Taylor Otwell d0ad72226e Merge pull request #4375 from decadence/patch-1 
require_once /vendor/autoload.php
 2017-08-15 08:24:34 -05:00
Taylor Otwell af2a4d47a3 Merge pull request #4374 from ikari7789/patch-1 
Change indent for package.json from 2 to 4 spaces
 2017-08-14 09:09:35 -05:00
Taylor Otwell 58ed5459b1 Merge pull request #4373 from marcusmoore/patch-2 
update example unit test to use RefreshDatabase trait
 2017-08-12 20:43:56 -05:00
Taylor Otwell bee41ce20b Merge pull request #4368 from keving91/patch-1 
Fixes "Cannot resolve directory'" in PhpStorm
 2017-08-12 15:35:39 -05:00
Taylor Otwell be143bf2dc Merge pull request #4364 from tomirons/patch-1 
[5.5] add whoops to dev dependencies
 2017-08-06 08:50:48 -05:00
Taylor Otwell a1ee424ac7 add sponsor 2017-08-01 12:15:51 -05:00
Taylor Otwell 8a50ccb617 Merge pull request #4350 from Te7a-Houdini/AddAuthDirective 
Add auth directive
 2017-07-25 22:27:56 -04:00
Taylor Otwell 7a9da9c164 Merge pull request #4351 from pierreneter/revert-4349-patch-1 
Revert "don't need it"
 2017-07-25 22:27:03 -04:00
Taylor Otwell 166d25b726 Merge pull request #4349 from pierreneter/patch-1 
don't need it
 2017-07-25 14:06:38 -04:00
Taylor Otwell e4de035371 Merge pull request #4347 from balping/patch-1 
Change hardcoded urls to named routes
 2017-07-25 06:25:08 -04:00
Taylor Otwell 7bcf7a5450 Merge pull request #4344 from djh101/develop 
Fixed trailing slash redirection for subdirectory installs.
 2017-07-23 06:35:09 -05:00
Taylor Otwell e19952fb19 Merge pull request #4340 from garygreen/remove-migrations-classmap 
Remove migrations from autoload classmap
 2017-07-22 09:44:05 -05:00
Taylor Otwell 134eafd12c remove things that aren't usually customized 2017-07-19 17:45:57 -05:00
Taylor Otwell 396634857e use exception status 2017-07-19 17:26:48 -05:00
Taylor Otwell c2e3cb9065 tweak default handler 2017-07-19 16:21:03 -05:00
Taylor Otwell ebc18e3aef update comment 2017-07-17 09:12:08 -05:00
Taylor Otwell 5d54c21ea8 auto loads commands 2017-07-17 09:11:10 -05:00
Taylor Otwell c4e142867c Merge pull request #4333 from DCzajkowski/develop 
Fixed CI
 2017-07-15 14:25:50 -05:00
Taylor Otwell fef413ff0e remove predis 2017-07-12 11:58:52 -05:00
Taylor Otwell 51f7e188a1 remove file 2017-07-12 11:58:33 -05:00
Taylor Otwell 1e4f3b9920 remove lock 2017-07-11 16:53:34 -05:00
Taylor Otwell 255c2bf1b7 Merge branch 'develop' of github.com:laravel/laravel into develop 2017-07-11 16:53:11 -05:00
Taylor Otwell d75800052d change default 2017-07-11 16:53:04 -05:00
Taylor Otwell 560bde8eb1 wip 2017-07-11 15:28:02 -05:00
Taylor Otwell 9a276e4ef5 wip 2017-07-11 15:25:52 -05:00
Taylor Otwell e109f4fcb0 wip 2017-07-11 15:24:40 -05:00
Taylor Otwell d0ce75926f Merge branch 'master' into develop 2017-07-11 13:26:38 -05:00
Taylor Otwell 8999e8745e tweak method 2017-07-06 12:28:57 -05:00
Taylor Otwell cec1b1bf94 fix error code 2017-07-06 12:27:35 -05:00
Taylor Otwell 4611d2bf31 stub listeners property 2017-07-06 12:08:40 -05:00
Taylor Otwell 3310063b59 add validation to exception handler 2017-07-06 11:49:51 -05:00
Taylor Otwell 098b8a4883 Merge pull request #4322 from kauhat/patch-1 
Ignore the Yarn error log
 2017-07-04 11:54:53 -05:00
Taylor Otwell 8d370ce7f2 Merge pull request #4311 from lucasmichot/feature/master/docblock 
[5.4] Fix docblock.
 2017-07-03 08:01:54 -05:00
Taylor Otwell df5b100521 formatting 2017-06-29 13:36:21 -05:00
Taylor Otwell d5bf06589f Merge pull request #4302 from bretterer/fix_trusted_proxies 
Fix to TrustProxies
 2017-06-29 07:27:14 -05:00
Taylor Otwell 9fec341e55 Merge pull request #4299 from lucasmichot/feature/master/npm-packages 
Upgrade axios and cross-env packages
 2017-06-27 08:35:21 -05:00
Taylor Otwell 5ae7c373fe Merge pull request #4294 from ovanschie/patch-1 
Require Laravel Mix 1.0
 2017-06-21 14:12:39 -05:00
Taylor Otwell 3acb739450 Merge pull request #4287 from laravel/top-secret-add-quotes-patch 
Add quotes
 2017-06-06 09:17:07 -05:00
Taylor Otwell e50ca3dc87 Merge pull request #4283 from laravel/mix-patch 
Simplify mix require
 2017-06-01 15:13:26 -05:00
Taylor Otwell 4247988ed9 Update webpack.mix.js 2017-06-01 15:13:18 -05:00
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 a9268c5f58 Merge pull request #4282 from m1guelpf/patch-1 
Dynamic changing locale
 2017-05-30 07:58:28 -05:00
Taylor Otwell 1a32543c09 Merge pull request #4279 from adiachenko/testsuite_names 
Simplify test suite names
 2017-05-27 20:27:55 -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 0f0178a577 Merge pull request #4261 from mhayes14/master 
Add missing IPv4/IPv6 validation messages
 2017-05-11 08:42:02 -04:00
Taylor Otwell 1155245a59 formatting. compile 2017-05-10 09:03:25 -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