yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 20:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,428 Commits 116 Branches 487 Tags
Commit Graph

251 Commits

Author SHA1 Message Date
ivanThePleasant
b51b0f4616 Merge branch 'main' into chore/user-level-data 2022-09-21 10:24:18 +03:00
Julie Plantey
3b53153723
Merge pull request #14290 from WalkingPizza/fix/13648 
Trim admin's first name when validating
 2022-09-12 10:31:32 +02:00
Alexandre Bodin
961d535ea9 Fix for in working with undefined 2022-09-06 20:32:15 +02:00
Alexandre Bodin
4e989321e3 Fix eslint core/admin 2022-09-05 16:15:21 +02:00
ivanThePleasant
d568592d5c Refactor 'didUpdateRolePermissions' calls 2022-09-05 12:19:31 +03:00
ivanThePleasant
a2ee4bb855 Change location of user creation analytics call, remove development console log, adjust tests accordingly 2022-09-02 16:21:48 +03:00
ivanThePleasant
b5c98ae0cd Refactor event calls to follow old format, encapsulate hashing in the sender, refactor the format of event payload to better correspond to the new api 2022-09-02 14:43:51 +03:00
ivanThePleasant
cbfde4a11c Merge branch 'main' into chore/user-level-data 2022-09-02 12:22:12 +03:00
WalkingPizza
1b6ccc76b6 Trim admin's first name when validating 2022-09-01 22:45:23 +02:00
Gustav Hansen
51caa5f5a3 chore: Update e2e snapshot tests 2022-08-30 15:44:12 +02:00
ivanThePleasant
1c3c04ab28 Fix unit test 2022-08-16 14:06:35 +03:00
ivanThePleasant
1cda317e03 Refactor FE admin hash generation to fix error 2022-08-16 14:00:45 +03:00
ivanThePleasant
459de9774d Refactor hash function, add uuid to the admin hash, remove debug console logs 2022-08-16 11:58:15 +03:00
ivanThePleasant
3ead6f2487 Move hash function to user services instead of it being a separate service 2022-08-12 10:19:40 +03:00
ivanThePleasant
cc17c00fd6 Fix lint issues 2022-08-11 23:09:11 +03:00
ivanThePleasant
7e5b38d588 Merge branch 'master' into chore/user-level-data 2022-08-11 18:28:58 +03:00
ivanThePleasant
f8ac76491f Convert all server events to new format, refactor admin events userAdminId, refactor tests 2022-08-11 15:56:39 +03:00
Alexandre Bodin
8e486dd05b Fix eslint --fix error 2022-08-11 10:20:50 +02:00
Alexandre Bodin
03aa29e527 Fix merge issue 2022-08-11 10:20:50 +02:00
Alexandre Bodin
17866010b7 Apply no promise return 2022-08-11 10:20:50 +02:00
Alexandre Bodin
cf49ddbbfc Prettier and backend fix 2022-08-11 10:20:49 +02:00
Alexandre Bodin
0ae14c06cb 1st fix pass 2022-08-11 10:20:48 +02:00
Pierre Noël
310833b9c8
Merge pull request #13964 from strapi/fix/logo-customization 
Fix upload of menu logo
 2022-08-09 18:41:35 +02:00
WalkingPizza
b43a35aaf7 Replace trigger permission with update 2022-08-09 17:20:19 +02:00
ivanThePleasant
7291d2e6cf Change user hashing to be a service on admin, introduce adminUserId property to the send function, refactor several events 2022-08-09 12:20:25 +03:00
WalkingPizza
e0350558bc Add missing permissions to webhook triggering endpoint 2022-08-06 15:19:20 +02:00
Pierre Noël
1f41b4ba48 Fix upload of menu logo 2022-08-04 09:57:26 +02:00
Convly
0b8c7b59c6 Merge branch 'master' into features/typescript 2022-07-25 09:30:18 +02:00
Pierre Noël
6d265c2917 fix permission-domain.test.js 2022-07-12 17:56:58 +02:00
Alexandre Bodin
91c200490b Fix jest running because of .github and jest weird behavior 2022-07-12 13:54:06 +02:00
Convly
bdb5a3ee89 Merge branch 'releases/4.3.0' into features/typescript 2022-06-30 16:08:51 +02:00
Rémi de Juvigny
68cb67d7ca Show disabled plugins as installed 2022-06-28 17:26:25 +02:00
Convly
bdc043aaec Fix ctx.status 2022-06-07 16:19:24 +02:00
Convly
48ab30ccee First pass on Alexandre's review 2022-06-07 16:07:39 +02:00
Convly
7a99759c1e Merge branch 'releases/4.2.0' of github.com:strapi/strapi into features/typescript 2022-06-07 09:49:55 +02:00
Alexandre Bodin
c765101934 Merge branch 'master' of github.com:strapi/strapi into releases/4.2.0 2022-05-25 12:12:56 +02:00
Convly
66e3aa5dcb Merge branch 'master' into features/typescript 2022-05-24 08:02:38 +02:00
Gustav Hansen
4a9806d753 chore: Update test names 2022-05-23 09:41:36 +02:00
wuxinnan
f36c6d1312 move test case to previous story 2022-05-19 11:06:19 -07:00
wuxinnan
1e3d6855cc added test case to check password validity 2022-05-18 10:36:12 -07:00
Convly
e77226c678 Added test for the admin registration token 2022-05-13 12:11:20 +02:00
Convly
510b54f16e Moved logic to the right controller 2022-05-13 11:33:25 +02:00
Convly
bb87e910b2 Manually set the registrationToken in the register payload response 2022-05-13 11:22:41 +02:00
Convly
c250186b35 Merge remote-tracking branch 'origin' into features/typescript 2022-05-11 15:55:03 +02:00
ronronscelestes
6f211e8217 Merge branch 'master' of https://github.com/strapi/strapi into features/menu-logo 2022-05-11 13:48:35 +02:00
Convly
620418c9a6 Remove sensitive fields from sanitize user in the admin 2022-05-10 07:00:19 +02:00
Convly
132def5d57 Fix unit tests 2022-05-02 15:01:27 +02:00
Convly
7f6d194905 Use schema.config.attributes instead schema.attributes 2022-05-02 14:41:24 +02:00
Convly
956ab9de47 Add basic tests for permissions-manager sanitize utils 2022-04-26 14:43:09 +02:00
vincentbpro
1479641c83 Merge branch 'master' of github.com:strapi/strapi into features/menu-logo 2022-04-26 11:54:35 +02:00