phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
6,767 Commits 3 Branches 0 Tags
551bbca3225970e06ca41b107b879f064f786e8a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dries Vints 551bbca322 wip 2022-07-25 11:06:51 +02:00
Dries Vints 2bbb0ef6a0 Merge branch '9.x' 
# Conflicts:
#	composer.json
 2022-07-25 11:04:49 +02:00
Dries Vints 14719d097a Update .gitignore (#5924) 2022-06-30 08:31:18 -05:00
Dries Vints b331e10aca Merge branch '9.x' 
# Conflicts:
#	composer.json
 2022-06-28 18:00:03 +02:00
Dries Vints f46db07ef5 Update composer.json 2022-06-28 16:36:21 +02:00
Dries Vints 1f9eee06dd Update update-changelog.yml 2022-06-08 11:02:46 +02:00
Dries Vints 2e823dd31b Update pull-requests.yml 2022-06-08 11:02:33 +02:00
Dries VintsandTaylor Otwell 5c5a300bfd [9.x] Add specific test user in seeder (#5879) 
* Update DatabaseSeeder.php

* formatting

Co-authored-by: Taylor Otwell <[email protected]>
 2022-05-05 08:53:49 -05:00
Dries Vints 5840c98d8f Bump minimum Laravel version 2022-05-03 17:51:16 +02:00
Dries Vints 62cb9052cd Update logging.php (#5874) 2022-05-03 09:31:17 -05:00
Dries Vints f662352123 [9.x] Run tests for skeleton (#5873) 
* Run tests for skeleton

* wip

* wip
 2022-05-02 09:11:15 -05:00
Dries Vints 17fbcaaa10 Merge branch '8.x' into 9.x 
# Conflicts:
#	CHANGELOG.md
#	server.php
 2022-04-29 15:51:16 +02:00
Dries Vints 843a4f81eb Update server.php (#5863) 2022-04-12 08:37:49 -05:00
Dries Vints 039a99ad14 Create pull-requests.yml 2022-04-08 11:05:03 +02:00
Dries Vints c4f8ed0915 Update update-changelog.yml 2022-03-23 13:33:54 +01:00
Dries Vints 222908f96f Update .styleci.yml 2022-03-17 11:05:03 +01:00
Dries Vints b18216ad5d Update .styleci.yml (#5843) 2022-03-17 10:53:43 +01:00
Dries Vints 95fec9a3e8 Update mail.php (#5836) 2022-03-08 08:38:39 -06:00
Dries Vints ecf7b06c4b Replace Laravel CORS package (#5825) 2022-02-22 09:42:30 -06:00
Dries Vints 376ed676ee Update RouteServiceProvider.php (#5816) 2022-02-15 08:32:48 -06:00
Dries Vints 5a374ae636 [10.x] Prep Laravel 10 (#5805) 
* Prep Laravel 10

* Update composer.json

* Update Kernel.php

* Update composer.json

* Update composer.json
 2022-02-11 08:33:57 -06:00
Dries Vints 6c1f430aa7 Revert "Fix .gitattributes consistency with .editorconfig (#5802)" (#5809) 
This reverts commit 207a23e4a1.
 2022-02-10 10:51:03 -06:00
Dries Vints 90be1e323e Merge pull request #5807 from u01jmg3/9.x 
Align min PHP version with docs
 2022-02-10 10:07:19 +01:00
Dries Vints 13035e08c4 revert 10 for now 2022-02-08 18:07:52 +01:00
Dries Vints 9301304460 Laravel 10 2022-02-08 18:06:07 +01:00
Dries Vints fb72538c96 Update CHANGELOG.md 2022-02-08 16:52:58 +01:00
Dries Vints 130b8de9cc Update CHANGELOG.md 2022-02-08 16:52:33 +01:00
Dries Vints 79805bc1c4 [8.x] Auto update changelog file with a new release (#5801) 
* Create update-changelog.md

* Update .gitattributes

* Rename update-changelog.md to update-changelog.yml
 2022-02-08 08:36:57 -06:00
Dries Vints 71efaae0a5 Merge branch '8.x' 2022-02-08 13:28:17 +01:00
Dries Vints 096638ea9a Update the default Argon2 options 2022-02-03 16:06:00 +01:00
Dries Vints 94771229ea Merge pull request #5795 from emaia/patch-1 
Fix alphabetical order
 2022-02-03 10:38:16 +01:00
Dries Vints 9b4e424d98 Add Ignition (#5764) 2022-01-13 08:48:35 -06:00
Dries Vints 726e0bb10f Merge pull request #5763 from laravel/revert-5762-master 
Revert "[9.x] Add Ignition"
 2022-01-13 10:34:58 +01:00
Dries Vints 3701593e66 Revert "[9.x] Add Ignition" 2022-01-13 10:34:51 +01:00
Dries Vints 9c182f861d Merge pull request #5762 from freekmurze/master 
[9.x] Add Ignition
 2022-01-13 10:28:37 +01:00
Dries Vints b58d346ba9 Update composer.json (#5761) 2022-01-12 09:51:03 -06:00
Dries Vints 2b7464fad4 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
#	composer.json
 2021-12-22 11:09:09 +01:00
Dries Vints 56a73db2e3 Update CHANGELOG.md 2021-12-22 11:07:28 +01:00
Dries Vints 1ea351916e Update validation.php (#5753) 2021-12-17 08:40:10 -06:00
Dries Vints e999e1d07c Update composer.json (#5750) 2021-12-15 07:49:21 -06:00
Dries Vints 274d1bdd72 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-12-07 17:10:58 +01:00
Dries Vints 7e78e26c7c Update CHANGELOG.md 2021-12-07 17:10:22 +01:00
Dries Vints fcb4d9df1a Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-11-23 18:31:32 +01:00
Dries Vints 901879dd68 Update CHANGELOG.md 2021-11-23 18:31:14 +01:00
Dries Vints 0eb4a40eb3 Update CHANGELOG.md 2021-11-23 18:30:45 +01:00
Dries Vints 21c3ef96f4 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-11-16 17:50:11 +01:00
Dries Vints f8ff35e070 Update CHANGELOG.md 2021-11-16 17:49:31 +01:00
Dries Vints aa71b038b4 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-11-09 18:29:57 +01:00
Dries Vints bad350d199 Update CHANGELOG.md 2021-11-09 18:29:24 +01:00
Dries Vints d54907c27d Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
#	composer.json
 2021-10-26 17:22:00 +02:00
Dries Vints 5d22b2464c Update CHANGELOG.md 2021-10-26 17:20:51 +02:00
Dries Vints 8f63479d44 Update CHANGELOG.md 2021-10-20 15:15:52 +02:00
Dries Vints ab2b606124 Temporarily remove tinker from master 
Until https://github.com/bobthecow/psysh/commit/2c061f5bd1a543dd69ad68a0f2a488ac855e3814 has been re-introduced.
 2021-10-11 11:06:14 +02:00
Dries Vints e124d6d98d Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
#	composer.json
 2021-10-05 20:42:43 +02:00
Dries Vints a3b76dbeb7 Update CHANGELOG.md 2021-10-05 20:40:50 +02:00
Dries Vints aa9cb884d2 Bump Mockery and PHPUnit 2021-09-29 11:51:32 +02:00
Dries Vints a6d1019bcf Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-09-07 16:34:35 +02:00
Dries Vints 4f8a0f35fa Update CHANGELOG.md 2021-09-07 16:33:40 +02:00
Dries Vints ec9ff4cd68 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-08-24 18:00:23 +02:00
Dries Vints 75a7dba9c4 Update CHANGELOG.md 2021-08-24 17:59:48 +02:00
Dries Vints c512ba2b16 Update app.php (#5674) 2021-08-19 09:03:02 -05:00
Dries Vints 6b946caa62 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-08-17 17:57:45 +02:00
Dries Vints b55e3fbb14 Update CHANGELOG.md 2021-08-17 17:56:01 +02:00
Dries Vints d57cc57c6d Merge pull request #5669 from laravel/8.x 
Update .styleci.yml
 2021-08-17 10:23:34 +02:00
Dries Vints a199c3bcea Update .styleci.yml 2021-08-17 10:22:10 +02:00
Dries Vints 6dde1832b4 Sanctum dev-develop 2021-08-12 15:46:34 +02:00
Dries Vints 018bb3c157 Merge branch '8.x' 
# Conflicts:
#	composer.json
 2021-08-12 15:39:10 +02:00
Dries Vints 4d0f40f98c Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
#	composer.json
 2021-08-10 19:28:02 +02:00
Dries Vints 236b31872d Update CHANGELOG.md 2021-08-10 19:27:09 +02:00
Dries Vints b6f4ee7661 Use new TrustProxies middleware (#5662) 2021-08-10 08:41:29 -05:00
Dries VintsandNuno Maduro 7f68c30179 [9.x] Allow develop installs (#5660) 
* Allow develop installs

* Disable CORS middleware

* Re-add laravel-cors

* Re-adds collision

Co-authored-by: Nuno Maduro <[email protected]>
 2021-08-09 13:52:42 -05:00
Dries Vints 4c552aefbe Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-08-03 20:13:53 +02:00
Dries Vints 82b5135652 Update CHANGELOG.md 2021-08-03 20:12:15 +02:00
Dries Vints 77086029af Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-07-13 16:12:52 +02:00
Dries Vints 8e5510458e Update CHANGELOG.md 2021-07-13 16:12:18 +02:00
Dries Vints 7c977fb9a5 Drop PHP 7.4 support 2021-07-13 14:59:41 +02:00
Dries Vints 1e4312f207 Update CHANGELOG.md 2021-07-06 18:47:19 +02:00
Dries Vints d4ff3b72e7 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-06-15 17:49:26 +02:00
Dries Vints 99d5ca2845 Update CHANGELOG.md 2021-06-15 17:48:56 +02:00
Dries Vints 92cd828c64 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-06-01 17:49:55 +02:00
Dries Vints 0296bb63e1 Update CHANGELOG.md 2021-06-01 17:49:26 +02:00
Dries Vints 507d499577 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-05-18 17:38:28 +02:00
Dries Vints afa06fac2a Update CHANGELOG.md 2021-05-18 17:37:20 +02:00
Dries Vints 72c6aaa8df Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
#	composer.json
 2021-05-11 22:50:27 +02:00
Dries Vints b1b28a6bb1 Update CHANGELOG.md 2021-05-11 22:49:31 +02:00
Dries Vints ecf460a874 Update CHANGELOG.md 2021-05-11 22:47:22 +02:00
Dries Vints 4ce641d571 Apply fixes from StyleCI (#5607) 2021-05-07 05:54:25 -05:00
Dries Vints dd8111a32d Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
#	tests/Feature/ExampleTest.php
#	tests/Unit/ExampleTest.php
 2021-04-20 18:14:47 +02:00
Dries Vints a6ffdbdf41 Update CHANGELOG.md 2021-04-20 18:13:08 +02:00
Dries Vints 6746f4ec12 [9.x] Implement anonymous migrations (#5590) 
* Implement anonymous migrations

* Apply fixes from StyleCI (#5589)
 2021-04-15 06:53:35 -05:00
Dries Vints 5808129a1f Rename test methods (#5574) 2021-03-26 07:47:26 -07:00
Dries Vints 9e920323de Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-03-23 18:26:04 +01:00
Dries Vints 6bc0b1cfcb Update CHANGELOG.md 2021-03-23 18:25:11 +01:00
Dries Vints f5cac881c9 Re-order composer.json (#5570) 2021-03-21 08:38:50 -05:00
Dries Vints f51adc5b53 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-03-16 17:26:56 +01:00
Dries Vints 57ddc0ebbb Update CHANGELOG.md 2021-03-16 17:26:11 +01:00
Dries Vints 471195d743 Fix footer on mobile (#5561) 2021-03-12 07:55:27 -06:00
Dries Vints 38207d610d Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-03-09 20:10:21 +01:00
Dries Vints a315767e09 Update CHANGELOG.md 2021-03-09 20:09:48 +01:00
Dries Vints 941bd32ea8 Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-03-02 17:37:08 +01:00