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

32846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
ccec6c9fc3 Merge branch 'main' into chore/ts-strapi 2023-09-15 10:53:49 +02:00
Christian
7da316a918
Merge branch 'main' into fix/dynamic-zone-test 2023-09-15 10:43:41 +02:00
Christian Capeans
2b576173c8 Merge branch 'main' of https://github.com/strapi/strapi into types/utils-tests 2023-09-15 10:31:30 +02:00
Christian Capeans
4b310cfcd3 Merge branch 'main' of https://github.com/strapi/strapi into types/es-tests 2023-09-15 10:18:21 +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
Ben Irvin
e9ff720a77
Merge pull request #18029 from strapi/fix/16836-dts-postgres-schema 2023-09-15 10:04:22 +02:00
Christian Capeans
1339d274d0 Remove unnecessary import 2023-09-14 17:33:59 +02:00
Christian Capeans
b50cc5d0d6 Fix test warnings adding act 2023-09-14 17:33:13 +02:00
Jamie Howard
8145855e7a
Merge pull request #18043 from strapi/feature/migration-into-rw-rbac 2023-09-14 11:50:22 +01:00
markkaylor
aec9541f67
Fix RBAC provider single child expectation (#18057) 2023-09-14 10:14:11 +02:00
Ben Irvin
37d42ef00e update comment 2023-09-14 10:11:52 +02:00
Josh
e45b1d2eca
tests(user-permissions): add default messages for form errors (#18063) 2023-09-14 08:51:34 +01:00
Gustav Hansen
d73f7946c4
Merge pull request #18055 from strapi/fix/stage-context-alignment 
fix(review-workflows): improve stage action alignment
 2023-09-14 09:30:22 +02:00
Josh
1d5272ff86
tests(marketplace): await data-fetching so there's no act warnings (#18053) 2023-09-14 08:11:40 +01:00
Gustav Hansen
c29bf5c38e
Merge pull request #18056 from strapi/chore/feature/rw-stage-rbac-docs 
chore(docs): extend contributor docs by RBAC for stages
 2023-09-14 09:10:32 +02:00
Jamie Howard
cca4181f28 chore(docs): RBAC for stages in content manager docs 2023-09-14 09:10:12 +02:00
Jamie Howard
33d090f98d chore(docs): extend contributor docs by RBAC for stages backend 2023-09-14 09:10:12 +02:00
Gustav Hansen
f385aa6c8c chore(docs): extend contributor docs by RBAC for stages 2023-09-14 09:10:12 +02:00
Christian Capeans
361b318f91 Fix routes 2023-09-13 18:34:29 +02:00
Alexandre Bodin
749e4c3238 Merge branch 'releases/4.13.6' 2023-09-13 17:43:50 +02:00
Alexandre Bodin
d44586fa07 v4.13.6 v4.13.6 2023-09-13 17:35:18 +02:00
Mark Kaylor
ffe87e8131 Merge tag 'v4.13.5' into releases/4.13.6 
v4.13.5
 2023-09-13 17:05:03 +02:00
Alexandre BODIN
23f8fd99eb
Update packages/core/strapi/src/commands/actions/generate/command.ts 
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
 2023-09-13 15:24:29 +02:00
Bassel
082cde5874 update controllers 2023-09-13 15:41:16 +03: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
4885a6e8df
Merge pull request #17920 from strapi/fix/relation-input-wrapping 
fix(CM): fix relation layout
 2023-09-13 10:45:57 +02:00
Gustav Hansen
b43f445a65 chore: update snapshot tests 2023-09-13 10:21:40 +02: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
Gustav Hansen
778fffbe1a fix(helper-plugin): move prop-type validation a level down 2023-09-13 09:51:02 +02:00
Kushal Kanungo
ae06d7f100 changed the error type from application to forbidden 2023-09-12 20:24:43 +05:30
Alexandre Bodin
0ae5ef0078 Merge branch 'releases/4.13.5' 2023-09-12 16:51:13 +02:00
Gustav Hansen
cfe39aeb41
Merge pull request #18034 from strapi/feature/rw-stage-rbac-merge-09-12 
Merge `main` into `feature/rw-stage-rbac`
 2023-09-12 16:50:33 +02:00
Gustav Hansen
d5f4d8bb45
Merge pull request #18038 from strapi/feature/rw-stage-rbac-apply-all-ib 
fix(review-workflows): make apply to all stages an iconbutton
 2023-09-12 16:50:10 +02:00
Alexandre Bodin
955393fc3e v4.13.5 v4.13.5 2023-09-12 16:40:40 +02:00
Jamie Howard
e53cb36ee2 feature(ee): migrate stages into RBAC versions 2023-09-12 15:40:23 +01:00
Ben Irvin
802c9126af remove comment 2023-09-12 16:33:23 +02:00
Alexandre BODIN
e22b016617
Merge pull request #18028 from strapi/fix/backend-url-can-be-empty-string 2023-09-12 16:05:49 +02:00
Bassel
b18601b5bc Merge branch 'chore/ts-strapi' into types/plugins 2023-09-12 15:50:55 +03:00
Josh
4d92b11512 fix: set a fallback where we define window.strapi.backendURL 2023-09-12 13:45:08 +01:00
Bassel
d88c8a0cce remove changer in .gitignore 2023-09-12 15:41:23 +03: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
7029d9027e fix(CM): fix relation layout 2023-09-12 13:35:05 +02:00
Gustav Hansen
2d6e9f1c2f fix(review-workflows): update confirm button styles for apply all action 2023-09-12 13:34:50 +02:00
Gustav Hansen
370794f1fa
Merge pull request #18004 from strapi/dependabot/npm_and_yarn/vercel/ncc-0.38.0 
chore(deps-dev): bump @vercel/ncc from 0.36.1 to 0.38.0
 2023-09-12 13:32:05 +02:00
Gustav Hansen
9481ffd311
Merge pull request #18007 from strapi/dependabot/npm_and_yarn/nx-16.8.1 
chore(deps-dev): bump nx from 16.7.2 to 16.8.1
 2023-09-12 13:30:36 +02:00
Ben Irvin
66ac88ef36 update comment 2023-09-12 11:57:40 +02:00
Bassel
2d12c3133c re-export everything 2023-09-12 12:36:33 +03:00
Bassel
7c71ea3de2 remove TStrapi 2023-09-12 12:30:34 +03:00