yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 09:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,910 Commits 119 Branches 507 Tags
Commit Graph

224 Commits

Author SHA1 Message Date
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
Convly
1d50038e44 Remove hidden fields from the admin API responses 2022-04-26 10:39:50 +02:00
vincentbpro
ce181eccf0 fix: created a dedicated read permission for project settings 2022-04-25 13:29:19 +02:00
vincentbpro
6076522305 test: updated /init tests 2022-04-25 10:14:02 +02:00
vincentbpro
0ba8bc5a98 fix(menu-logo): handle empty project-settings store in delete service 2022-04-20 16:26:24 +02:00
vincentbpro
96302c8ae8 feat(menu-logo): added menuLogo url to /init route 2022-04-20 16:11:43 +02:00
vincentbpro
4c80b3f798 feat(menu-logo): added GET /project-settings route 2022-04-20 15:52:58 +02:00
Convly
4fa2804f35 Merge branch 'master' into features/typescript 2022-04-15 15:47:16 +02:00
vincentbpro
00529853e5 fix(logo-customization): avoid passing map index to multi-param providers 2022-04-15 12:09:36 +02:00
vincentbpro
bcf3365e1c test(logo-customization): updated tests 2022-04-15 11:32:14 +02:00
vincentbpro
c6cbf6b58d test(logo-customization): updated tests 2022-04-15 11:18:03 +02:00
vincentbpro
ba8cb27bb1 refactor(logo-customization): simplified updateProjectSettings service function signature 2022-04-15 09:58:35 +02:00
vincentbpro
5fde7a23d0 refactor(logo-customization): compare files hashes directly instead of urls 2022-04-15 09:26:22 +02:00
vincentbpro
aecc0244e3 fix(logo-customization): handled undefined files object 2022-04-15 09:15:07 +02:00
vincentbpro
1a6c30f771 refactor(logo-customization): removed useless awaits 2022-04-15 09:10:34 +02:00
Convly
431ccbe55c Fix isTypeScriptProject -> isUsingTypeScript 2022-04-14 14:55:57 +02:00
Convly
9a2ae88480 Prevent access to telemetry-properties route if the telemetry is disabled 2022-04-13 16:11:42 +02:00
Convly
8440d4064f Add the typescript telemetry events to the admin events 2022-04-13 15:41:39 +02:00
ivanThePleasant
03a6b33131
Merge pull request #12910 from strapi/chore/opt-out-telemetry-call 
Opt out telemetry command
 2022-04-12 15:59:16 +03:00
vincentbpro
df8ca58515 refactor(menu-logo): refactored project-settings service 2022-04-08 09:49:29 +02:00
vincentbpro
3432eeade1 fix(logo-customization): fix bad use of upload providers 2022-04-08 09:36:08 +02:00
Pierre Noël
54fda9c7c0 change error messages 2022-04-07 16:50:20 +02:00
Pierre Noël
89221e8ee9 fix wording mistakes 2022-04-07 16:50:19 +02:00
Pierre Noël
79396f8bbb continue reading API_TOKEN_SALT + add warning deprecated message 2022-04-07 16:50:19 +02:00
Pierre Noël
20e6d9a94b Improve error messages 2022-04-07 16:50:15 +02:00
Pierre Noël
1e6d1ce6a2 fix unit tests 2022-04-07 16:34:58 +02:00
Pierre Noël
019007ba3e improve error message + remove use of API_TOKEN_SALT 2022-04-07 16:34:57 +02:00
Pierre Noël
9fc63af260 harmonize secret generation + don't generate in production mode 2022-04-07 16:34:56 +02:00