phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
6,228 Commits 3 Branches 0 Tags
d82bf9768b5d486d08159c191bec8a3d7b426436
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dries Vints 876142d709 Update CHANGELOG.md 2020-03-03 20:42:38 +01:00
Dries Vints 2d7b45bfb4 Merge branch '6.x' 
# Conflicts:
#	CHANGELOG.md
 2020-03-03 18:18:11 +01:00
Dries Vints e773d3885b Update CHANGELOG.md 2020-03-03 18:15:59 +01:00
Dries Vints d7c602c164 Update app.php (#5237) 2020-02-27 10:30:43 -06:00
Dries Vints 0b14a741eb Update app.php (#5237) 2020-02-27 09:26:30 -06:00
Dries Vints 88a763e36f Update app.php (#5237) 2020-02-27 09:21:15 -06:00
Dries Vints d529de062d Update composer.json 2020-02-13 16:03:25 +01:00
Dries Vints d038d1f6b6 Update composer.json 2020-02-13 16:00:10 +01:00
Dries Vints b1f35786eb Merge branch 'master' into develop 2020-01-14 17:52:04 +01:00
Dries Vints 9d0862b334 Merge pull request #5201 from aimeos/master 
Use file session driver again
 2020-01-14 17:50:01 +01:00
Dries Vints 94f8ee3cad Merge branch 'master' into develop 
# Conflicts:
#	CHANGELOG.md
 2020-01-09 12:42:11 +01:00
Dries Vints b46c16b424 Update CHANGELOG.md 2020-01-09 12:41:21 +01:00
Dries Vints 89e83915e9 Merge pull request #5175 from canvural/patch-1 
[6.x] Update redirectTo return type PHPDoc
 2019-12-16 11:35:41 +01:00
Dries Vints f4b1dc6df0 [6.x] Implement integration test and in-memory DB (#5169) 
* Use in-memory DB for testing

* Extend from PHPUnit test case for unit tests
 2019-12-06 09:46:02 -06:00
Dries Vints c473b53626 Merge branch 'master' into develop 
# Conflicts:
#	CHANGELOG.md
 2019-11-21 18:29:26 +01:00
Dries Vints 1ee38a10f8 Update CHANGELOG.md 2019-11-21 18:28:39 +01:00
Dries Vints 3c92fb3a19 Merge branch 'master' into develop 2019-11-12 17:35:09 +01:00
Dries Vints c15a5ee0d2 Update readme 2019-11-12 17:34:53 +01:00
Dries Vints 21f2478481 Merge branch 'master' into develop 2019-11-12 16:06:22 +01:00
Dries Vints 94056af6e8 Rename readme 2019-11-12 16:06:05 +01:00
Dries Vints 5780189402 Consistent readme 2019-11-12 16:05:52 +01:00
Dries Vints 2e2be97c26 Implement new primary key syntax (#5147) 2019-11-01 08:53:14 -04:00
Dries Vints dfa5c1f06e Merge branch 'master' into develop 
# Conflicts:
#	CHANGELOG.md
 2019-10-08 18:39:31 +02:00
Dries Vints 39c28801e8 Update CHANGELOG.md 2019-10-08 18:38:11 +02:00
Dries Vints ba3aae6c33 Implement password confirmation 2019-10-08 13:45:40 +02:00
Dries Vints 4036f17416 Remove middleware from password reset 
It's not necessary for the user to be logged out when resetting their password. This allows users to reset their password while logged in. Can be used in combination with the new RequiresPassword middleware.
 2019-10-08 13:39:57 +02:00
Dries Vints 050c1d880e Add new password rule language line 2019-10-08 11:26:03 +02:00
Dries Vints ccef55ba55 Merge branch 'master' into develop 
# Conflicts:
#	CHANGELOG.md
 2019-09-10 20:42:16 +02:00
Dries Vints 7d72850619 Update CHANGELOG.md 2019-09-10 20:41:25 +02:00
Dries Vints 1f48b2c5e8 Merge branch 'master' into develop 2019-09-10 17:27:12 +02:00
Dries Vints e656932002 Apply fixes from StyleCI (#5100) 2019-09-10 17:26:00 +02:00
Dries Vints 79fb6af96e Order imports alphabetically 2019-09-10 17:25:19 +02:00
Dries Vints 55b314eadb Update CHANGELOG.md 2019-09-09 18:41:28 +02:00
Dries Vints 00c00b87be Merge branch 'master' into develop 2019-09-09 18:40:26 +02:00
Dries Vints 4dbe9888a5 Update CHANGELOG.md 2019-09-09 18:39:25 +02:00
Dries Vints 9f2f3b1eee Merge branch '5.8' 
# Conflicts:
#	CHANGELOG.md
 2019-09-09 18:29:25 +02:00
Dries Vints ca3f91e7ed Update CHANGELOG.md 2019-09-09 18:29:02 +02:00
Dries Vints 8b96bf0128 Update CHANGELOG.md 2019-09-09 18:26:19 +02:00
Dries Vints cb5047c200 Merge branch 'master' into develop 2019-09-09 18:03:17 +02:00
Dries Vints 2967197b8e Merge branch 'master' into develop 2019-09-06 13:14:50 +02:00
Dries Vints af15fe5ec6 Revert "Bump PHPUnit" 
This reverts commit 5fde1337d6.
 2019-09-03 15:54:41 +02:00
Dries Vints 5fde1337d6 Bump PHPUnit 2019-09-03 15:54:00 +02:00
Dries Vints 054bb43038 Laravel 7 2019-09-03 15:53:35 +02:00
Dries Vints 665dfc4328 [6.0] Use phpredis as default Redis client (#5085) 
* Use phpredis as default Redis client

Follow up for https://github.com/laravel/framework/pull/29688

It's best that we already start using `phpredis` as a default to discourage usage of Predis.

* Update database.php
 2019-08-22 08:22:14 -05:00
Dries Vints c07809e224 Merge branch 'master' into develop 
# Conflicts:
#	config/services.php
 2019-08-14 13:49:52 +02:00
Dries Vints 83d2ecc0e9 Remove Stripe config settings 
These now ship with a dedicated config file for Cashier.
 2019-08-13 18:19:40 +02:00
Dries Vints 4852f48346 Remove deprecated language line (#5074) 2019-08-12 07:48:54 -05:00
Dries Vints a5111cf70f Merge branch 'master' into develop 2019-08-12 11:56:28 +02:00
Dries Vints d5691a2e6d Add missing trailing semicolon 2019-08-06 14:32:07 +02:00
Dries Vints 5391cccaad Update version constraint (#5066) 2019-07-29 11:22:12 -04:00
Dries Vints 0dd31baf2a Merge branch 'master' into develop 2019-07-25 00:49:45 -04:00
Dries Vints a7a1f44018 Merge branch 'master' into develop 2019-05-21 15:16:00 +02:00
Dries Vints 762e987e5b Uppercase doctype 
In similar fashion as https://github.com/laravel/framework/pull/28583
 2019-05-21 15:15:32 +02:00
Dries Vints 1c824f6f9f Merge branch 'master' into develop 2019-05-21 13:41:13 +02:00
Dries Vints fe9f8497d9 Remove services deleted from core 
See https://github.com/laravel/framework/pull/28441 and https://github.com/laravel/framework/pull/28442
 2019-05-07 17:57:29 +02:00
Dries Vints 7e6af5c031 Merge branch 'master' into develop 2019-05-07 17:52:54 +02:00
Dries Vints fbd3ad7bbb Update changelog 2019-05-07 17:19:27 +02:00
Dries Vints af15618b57 Merge pull request #5013 from laravel/revert-5012-feature/exported-files 
Revert "Exclude StyleCI config from exported files"
 2019-04-30 14:02:22 +02:00
Dries Vints ccea56b6f9 Revert "Exclude StyleCI config from exported files (#5012)" 
This reverts commit a6bf24134d.
 2019-04-30 14:02:09 +02:00
Dries Vints f70fff8ad2 Merge branch 'master' into develop 2019-04-25 13:28:34 +02:00
Dries Vints cedcbc863d Merge branch 'master' into develop 2019-04-22 21:26:54 +02:00
Dries Vints f574aa76e3 Disable JS checks for now 2019-04-22 21:26:44 +02:00
Dries Vints bdc205c830 Merge branch 'master' into develop 2019-04-22 16:07:04 +02:00
Dries Vints 81fba471af Merge pull request #4998 from laravel/analysis-z9QV6a 
Apply fixes from StyleCI
 2019-04-22 16:06:16 +02:00
Dries Vints 43b09ad0f3 Add file exclusions for styleci 2019-04-22 16:06:06 +02:00
Dries Vints 91dc5ed286 Apply fixes from StyleCI 2019-04-22 14:06:03 +00:00
Dries Vints 597201a049 Add StyleCI config 2019-04-22 15:55:40 +02:00
Dries Vints 0f58190c7b Merge pull request #4989 from DrewRoberts/update-readme-laracasts 
Update readme with Laracasts count
 2019-04-12 12:06:24 +02:00
Dries Vints e80327f299 Update changelog 2019-03-12 17:25:28 +01:00
Dries Vints cfd5929785 Merge branch 'master' into develop 2019-03-12 17:23:52 +01:00
Dries Vints 4997f08105 Update changelog 2019-03-12 17:23:00 +01:00
Dries Vints 3d325b8485 Update changelog 2019-03-05 15:12:13 +01:00
Dries Vints 53b59cd0ba Merge branch 'master' into develop 2019-02-26 18:02:29 +01:00
Dries Vints 4c880d3c79 Update changelog 2019-02-26 18:02:07 +01:00
Dries Vints 0629a067a8 Merge branch '5.7' 2019-02-26 17:45:35 +01:00
Dries Vints 42c2a7ee27 Update changelog 2019-02-26 17:41:19 +01:00
Dries Vints 0582a20add Encourage to use PHPUnit 8 2019-02-26 17:32:09 +01:00
Dries Vints 25cf4c4923 Require PHP 7.2 2019-02-26 17:31:56 +01:00
Dries Vints 573cc157eb Update to Laravel 5.9 2019-02-26 17:31:37 +01:00
Dries Vints 3c53897ee4 Merge branch 'master' into develop 2019-02-15 18:47:27 +01:00
Dries Vints 83b6be51ad Update changelog 2019-02-15 18:45:50 +01:00
Dries Vints fae44eeb26 Replace string helper 2019-02-12 16:53:41 +01:00
Dries Vints 75468420a4 Use same version as framework 2019-02-09 14:05:33 +01:00
Dries Vints e4f20eac36 Reverse minimum PHPUnit version 2019-02-09 12:21:57 +01:00
Dries Vints 4dc76847c1 Update to PHPUnit 8 
Encourage people on 5.8 to use PHPUnit 8.
 2019-02-08 17:14:08 +01:00
Dries Vints 2a1f3761e8 Fix Typo 2019-02-05 18:46:48 +01:00
Dries Vints 6efb843e7d Merge pull request #4926 from kawax/str 
Use Str::random() instead of str_random()
 2019-02-02 14:57:25 +01:00
Dries Vints 6e60cf93a4 Update UserFactory.php 2019-02-02 14:56:57 +01:00
Dries Vints 2498f317d7 Remove unused Bootstrap class 
This class isn't available in Bootstrap 4.
 2019-01-23 15:23:51 +01:00
Dries Vints 096c237727 Merge pull request #4896 from goodjack/patch-1 
Remove extra whitespace
 2019-01-09 13:12:32 +01:00
Dries Vints 321d9e3786 Update changelog 2019-01-03 17:46:21 +01:00
Dries Vints 8f06b20d12 Update changelog 2019-01-03 17:32:14 +01:00
Dries Vints d1db3cd089 Update changelog 2018-12-20 14:55:04 +01:00
Dries Vints af2b3b18e9 Update changelog 2018-11-29 18:22:22 +01:00
Dries Vints 78cb2685aa Add language entry for starts_with rule 
See https://github.com/laravel/framework/pull/26612
 2018-11-26 17:29:42 +01:00
Dries Vints 3f09521d01 Merge pull request #4861 from unstoppablecarl/middleware-priority-comment 
[5.7] Update Kernel.php
 2018-11-22 10:26:38 +01:00
Dries Vints ed7b78de46 Typo 2018-11-16 16:20:27 +01:00
Dries Vints 6f3aa7a4c5 Don't redirect for api calls 
When calling api routes the Authenticate middleware attempts to redirect you to the login page. If you expect JSON back or don't have auth routes then you don't want this to happen. By re-using the logic from Laravel's exception handler on which format to output we can also determine wether to redirect the user to the login page or give them a JSON error response.
 2018-10-12 15:40:15 +02:00
Dries Vints 568250557c Add new Stripe webhook config values 
See https://github.com/laravel/cashier/pull/565
 2018-10-11 18:12:19 +02:00
Dries Vints 7ff917aa20 Fix alpha_dash 
It also accepts underscores as valid signs as explicitly stated in the docs and source code so I believe it would be best to also add it to the validation message.
 2018-05-18 14:52:24 +02:00