phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
6,292 Commits 3 Branches 0 Tags
482d68a182bdd629e5d4d3c19d5d7d7623dd074a
Commit Graph
63 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Graham Campbell 2c69ec987e Merge branch '6.x' into master 2020-08-26 09:39:37 +01:00
Graham Campbell 0512f00664 Set framework version ^7.24 2020-08-07 17:29:43 +01:00
Graham Campbell e96840e206 Set framework version ^6.18.35 2020-08-07 17:28:47 +01:00
Graham Campbell b3f600415d Merge branch '6.x' into master 2020-08-07 11:09:47 +01:00
Graham Campbell 6628b7a1b4 Merge branch '6.x' 2020-03-24 13:55:12 +00:00
Graham Campbell 36373983ad Merge branch '6.x' 2020-03-06 11:48:34 +00:00
Graham Campbell 705076ffc2 Bumped min guzzle 2020-02-24 14:48:16 +00:00
Graham Campbell 3233e6f809 Merge branch 'master' into develop 2020-02-24 14:47:21 +00:00
Graham Campbell 2503ed687f Merge branch 'master' into develop 2020-01-24 13:48:38 +00:00
Graham Campbell 7e5a915485 Merge branch 'master' into develop 2019-12-31 12:26:17 +00:00
Graham Campbell 8af8af0cbf Merge branch 'master' into develop 2019-12-28 00:35:40 +00:00
Graham Campbell db940594ad Merge branch 'master' into develop 2019-12-24 17:45:25 +00:00
Graham Campbell 5d50d30c94 Bumped versions 2019-11-27 15:26:11 +00:00
Graham Campbell fb3e88c313 Merge branch 'master' into develop 2019-11-27 15:21:41 +00:00
Graham Campbell b659069bce Merge branch 'master' into develop 2019-11-01 11:52:38 +00:00
Graham Campbell bfd4b1e92f Update .styleci.yml 2019-11-01 11:51:17 +00:00
Graham Campbell 89a80da132 Merge branch 'master' into develop 2019-11-01 11:12:48 +00:00
Graham Campbell 386a4e5c92 Merge branch 'master' into develop 2019-06-21 14:24:52 +01:00
Graham Campbell 8067ed6dd3 Merge branch 'master' into develop 2017-12-26 12:32:52 +00:00
Graham Campbell 0da4d7db6f Merge branch 'master' into develop 2017-12-18 11:31:05 +00:00
Graham Campbell d7b0e32786 Remove the "mail" driver as recommended, and add "array" 2016-12-29 13:17:27 +00:00
Graham Campbell 380c3a76a0 Added tinker to the default app 2016-12-29 13:06:11 +00:00
Graham Campbell 36875bb98e Merge branch 'master' into develop 2016-12-29 13:03:32 +00:00
Graham Campbell 7a851c75d9 Merge pull request #4005 from carlosmtrinidad/master 
Remove space in _variables.scss
 2016-10-17 09:21:02 +01:00
Graham Campbell 9f9300442d Merge pull request #3842 from spyric/develop 
Remove removed routes file
 2016-07-30 17:42:21 -04:00
Graham Campbell b6bd185048 Merge branch 'master' into develop 2016-05-30 12:03:49 +01:00
Graham Campbell 728151f5de Applied fixes from StyleCI 2016-05-13 14:19:42 -04:00
Graham Campbell 332731f88b Added the new bindings middleware 2016-05-13 19:19:27 +01:00
Graham Campbell 020bf231ba Merge branch 'master' into develop 2016-04-27 14:00:46 +01:00
Graham Campbell 2c834ad59c Respect PSR-2 2016-04-15 22:49:14 +01:00
Graham Campbell a6e0a2d190 Backport the composer script fixes 2016-04-05 11:23:29 +01:00
Graham Campbell 2dd40dfb40 Backport the phpunit fixes 2016-04-05 11:22:53 +01:00
Graham Campbell 3a2cfbc2f4 Backport the better faker default 2016-04-05 11:22:29 +01:00
Graham Campbell 2c446984a1 Backport some env tweaks 2016-04-05 11:22:18 +01:00
Graham Campbell b2ca69f318 Merge pull request #3737 from laravel/tweak 
Tweaked config
 2016-04-05 11:15:13 +01:00
Graham Campbell ce25be19eb Tweaked config 2016-04-05 11:15:06 +01:00
Graham Campbell 9fa63f8ce8 Merge pull request #3733 from jcxm360/patch-1 
Update Kernel.php
 2016-04-01 22:06:45 +01:00
Graham Campbell 933e6c61eb Merge pull request #3730 from laravel/typo 
Fixed typo
 2016-04-01 20:44:55 +01:00
Graham Campbell 541e66789b Fixed typo 2016-04-01 20:27:17 +01:00
Graham Campbell 28ea52d10b Fixed up the phpunit config 2016-03-30 19:52:07 +01:00
Graham Campbell 0909dc2572 Merge branch 'master' into develop 2016-03-30 13:11:35 +01:00
Graham Campbell 413c88f114 Merge pull request #3666 from krienow/patch-56c8bf 
Add newline character.
 2016-02-20 20:27:42 +00:00
Graham Campbell 6654309ed2 Merge branch 'master' into develop 2016-02-05 14:33:51 +00:00
Graham Campbell e18a57c1ff Merge branch 'master' into develop 2016-01-29 22:23:05 +00:00
Graham Campbell 6cccc9ccc2 Merge branch 'master' into develop 2016-01-14 16:12:06 +00:00
Graham Campbell 84c7435dee Updated for 5.3 2015-12-27 16:11:56 +00:00
Graham Campbell 6d1bb6d4ed Merge pull request #3596 from brayniverse/patch-1 
Typo in docs
 2015-12-20 20:15:19 +00:00
Graham Campbell b81af30b93 Remove default key 2015-12-06 19:50:14 +00:00
Graham Campbell f426638445 Merge branch 'master' into develop 2015-12-02 18:24:27 +00:00
Graham Campbell 6722b10051 Fixed typo 2015-12-02 18:24:00 +00:00
Graham Campbell 5d6a3cf2ce Merge pull request #3580 from jspekken/patch-1 
Create a new middlware instance instead of filter.
 2015-12-02 08:19:52 +00:00
Graham Campbell 99a11eafb2 Added symfony deps to require-dev 2015-11-13 22:12:11 +00:00
Graham Campbell 13b799196b Revert bad changes to the exception handler 2015-10-30 18:54:41 +00:00
Graham Campbell 4cefc88f4b Merge branch 'master' into develop 2015-10-30 18:20:17 +00:00
Graham Campbell f2348b7897 Tweaked alignment 2015-10-30 18:19:00 +00:00
Graham Campbell 1aefbc9a54 Merge branch 'master' into develop 
Conflicts:
	config/mail.php
 2015-10-30 18:17:48 +00:00
Graham Campbell ed18fd99fd Removed config option for deleted feature 2015-10-30 18:15:40 +00:00
Graham Campbell 69c33f8928 Merge pull request #3518 from martinssipenko/phpunit-fix 
Removed unused option
 2015-10-07 14:09:15 +01:00
Graham Campbell e20ad70463 Merge branch 'master' into develop 2015-08-30 12:33:04 +01:00
Graham Campbell 716e65268a Merge pull request #3491 from laravel/analysis-zObJlq 
Applied fixes from StyleCI
 2015-08-30 12:31:33 +01:00
Graham Campbell 35654d761d Applied fixes from StyleCI 2015-08-30 07:31:25 -04:00
Graham Campbell 350a0f18df Merge branch 'master' into develop 2015-08-01 11:10:45 +01:00
Graham Campbell 614edf79d3 Fixed the exception handler 2015-07-13 19:51:20 +01:00