yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 21:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,157 Commits 123 Branches 496 Tags
Commit Graph

17157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
f3fe056367
Merge pull request #9868 from strapi/ui/change-settings-modal 
UI/change settings modal
 2021-03-30 10:34:21 +02:00
soupette
b34939032a Update plugin name 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:31:29 +02:00
soupette
6db4e0c0f3 Change settings confirm modal type & change copy locale submit button label 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:31:29 +02:00
cyril lopez
95a4f340bc
Merge pull request #9867 from strapi/i18n/fix-label-tooltip 
[I18n] Fix label tooltip
 2021-03-30 10:28:31 +02:00
soupette
9db9fbfd8f Fix version number hover css 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:24:17 +02:00
soupette
9c8bd81dfc Upgrade Buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:24:17 +02:00
soupette
cd7eca2894 Change tooltip in helper component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:23:29 +02:00
cyril lopez
c7852fb5e2
Merge pull request #9863 from strapi/i18n/fix-rbac-ui 
Fix RBAC UI
 2021-03-30 10:22:39 +02:00
soupette
176e589db4 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:16:45 +02:00
soupette
48ab9bff46 Fix dropdown indicator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:05:59 +02:00
soupette
d28c184daf Use similar dropdown indicator as in the CM 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 09:36:48 +02:00
soupette
6ae9ad619c Fix tabs border radius 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 09:36:47 +02:00
cyril lopez
f859d127f0
Merge pull request #9862 from strapi/i18n/cm-fix-redirection-after-delete 
[I18n] CM fix redirection after delete
 2021-03-30 09:35:59 +02:00
soupette
8c0f996a12 Fix Pr feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 09:35:30 +02:00
cyril lopez
46bce2d4c9
Merge pull request #9859 from strapi/i18n/fix-ctb 
[i18n] Fix localisable attributes
 2021-03-30 09:30:33 +02:00
soupette
9f6f014414 Fix redirection link 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 08:23:05 +02:00
soupette
a127f35018 Fix create slug bug 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-29 19:06:57 +02:00
soupette
d27e901e72 Fix redirection issue when deleting an entry 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-29 18:39:17 +02:00
Alexandre BODIN
6a970ddc71
Merge pull request #9843 from strapi/i18n/migration-disable-CT 
Add migration when i18n is disabled on a CT
 2021-03-29 16:56:15 +02:00
Pierre Noël
f3500ecea5 use dropTableIfExists 2021-03-29 16:28:01 +02:00
Pierre Noël
2149493137 add migration when i18n is disabled on a CT 2021-03-29 16:28:01 +02:00
Alexandre BODIN
5b526b356d
Merge pull request #9835 from strapi/i18n/super-admin-default-permissions 
[i18N] Sync super admin permissions with locales list for localized subjects
 2021-03-29 16:13:10 +02:00
soupette
b3597cddff Fix Roles alignment 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-29 15:33:02 +02:00
Convly
92b45c238b Fix ee e2e test for admin-roles 2021-03-29 15:18:53 +02:00
soupette
3f52933f6a Add more types to the localisation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-29 15:08:05 +02:00
dependabot[bot]
4030106720
Bump react from 16.13.1 to 16.14.0 (#9853) 
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.13.1 to 16.14.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.14.0/packages/react)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-29 14:07:37 +02:00
dependabot[bot]
ee59d4fbc7
Bump apollo-server-koa from 2.19.1 to 2.22.1 (#9855) 
Bumps [apollo-server-koa](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-koa) from 2.19.1 to 2.22.1.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server-koa@2.22.1/packages/apollo-server-koa)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-29 12:49:23 +02:00
Jean-Sébastien Herbaux
93752c37ca
Chore/tests cleanup (#9857) 
* Use new jest runner

* Set loglevel to fatal

* Update snapshots

* Remove update option from cli

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2021-03-29 12:33:08 +02:00
Convly
4c21bea64b Use a global timeout instead of redefining it everytime 2021-03-26 20:15:38 +01:00
Convly
cab3a45b58 Fix resetSuperAdminPermissions unit test 2021-03-26 16:55:58 +01:00
Convly
e70804099c Fix typo 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-03-26 16:43:15 +01:00
Convly
370887695f Fix permissions differences on resetSuperAdminPermissions 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-03-26 16:37:29 +01:00
Convly
57ad9bc663 Set default jest timeout to 60s for every suite 2021-03-26 16:36:09 +01:00
markkaylor
b7bd30b918
add cross env (#9845) 2021-03-26 15:41:13 +01:00
dependabot[bot]
3a298d3350
Bump @fortawesome/fontawesome-free from 5.15.2 to 5.15.3 (#9841) 
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.15.2 to 5.15.3.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.15.2...5.15.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-26 09:55:13 +01:00
Convly
e1f1c14c13 Sync super admin permissions with locales list for localized subjects 2021-03-26 09:46:06 +01:00
Alexandre Bodin
a66e0269da Merge branch 'master' into features/i18n 2021-03-25 15:07:41 +01:00
Jean-Sébastien Herbaux
1e5b1c99f6
I18n/ permissions rework (#9535) 
* Add a domain layer for the permission, rework the engine handling of the permissions

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

* Add permissions-fields-to-properties migration for the admin

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

* Removes useless console.log

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

* Remove debug logLevel from provider-login.test.e2e.js

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

* Adds the new layout for the GET permissions, allow to subscribe to actionRegistered events, adds i18n handlers

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

* Fix typo

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

* Update permissions validators

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

* Update unit tests

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

* Update integrations test + fix some validation issues

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

* Change plugins & settings section format for the permissions layout

* only return locales property to localized subjects for the permission's layout

* Do not send the locales property to the permission's layout when there is no locales created

* Add the 'locales' property to publish & delete routes

* Fix unwanted mutation of the sections builder states on multiple builds

* Fix units tests with (new engine)

* Fix admin-role e2e test - Add locales property to the update payload

* fix e2e testsé

* Update e2e snapshots

* Fix unit test for i18n bootstrap

* Add mocks for i18n/bootstrap test

* Fix has-locale condition & updatePermission validator

* Avoid mutation in migration, always authorize super admin for has-locales condition

* Rework rbac domain objects, add a hook module and a provider factory

* Remove old providers

* Update the admin services & tests for the new rbac domain & providers

* Fix tests, bootstrap functions & services following rbac domain rework

* Update migration runner

* PR comments

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

* Remove useless console.log

* Fix sanitizeCondition bug

* Section builder rework

* Add test for the section-builder section & add jsdoc for the permission domain

* pr comments (without the migrations)

* fix fields-to-properties migration

* Add jsdoc for the sections-builder

* Moves createBoundAbstractDomain from permission domain to the engine service

* Remove debug logLevel for admin role test (e2e)

* Fix core-store

* Fix hooks & move business logic from i18n bootstrap to dedicated services

* add route get-non-localized-fields

* use write and read permission

* refacto

* add input validator

* add route doc

* handle ST

Co-authored-by: Pierre Noël <petersg83@gmail.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-03-25 14:59:44 +01:00
cyril lopez
56cd7cad86
Merge pull request #9834 from strapi/i18n/front-fixes 
I18n/front fixes
 2021-03-25 14:51:21 +01:00
Alexandre Bodin
3065d72a4b v3.5.4 v3.5.4 2021-03-25 14:34:45 +01:00
Alexandre BODIN
cb44cd3f63
Merge pull request #9480 from strapi/features/starter-cli 
[Starter CLI] Create CLI for Strapi starter project
 2021-03-25 14:33:05 +01:00
soupette
0d897d31be Fix common fields 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-25 14:11:23 +01:00
Mark Kaylor
5505efd304 Create CLI for Strapi starter project 
Create starter CLI

Add spaces option

Extract project basename

Add starter shortcut

Refactor git init commit

Replace concurrently with npm-run-all

Move fetch repo function to dedicated file

Allow shortcut to accept external org repo

Fix package config & readme

Fix versions

Add task prefixes

Update readme

[Starter CLI] error handling (#9600)

* Display error message + help for missing arguments

* Add cleaner error messages

* Bump commander from v6.1.0 to v7.1.0

* Capture and log errors from commander

* Simplify cli argument errors

* Provide more human readable error messages

* Replace throw with console log

* Add logger

Add starter tracking

Add wrapper for tracking keys

Update root config

Keep template in scope root

fix strapi config

Fix open frontend

Remove open-cli

Update for rename frontend->starter

update description

Update tracking

Fix tests

fix e2e tests

Make sure packageJsonStrapi does not override unwanted keys & make it optional to avoid errors

simplify metadata strapi

Allow stater or frontend folder for smooth migration of existing starters

Udpate dep

Handle error
 2021-03-25 14:06:01 +01:00
soupette
791b0e0283 Add logic to update the menu links when the configurations have been changed 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-25 12:18:29 +01:00
soupette
84ab8f3b45 Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-25 11:48:46 +01:00
soupette
37830f725f Move links search logic into the main menu 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-25 11:09:15 +01:00
dependabot[bot]
e9127b7ca0
Bump @sentry/node from 6.2.0 to 6.2.3 (#9829) 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 6.2.0 to 6.2.3.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/6.2.0...6.2.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-25 09:02:02 +01:00
Alexandre BODIN
83065dae7b
Merge pull request #9825 from strapi/i18n/migration-default-locale 
Add migration when a CT becomes localized
 2021-03-24 17:01:19 +01:00
soupette
9e4fcd9de6 Fix react select option style 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-24 16:04:00 +01:00
Pierre Noël
d0e90144e3 refacto 2021-03-24 14:32:16 +01:00