yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 14:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,925 Commits 111 Branches 487 Tags
Commit Graph

10009 Commits

Author SHA1 Message Date
Julie Plantey
b64701989c translate community links name 2023-02-16 13:59:25 +01:00
Simone Taeggi
f31d69a22e remove comment and add a condition 2023-02-16 10:34:58 +01:00
Julie Plantey
e2f69a002d Merge branch 'main' of https://github.com/strapi/strapi into chore/overview-page-fixes 2023-02-16 10:14:46 +01:00
Cameron Paczek
046535397a Change removal logic 2023-02-15 12:33:32 -08:00
Josh
9e9547a64e fix: always return an object if data is falsey 
test: add test for falsey value
 2023-02-15 17:48:51 +00:00
Josh
6b17f8ad12 chore: convert all files to single imports of the DS & icons 
chore: remove eslint rule

chore: update snapshots

chore: update snapshots

chore: add eslint rule to stop direct imports apart from v2
 2023-02-15 17:23:59 +00:00
Simone Taeggi
40fad27b7a add the tokenType to the didAddTokenFromList and the didEditTokenFromList events in the API and Transfer tokens 2023-02-15 18:03:10 +01:00
Julie Plantey
822cb5a14f feedback fix and improvements 2023-02-15 18:02:40 +01:00
Simone Taeggi
1e6a7ffd79 add the tokenType to the didCopyTokenKey event in the API and Transfer Tokens 2023-02-15 17:59:04 +01:00
Simone Taeggi
e4643cde87 add the tokenType to the willEditTokenFromList event in the API and Transfer tokens 2023-02-15 17:56:08 +01:00
Simone Taeggi
f01ac88aa2 add tokenType to the willAccessTokenList event in the API and Transfer Token 2023-02-15 17:38:38 +01:00
Simone Taeggi
abcb2b13ef add tokenType to the willCreateToken and willEditToken events in the API and Transfer tokens 2023-02-15 17:35:06 +01:00
Simone Taeggi
5c2cd8c938 add tokenType to the willDeleteToken event inside the DeleteButton in ApiTokens and TransferTokens 2023-02-15 17:30:27 +01:00
nathan-pichon
35f783d0dc
Merge branch 'main' into feature/review-workflow 
# Conflicts:
#	packages/core/admin/ee/admin/permissions/customPermissions.js
 2023-02-15 16:32:07 +01:00
Simone Taeggi
3182bba15c add tokenType to the didCreateToken and didEditToken events in API e Transfer tokens 2023-02-15 16:28:53 +01:00
Gustav Hansen
4cb664dae1 CreateAction: Add component unit tests 2023-02-15 14:21:41 +01:00
Jamie Howard
04e8ed121c
Merge pull request #15692 from strapi/feature/enhance-min-max-errors 2023-02-15 13:17:07 +00:00
Gustav Hansen
d008235cf0 AdminSeatInfo: Add component unit tests 2023-02-15 14:08:09 +01:00
Mark Kaylor
f07fc24d05 Revert change disallowing null as a value 2023-02-15 18:30:28 +05:30
Mark Kaylor
f6da34d1e7 Fix null being set on save 2023-02-15 17:11:37 +05:30
Julie Plantey
aac9ae316b fixes on Overview page & moved get help link 2023-02-15 12:32:08 +01:00
ivanThePleasant
c4620fd18a Merge branch 'chore/ee-seats' of https://github.com/strapi/strapi into chore/ee-seats 2023-02-15 12:01:06 +01:00
Josh
14d5597a8f
Merge pull request #15818 from strapi/feat/relations-diffing-fe 2023-02-15 10:55:45 +00:00
Gustav Hansen
46a89b1830
Merge pull request #15781 from strapi/enhancement/axios-migration-content-type-builder 
replace axiosInstance with getFetchClient inside the content-type builder
 2023-02-15 11:33:39 +01:00
ivanThePleasant
d2ade473fd WIP requested server changes 2023-02-15 11:17:47 +01:00
ivanThePleasant
a874d4ee2b
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-15 12:15:05 +02:00
ivanThePleasant
87e16d578a
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-15 12:14:41 +02:00
ivanThePleasant
955b594d33
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-15 12:08:36 +02:00
Rémi de Juvigny
179b23ac41
Merge pull request #15816 from strapi/chore/dead-market-code 
Remove dead code for the install and uninstall plugin actions
 2023-02-15 11:02:52 +01:00
Marc
0025ba36c2
Merge pull request #15809 from strapi/private-s3-bucket/non-mutating-signing 2023-02-15 10:54:31 +01:00
Rémi de Juvigny
55b19cafd4 Eliminate rogue log 2023-02-15 10:05:06 +01:00
Nathan Pichon
e51273e285
Merge pull request #15802 from strapi/feature/async-reduce-utils 
feat(utils): add ReduceAsync function
 2023-02-15 09:45:39 +01:00
Gustav Hansen
958268fe6d
Merge pull request #15813 from strapi/dependabot/npm_and_yarn/react-intl-6.2.8 
chore(deps): bump react-intl from 6.2.7 to 6.2.8
 2023-02-15 09:03:09 +01:00
Josh
5688497f19 feat: implement fractional indexing to reduce payload for relations 
feat(wip): add fractional _temp_keys_ on reordering

feat(wip): add temp keys to loaded relations
 2023-02-14 21:57:00 +00:00
Marc-Roig
a663322c33 await isPrivate method 2023-02-14 19:02:22 +01:00
Rémi de Juvigny
839d677c8f Remove the associated actions 2023-02-14 18:52:53 +01:00
Jean-Sébastien Herbaux
1472a5369c
Merge pull request #15801 from strapi/data-transfer/remote-protocol-restrictions 2023-02-14 18:43:55 +01:00
Marc-Roig
9a948e7f7e fix 2023-02-14 18:20:16 +01:00
Nathan Pichon
d66cec9367
Merge branch 'main' into feature/async-reduce-utils 2023-02-14 16:58:11 +01:00
nathan-pichon
5029344805
feat(async-utils): use curryN instead of curry 2023-02-14 16:55:57 +01:00
Rémi de Juvigny
cbfc5876c7 Delete install and uninstall plugin endpoints 2023-02-14 16:04:16 +01:00
Simone
b0199c8ee3
Merge branch 'main' into enhancement/axios-migration-content-type-builder 2023-02-14 15:59:49 +01:00
Simone Taeggi
39ac1b79b6 add confirmation dialog when deleting an API token or Transfer token 2023-02-14 15:31:32 +01:00
ivanThePleasant
1c9edc61e8
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:37:56 +02:00
ivanThePleasant
c5c3525140
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:37:22 +02:00
ivanThePleasant
a05c82175d
Update packages/core/admin/server/policies/hasLicenseLimitAllowance.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:19:56 +02:00
ivanThePleasant
2a81270bf4
Update packages/core/admin/server/policies/hasLicenseLimitAllowance.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:17:51 +02:00
ivanThePleasant
516340b45a
Update packages/core/admin/server/policies/hasLicenseLimitAllowance.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:17:13 +02:00
ivanThePleasant
09b8fde8eb
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:55:23 +02:00
ivanThePleasant
d3e7172f6a
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:54:09 +02:00