yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-26 09:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 121 Branches 490 Tags
Commit Graph

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vincentbpro
8e77d485fa Merge branch 'master' into features/menu-logo 2022-04-26 18:27:51 +02:00
Bassel Kanso
c7b4d1396b remove comment 2022-04-26 19:22:19 +03:00
ronronscelestes
345a799c7f Merge branch 'master' of https://github.com/strapi/strapi into features/menu-logo 2022-04-26 17:18:05 +02:00
dependabot[bot]
5dcc733683
Bump @actions/core from 1.6.0 to 1.7.0 
Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/actions/toolkit/releases)
- [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core)

---
updated-dependencies:
- dependency-name: "@actions/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-26 15:14:05 +00:00
ronronscelestes
1e111d6fae
Merge pull request #13186 from strapi/chore/ds-1.1.0-bump 
Chore / DS 1.1.0 bump
 2022-04-26 17:12:09 +02:00
soupette
a601e279e4 Fix default tsconfig file 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-26 16:03:46 +02:00
Bassel Kanso
4c6c88e410 fix eslint errors 2022-04-26 17:00:23 +03:00
ronronscelestes
37119d2fd1 feedback paddings 2022-04-26 15:37:35 +02:00
ronronscelestes
5c37a3e20e helper plugin DS bump 2022-04-26 15:09:11 +02:00
Convly
ea6688eaa2 Hide confirmation and reset-password token from the getstarted U&P extension 2022-04-26 14:54:50 +02:00
ronronscelestes
6d921213f0 updated tests 2022-04-26 14:54:23 +02:00
Bassel Kanso
10afebc745 fix start command to work in typescipt project 2022-04-26 15:53:14 +03:00
Convly
956ab9de47 Add basic tests for permissions-manager sanitize utils 2022-04-26 14:43:09 +02:00
ronronscelestes
7332e3d010 ds bump to 1.1.0 2022-04-26 14:31:55 +02:00
Bassel Kanso
37971b2394 fix strapi commands so they work in a Typescript project 2022-04-26 14:58:06 +03:00
vincentbpro
1479641c83 Merge branch 'master' of github.com:strapi/strapi into features/menu-logo 2022-04-26 11:54:35 +02:00
Bassel Kanso
90293b8469 fix command config:restore in typescript project 2022-04-26 11:49:06 +03:00
Vincent
6c59b21e19
Merge pull request #13163 from strapi/menu-logo/get-project-settings-routes 
Menu logo/get project settings routes
 2022-04-26 10:45:04 +02:00
Convly
1d50038e44 Remove hidden fields from the admin API responses 2022-04-26 10:39:50 +02:00
Bassel Kanso
4610be5c39 fix strapi config:dump in typescript project 2022-04-25 19:11:33 +03:00
Bassel Kanso
7cf9eb81eb refactoring app and plugin generators to handle typescript 2022-04-25 18:46:04 +03:00
derrickmehaffy
b5fa7546e8 add marketplace media csp settings to provider docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-04-25 08:32:57 -07:00
cyril lopez
e5ce3f5794
Merge pull request #13177 from strapi/fix/13124 
Enable .jsx extensions
 2022-04-25 16:22:35 +02:00
Bassel Kanso
c49d681b18 only ask about generating a ts Plugin in a javascript project 2022-04-25 17:17:56 +03:00
vincentbpro
816cba6ce5 Merge branch 'features/menu-logo' into menu-logo/get-project-settings-routes 2022-04-25 15:41:40 +02:00
Vincent
ea59183817
Merge pull request #13131 from strapi/menu-logo/submit 
[Logo customization] Submit flow
 2022-04-25 15:39:40 +02:00
Bassel Kanso
adce607d00 user can choose a typescript plugin using strapi generate 2022-04-25 16:31:20 +03:00
vincentbpro
752206f928 fix: removed useless await 2022-04-25 14:46:22 +02:00
Pierre Noël
de2a03268a change tree to folder-structure + fix test 2022-04-25 14:37:59 +02:00
Pierre Noël
52a2a41664 code cleaning 2022-04-25 14:37:59 +02:00
Pierre Noël
2f8fd4adc2 fix e2e folder test 2022-04-25 14:37:58 +02:00
Pierre Noël
ecbf419c3c add tree route 2022-04-25 14:37:58 +02:00
Pierre Noël
def1cedc5b
Merge pull request #13053 from strapi/ML-folder/update-file-location 
Ml folder/update file location
 2022-04-25 14:28:26 +02:00
vincentbpro
ce181eccf0 fix: created a dedicated read permission for project settings 2022-04-25 13:29:19 +02:00
Pierre Noël
c7c94b310a better stack error 2022-04-25 12:12:56 +02:00
Bassel Kanso
918b7629d8 ask for language in when creating a custom strapi project 2022-04-25 13:09:52 +03:00
soupette
1ffac62397 Enable .jsx extension. 
Fixes #13124

Signed-off-by: soupette <cyril@strapi.io>
 2022-04-25 10:28:14 +02:00
vincentbpro
6076522305 test: updated /init tests 2022-04-25 10:14:02 +02:00
derrickmehaffy
2f8c1ce5bf Upgrade Sentry version (both for plugin and internal) to latest 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-04-21 08:32:04 -07:00
ronronscelestes
3e3b31c2b8 fix ApplicationInfosPage tests 2022-04-21 10:40:30 +02:00
ronronscelestes
c6d841e451 refacto updateProjectSettings reducer + file exports 2022-04-21 10:34:41 +02:00
chisus
f6c01bd013 Add fake container to pass i18n unit test 2022-04-21 01:04:18 +09:00
chisus
0b60be2aca Add sanitizers registry to container 
- Remove users-permissions sanitization step in core
- Move sanitization functions to users-permissions plugin utils
- Add sanitizers registry to container for manage sanitizer functions in core so that we can get/add sanitizers anywhere we want
 2022-04-21 00:29:35 +09: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
Kim, Harim
e0191544e5
Merge branch 'strapi:master' into fix/populate-user 2022-04-20 21:50:33 +09:00
Jean-Sébastien Herbaux
f7f32afee7
Merge pull request #13152 from strapi/fix/adminjwtspace 
Fix ADMIN_JWT_SECRET being generated with a space
 2022-04-19 16:01:54 +02:00
DMehaffy
7c67be10e7
Fix ADMIN_JWT_SECRET being generated with a space 
Fixing a typo
 2022-04-19 01:47:59 -07:00
dependabot[bot]
912ef9ea91
Bump fs-extra from 10.0.1 to 10.1.0 
Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 10.0.1 to 10.1.0.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/10.0.1...10.1.0)

---
updated-dependencies:
- dependency-name: fs-extra
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-18 09:06:04 +00:00