yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-01 04:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,027 Commits 113 Branches 491 Tags
Commit Graph

17027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenneth Solberg
95b81cd237
Added norwegian translation. (#9846) 
* Added norwegian translation.

* Update the index.js file so the Norwegian translation is available in the dropdown

* Update the index.js file so the Norwegian translation is available in the dropdown

Co-authored-by: Kenneth Solberg <kenneth@codewise.no>
 2021-05-11 09:08:03 +02:00
Jean-Sébastien Herbaux
30ccad91c0
Fix compatibility issue for mongo < 4.2 (#10281) 2021-05-11 09:04:58 +02:00
soupette
c805387527 Load plugin email 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-11 08:14:01 +02:00
soupette
ec7baf3bb3 Load sentry plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-11 08:14:01 +02:00
soupette
0f78b38eb3 Load graphql plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-11 08:14:01 +02:00
cyril lopez
8c8cfd5d3a
Merge pull request #10279 from strapi/chore/load-plugin-users-permissions 
Load plugin users permissions
 2021-05-11 08:13:06 +02:00
soupette
2b7139c1fa Load plugin users-permissions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-10 14:08:16 +02:00
cyril lopez
4d87af6173
Merge pull request #10276 from strapi/core/load-plugins 
Init load plugins
 2021-05-10 14:07:32 +02:00
soupette
37e70cdcdf Load plugin documentation and associated translations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-10 13:52:23 +02:00
cyril lopez
436d9fdab5
Upgrade @buffet.js (#10270) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-10 11:25:35 +02:00
Jean-Sébastien Herbaux
934a47eb34
Add possibility to set "required" RBAC conditions (#10185) 
* Add optional property 'required' to rbac conditions

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix tests, remove object handler support & fix bug (pm.queryFrom)

* Remove required property, handle required conditions at the engine level (raw)

* Update EE snapshots

* Add hasSuperAdminRole util
 2021-05-10 11:24:45 +02:00
soupette
5dbb3776cc Init load plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-10 10:17:48 +02:00
Ralph
81a9a63cad
GraphQL Plugin (bug): Content type's attributes marked as private are being exposed in the exported GraphQL schema (#9805) 
* Fixes #9804

* Fixes isPrivateAttribute function in strapi utils to take into account the private property within an attribute

* removing comment

* removing isNotPrivate function + adding call to already existing isPrivateAttribute function instead of isNotPrivate

* isPrivateAttribute fixed based on coments from Alexandre and confirmed that the model does indeed contain all private fields in an array at startup time

* removing isNotPrivate function and fixing generateEnumDefinitions to use the already available isPrivateAttribute function

* checking if created_at and update_at are also marked as private and if this is the case then hiding them

* allowIds by default when generating the input model to see if the tests will pass

* moving allowIds back to false by default

* adding isTypeAttributeEnabled function to check if a type attribute has been disabled and remove it from the exported graphql schema

* removing unused var

* only using isTypeAttributeEnabled instead of isPrivateAttribute.

* adding isPrivateAttribute at association level

* Adding isNotPrivate back together with isTypeAttributeEnabled

* adding unit test for removing a disabled attribute from a graphql schema

* renaming person to player in the test model

* Deleting the file as it has been renamed in the strapi master branch

* fixing lint issues

* fixing some lint issues

* adding isTypeAttributeEnabled support

* adding enumeration field in graphql

* adding use strict; to test file

* fixing test checking that disabled attributes in graphql are removed from the graphql schema

* adding test for buidShadowCrud

* Update packages/strapi-plugin-graphql/services/type-builder.js

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

Co-authored-by: Rmaroun <rmaroun@outlook.com>
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2021-05-10 09:35:07 +02:00
cyril lopez
ccc270c756
Merge pull request #10272 from strapi/chore/move-files 
Remove validations folder from @strapi/admin
 2021-05-10 08:59:15 +02:00
soupette
7fb1b9b3a6 Remove reducers folder 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-10 08:46:42 +02:00
soupette
3cb0e17f1b Move validations folder into the Users page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-10 08:44:39 +02:00
cyril lopez
8c0f92d4a7
Merge pull request #10254 from strapi/chore/rename-containers-page 
Chore/rename containers page
 2021-05-10 08:19:49 +02:00
soupette
86f513058e Merge branch 'core/admin-config' of github.com:strapi/strapi into chore/rename-containers-page 2021-05-10 08:05:45 +02:00
cyril lopez
9ce4c35739
Merge pull request #10251 from strapi/core/overlay-blocker-apip 
Core/overlay blocker api
 2021-05-10 08:04:17 +02:00
cyril lopez
3198d19906
Fixes #10187 (#10193) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-07 15:04:16 +02:00
Pierre Noël
0b31bc3f42
make listLocales route available (#10255) 2021-05-07 09:54:55 +02:00
soupette
7646803367 Remove core/admin containers to pages 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 18:27:53 +02:00
soupette
df97f5df52 Move LeftMenu into the components folder 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 18:27:52 +02:00
soupette
524535837f Move none page components into the components folder 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 18:27:52 +02:00
soupette
21fb42e039 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 18:25:59 +02:00
soupette
a7b131ddc0 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 13:38:44 +02:00
soupette
62c7dadc3d Create AutoReloadOverlayBlocker 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 13:33:50 +02:00
soupette
2a0312e16a Created ne overlay blocker component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 13:33:44 +02:00
cyril lopez
856e59e99e
Merge pull request #10249 from strapi/core/notification-api 
Notfications API
 2021-05-06 13:30:28 +02:00
soupette
19c6255ae0 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 11:56:46 +02:00
ELABBASSI Hicham
311d8e10e5
Merge pull request #10250 from strapi/fix/sso 
Fix SSO success redirection
 2021-05-06 11:42:22 +02:00
soupette
25c8bbd60e Move react-query conf in StrapiApp 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 11:16:49 +02:00
soupette
d6c1016859 Merge branch 'core/admin-config' of github.com:strapi/strapi into core/notification-api 2021-05-06 11:09:16 +02:00
cyril lopez
4e0b544a28
Merge pull request #10242 from strapi/front/admin-plugin-api 
Front/admin plugin api
 2021-05-06 11:08:28 +02:00
HichamELBSI
8117d4786e Fix SSO success redirection 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-05-06 11:06:22 +02:00
soupette
a4c598bdc6 Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 10:58:32 +02:00
soupette
1913821e2f Move notifications API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 10:41:52 +02:00
soupette
72765543d1 Remove old notifications container 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 10:15:31 +02:00
soupette
68777cff2f Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 10:04:36 +02:00
cyril lopez
87b7b5090a
Merge pull request #10238 from strapi/chore/remove-config 
Remove admin config file
 2021-05-06 09:19:00 +02:00
soupette
06ad93aa09 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 09:17:26 +02:00
cyril lopez
308070894d
Merge pull request #10237 from strapi/core/webpack-env 
Add .env support in admin
 2021-05-06 09:15:11 +02:00
soupette
acac7b1e69 Fix test setup 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 09:14:31 +02:00
soupette
c7e2a2bd66 Prefix global variables by STRAPI_ADMIN 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-05 17:52:41 +02:00
soupette
ddc7a3d60b Clean files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-05 16:09:56 +02:00
soupette
dd71bf28ef Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-05 15:52:20 +02:00
soupette
b9daa2198a Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-05 15:41:23 +02:00
soupette
b4921dc967 Add @babel/polyfill - temp jest config 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-05 15:40:03 +02:00
cyril lopez
71822937e9
Merge pull request #10230 from strapi/chore/remove-saga-doc-plugin 
Chore/remove saga doc plugin
 2021-05-05 15:39:04 +02:00
cyril lopez
8f804648e2
Merge pull request #10217 from strapi/chore/webpack5 
Webpack 5 migration
 2021-05-05 15:38:13 +02:00