yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-28 19:34:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 114 Branches 486 Tags
Commit Graph

1364 Commits

Author SHA1 Message Date
Simone
24fa848ba3
Add new Blocks rich text editor (alpha) (#18166) 
Co-authored-by: Madhuri Sandbhor <madhurisandbhor@gmail.com>
Co-authored-by: markkaylor <mark.kaylor@strapi.io>
Co-authored-by: Rémi de Juvigny <remi.dejuvigny@strapi.io>
Co-authored-by: Madhuri Sandbhor <madhuri.sandbhor@strapi.io>
 2023-09-26 17:21:44 +02:00
Gustav Hansen
fc86e60e00 Merge branch 'main' into feature/rw-stage-rbac 2023-09-25 12:16:34 +02:00
Alexandre Bodin
bac1fb9210 Fix tests & make router config optional 2023-09-15 18:37:02 +02:00
Alexandre Bodin
efc1c40f22 Apply review comments 2023-09-15 11:09:37 +02:00
Alexandre Bodin
ccec6c9fc3 Merge branch 'main' into chore/ts-strapi 2023-09-15 10:53:49 +02:00
markkaylor
917a40b555
refactor(helper-plugin): migrate to TS (#17746) 
Co-authored-by: Fernando Chávez <fc9chavez@gmail.com>
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
Co-authored-by: markkaylor <mark.kaylor@strapi.io>
Co-authored-by: Mark Kaylor <mark.kaylor@strapi.io>
Co-authored-by: Madhuri Sandbhor <madhurisandbhor@gmail.com>
Co-authored-by: Jackson Hammond <malts18@gmail.com>
Co-authored-by: yurimutti <muttiyuri@gmail.com>
Co-authored-by: Fernando Chávez <fernando.chavez@strapi.io>
Co-authored-by: GJunior <samaritanojr006@gmail.com>
Co-authored-by: Milan K <57148574+mkcy3@users.noreply.github.com>
Co-authored-by: Rémi de Juvigny <remi.dejuvigny@strapi.io>
Co-authored-by: boris.shulyak <borysshulyak@gmail.com>
Co-authored-by: Alec Winter <34278963+nolliebigspin@users.noreply.github.com>
Co-authored-by: Boris Shulyak <55171497+BorysShulyak@users.noreply.github.com>
Co-authored-by: 0xATHERIS <ath3ris@proton.me>
Co-authored-by: Andrew <112592168+fletch-r@users.noreply.github.com>
Co-authored-by: Rémi de Juvigny <8087692+remidej@users.noreply.github.com>
Co-authored-by: Dallas Clark <542948+dallasclark@users.noreply.github.com>
Co-authored-by: Okorare Tega <contact@tegacreatives.com>
Co-authored-by: Júlíus Guðni <julius@extis.one>
Co-authored-by: Simone <startae14@gmail.com>
 2023-09-15 10:08:21 +02:00
Jamie Howard
8145855e7a
Merge pull request #18043 from strapi/feature/migration-into-rw-rbac 2023-09-14 11:50:22 +01:00
Gustav Hansen
e9e93b0eb9 fix(review-workflows): improve stage action alignment 2023-09-13 12:05:32 +02:00
Jamie Howard
8298ef2f9b chore(ee): cleanup migration file 2023-09-13 10:32:52 +01:00
Gustav Hansen
3f47fb9e30
Merge pull request #17981 from strapi/fix/rw-stage-rbac-apply-button-color 
fix(review-workflows): update confirm button styles for apply all action
 2023-09-13 10:16:45 +02:00
Jamie Howard
e53cb36ee2 feature(ee): migrate stages into RBAC versions 2023-09-12 15:40:23 +01:00
Gustav Hansen
1b6a57d366 fix(review-workflows): make apply to all stages an iconbutton 2023-09-12 14:10:43 +02:00
Gustav Hansen
b6e0798993 Merge branch 'main' into feature/rw-stage-rbac-merge-09-12 2023-09-12 13:47:07 +02:00
Gustav Hansen
2d6e9f1c2f fix(review-workflows): update confirm button styles for apply all action 2023-09-12 13:34:50 +02:00
Alexandre Bodin
96c86c65c5 Merge branch 'main' into chore/ts-strapi 2023-09-11 15:04:30 +02:00
Marc Roig
a8580fef02
Merge pull request #17983 from strapi/fix/workflow-name-is-reseted-when-downgrade-ce 2023-09-08 15:39:10 +02:00
Marc-Roig
61d65e72f6
fix: prevent workflow name to be reseted when CE -> EE 
Workflow name was reseted to 'Default' when upgrading to EE, because the migration files compares the workflow content type between the migration, and on CE -> EE the workflow content type does not exist in CE
 2023-09-08 14:35:42 +02:00
Marc Roig
8b3b588924
Merge pull request #17965 from strapi/fix/stage-colors-on-create 2023-09-07 16:59:57 +02:00
Gustav Hansen
1e2825f0bc fix(review-workflows): fix design papercut issues 2023-09-07 13:41:12 +02:00
Marc-Roig
ba65bb5b8a
fix: pick color attribute on create workflow 2023-09-07 12:36:54 +02:00
Jim LAURIE
1feb571a91
Add event to sync project data more frequently - admin users count + active admin users count (#17857) 
Co-authored-by: Marc-Roig <marc12info@gmail.com>
 2023-09-07 00:13:09 +02:00
Alexandre Bodin
c779954631 Merge branch 'main' into chore/ts-strapi 2023-09-06 23:41:27 +02:00
Marc-Roig
e7f4dbb935
fix: remove settings update policy to update stage 2023-09-06 15:02:58 +02:00
Alexandre Bodin
646a1f0b83 Fix tests 2023-09-06 12:53:59 +02:00
Jamie Howard
e264977b48 Merge remote-tracking branch 'origin/feature/rw-stage-rbac' into feature/stage-content-type-check 2023-09-06 11:29:32 +01:00
Jamie Howard
d61161d378 test(ee): forbidden stage list 2023-09-06 09:44:55 +01:00
Gustav Hansen
5e0747c56a fix(review-workflows): fix cloning for temporary stages 2023-09-06 09:23:46 +02:00
Jamie Howard
44edf8c0c5 Merge remote-tracking branch 'origin/feature/rw-stage-rbac' into feature/stage-content-type-check 2023-09-05 16:42:25 +01:00
Jamie Howard
eec9f6ab5a fix(ee): use react-query refetch 2023-09-05 14:49:50 +01:00
Gustav Hansen
5c44739d1b chore(review-workflow): enable assignee test-suite 2023-09-05 15:44:23 +02:00
Jamie Howard
54828682e2 fix(ee): invalidate stages list when stage is changed 2023-09-05 10:12:08 +01:00
Alexandre Bodin
f031820696 fix EE imports 2023-09-05 00:18:13 +02:00
Jamie Howard
138569ae9f feature(ee): forbid access to listAvailableStages without READ content type access 2023-09-04 16:51:09 +01:00
Jamie Howard
2671fbc032 fix(ee): revert permission change FE logic 2023-09-04 15:49:27 +01:00
Jamie Howard
957f4df2d2 Merge remote-tracking branch 'origin/feature/rw-stage-rbac' into rw-stage-rbac/support-partial-updates 2023-08-31 11:32:00 +01:00
Gustav Hansen
3311b6653d
Merge pull request #17863 from strapi/fix/rw-stages-rbac-menu 
fix(rw): hide endIcon on stage context menu
 2023-08-31 11:08:22 +02:00
Gustav Hansen
fc701c5dd8 fix(rw): hide endIcon on stage context menu 2023-08-30 14:32:54 +02:00
Gustav Hansen
8782f020bc fix(rw): allow subtractive partial updates 2023-08-30 14:08:21 +02:00
Gustav Hansen
b6b5cfc8a4 Merge branch 'main' into feature/rw-stage-rbac 2023-08-30 12:46:54 +02:00
Gustav Hansen
bc6c5b0058 chore: Revert "Chore: Refactor admin app entries" 2023-08-29 17:18:48 +02:00
Gustav Hansen
6f1d9a15dd
Revert "Fix: Use sync over async components in admin panel APIs" 2023-08-29 09:24:29 +02:00
Gustav Hansen
ce8540811c
Merge pull request #17798 from strapi/fix/assignee-rbac-edit-view 
fix(cm): check permissions before loading users
 2023-08-28 16:03:21 +02:00
Gustav Hansen
24cc6f5da6 chore(cm): skip assignee select tests temporarily 2023-08-28 15:31:29 +02:00
Gustav Hansen
8ff281e1ae fix(cm): check permissions before loading users 2023-08-28 14:24:09 +02:00
Jamie Howard
7383cadbb1 test(ee): update test for CM list view assignee 2023-08-28 13:36:56 +02:00
Jamie Howard
a2c1c37f7a fix(ee): use getDisplayName for CM list view assignee column 2023-08-28 13:36:56 +02:00
Jamie Howard
9e080a4d84 chore(ee): remove src stages when stages are being updated 
chore(ee): remove minimum length validation for stage array
 2023-08-25 16:17:46 +01:00
Jamie Howard
a20b7af3ea chore(ee): update assignee select success messaging 2023-08-25 10:08:38 +01:00
Jamie Howard
895b960f69 test(ee): add test for partial stage permission update 2023-08-25 09:55:53 +01:00
Jamie Howard
6ee56bc409 Merge remote-tracking branch 'origin/feature/rw-stage-rbac' into rw-stage-rbac/list-available-stages 2023-08-23 15:11:28 +01:00