yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,745 Commits 129 Branches 498 Tags
Commit Graph

15745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
9626c72268 Add telemetry back 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-22 12:05:21 +01:00
cyril lopez
6ea3093221
Merge pull request #9461 from strapi/i18n/rbac-put-permissions 
[I18n] RBAC PUT permissions
 2021-02-22 10:52:35 +01:00
cyril lopez
d5a1de0bc2
Merge pull request #9460 from strapi/i18n/rbac-post-permissions-to-api 
[I18n] RBAC POST permissions
 2021-02-22 10:42:56 +01:00
soupette
110b6b4b97 Add form interactions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-22 10:41:35 +01:00
cyril lopez
e787973758
Merge pull request #9459 from strapi/i18n/rbac-disable-form 
[I18n] RBAC disable properties interactions
 2021-02-22 10:23:45 +01:00
soupette
28a1468439 Add logic to retrieve the initial values for the plugins & settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 17:46:53 +01:00
soupette
d6e70a737d Add logic to set the correct leaf when in edition 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 17:34:52 +01:00
soupette
b256776fbb Format permissions to match api specs, handle POST 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 16:44:15 +01:00
soupette
1896771de6 POST plugins & settings permissions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 14:29:41 +01:00
soupette
731f51199f Disable condition modal for ce 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 11:23:33 +01:00
soupette
9f4a19fe3f Disable content type properties for ce 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 11:07:38 +01:00
soupette
fb28853848 Disable global actions for CE 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 10:57:34 +01:00
soupette
6392317f9b Disable the entire form for super admin role 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 10:44:16 +01:00
cyril lopez
b79ecf6468
Merge pull request #9457 from strapi/i18n/rbac-split-ee-ce 
[i18n] RBAC Move files to ce folder.
 2021-02-19 10:05:51 +01:00
soupette
313ccdbcdd Move files to ce folder. 
Co-authored-by: HichamELBSI elabbassih@gmail.com

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 09:57:28 +01:00
soupette
66d6a6bc54 Merge branch 'features/i18n' of github.com:strapi/strapi into i18n/rbac 2021-02-19 09:07:59 +01:00
soupette
8695853ea0 Fix ctb checkbox input 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 16:04:07 +01:00
Marvin Frachet
3241e27359
[i18n] fix typo on permissions (#9447) 2021-02-18 15:51:44 +01:00
cyril lopez
7ff03c0e3a
Merge pull request #9445 from strapi/features/i18n-front 
[i18n] Front-end
 2021-02-18 15:27:56 +01:00
soupette
706baae9ec Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 14:58:33 +01:00
soupette
fb1845bb1c Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 14:44:01 +01:00
Alexandre Bodin
469991f9f2 Merge branch 'master' into features/i18n 2021-02-18 14:36:32 +01:00
cyril lopez
894e3d6142
Merge pull request #9386 from strapi/i18n/rbac-form 
[I18n] RBAC refactoring form interactions
 2021-02-18 14:19:24 +01:00
soupette
63fa27e032 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 13:48:14 +01:00
cyril lopez
f1f245448f
Merge pull request #9420 from strapi/i18n/rbac-conditions 
[I18n] RBAC conditions
 2021-02-18 13:39:38 +01:00
soupette
2077c89030 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 12:20:48 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 v3.5.0 2021-02-18 11:28:28 +01:00
Alexandre BODIN
adf05599a5
Fix sanitize polumorphic entites that can be undefiend or ids only (#9441) 2021-02-18 11:20:32 +01:00
soupette
268247d41a Add conditions button state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 11:19:59 +01:00
Rémi de Juvigny
f5823c1ce5
Add install instructions to strapi-plugin-sentry docs (#9440) 2021-02-18 10:43:36 +01:00
Alexandre BODIN
9160c46a80
Merge pull request #9430 from strapi/i18n/lifecycles-rework 
Add Lifecycles for i18n
 2021-02-18 09:23:07 +01:00
cyril lopez
8d7006840b
Merge pull request #9422 from acalvino4/issues-8914-allow-multiple-image-insertion-wysiwyg 
fix #8914 allow multiple images to be inserted into wysiwyg
 2021-02-18 08:46:23 +01:00
cyril lopez
e21f06d4b6
Merge branch 'master' into issues-8914-allow-multiple-image-insertion-wysiwyg 2021-02-18 07:54:34 +01:00
Alexandre Bodin
77906863aa fix typos 2021-02-17 18:40:45 +01:00
Alexandre BODIN
7102ebbcef
Merge pull request #9009 from strapi/features/sso 
Features/sso
 2021-02-17 18:29:39 +01:00
cyril lopez
f57cebcaf3
Merge pull request #9433 from strapi/fix/first-admin-logout 
Fix first admin logout bug
 2021-02-17 18:02:16 +01:00
HichamELBSI
04ec62e6c2 Fix first admin logout bug 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-02-17 17:48:59 +01:00
Alexandre Bodin
e7189d2578 Fix typos & remove unecessary parameter 2021-02-17 17:21:32 +01:00
Alexandre Bodin
c1da5a5685 Add lifecyle manager tests 2021-02-17 15:51:47 +01:00
Alexandre Bodin
9020fc4e91 Add lifecycles to manage locale & localizations fields 2021-02-17 13:00:49 +01:00
HichamELBSI
2f974c739b Merge branch 'master' into features/sso 2021-02-17 12:28:30 +01:00
dependabot[bot]
b8c2cf5338
Bump @swc-node/jest from 1.0.3 to 1.1.0 (#9428) 
Bumps [@swc-node/jest](https://github.com/Brooooooklyn/node-swc) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/Brooooooklyn/node-swc/releases)
- [Commits](https://github.com/Brooooooklyn/node-swc/compare/@swc-node/jest@1.0.3...@swc-node/jest@1.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-17 11:52:03 +01:00
HichamELBSI
1a42da3007 Merge branch 'master' into features/sso 2021-02-17 11:43:34 +01:00
cyril lopez
890c3bbf2c
Update packages/strapi-admin/admin/src/translations/en.json 
Co-authored-by: Samuel Pirès <samuel.pires@strapi.io>
 2021-02-17 10:16:14 +01:00
Alexandre BODIN
a7a1d5e2d5
Merge branch 'master' into issues-8914-allow-multiple-image-insertion-wysiwyg 2021-02-17 09:42:15 +01:00
soupette
417f3f8f8e Add more tests to reducer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-17 09:28:19 +01:00
Rémi de Juvigny
db0f437272
Add init option to strapi-plugin-sentry (#9423) 2021-02-17 09:15:32 +01:00
dependabot[bot]
8359368477
Bump @babel/runtime from 7.12.5 to 7.12.13 (#9427) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.12.5 to 7.12.13.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.13/packages/babel-runtime)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-17 09:14:04 +01:00
cyril lopez
a2d922daae
Merge pull request #9418 from strapi/fix/api-params 
[i18n] fixing add locale params
 2021-02-17 08:10:13 +01:00
soupette
9e33fbcee7 Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-16 20:01:50 +01:00