yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 10:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,470 Commits 114 Branches 488 Tags
Commit Graph

10364 Commits

Author SHA1 Message Date
Gustav Hansen
2145a3c1f5 Fix: Add border to stage color badges 2023-05-08 11:26:01 +02:00
Ben Irvin
58b8c18870 add confirmation to transfer and import 2023-05-08 10:44:29 +02:00
Konstantin Münster
2c4dce9273
Update CustomFieldServerOptions 
inputSize properties aren't optional
 2023-05-08 10:34:22 +02:00
Konstantin Münster
71e00b0180
Extend CustomFieldServerOptions 
add new inputSize configuration
 2023-05-08 10:22:50 +02:00
dependabot[bot]
fe0cee13b1
chore(deps): bump webpack from 5.76.0 to 5.82.0 
Bumps [webpack](https://github.com/webpack/webpack) from 5.76.0 to 5.82.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.76.0...v5.82.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-07 22:58:40 +00:00
Dominic Seitz
93c049bb0d
Merge branch 'main' into main 2023-05-07 22:32:58 +02:00
Ben Irvin
4b37d806ca report diffs before confirming 2023-05-07 16:10:20 +02:00
Ben Irvin
9cbdad0a70 add middleware for schema diff handling 2023-05-07 15:48:14 +02:00
Amandeep Singh Malhotra
8732f348a4 fix: change alignment from stretch to center 2023-05-07 18:13:52 +05:30
Josh
870865d7b9 chore: make default context so we don't need provider or mocking 2023-05-05 19:06:07 +01:00
Josh
5acae2e2a9 chore: remove tracking mocks 2023-05-05 18:47:48 +01:00
Ben Irvin
b012dc6e78 Bypass schema check and ignore fields and links that do not exist in destination 
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
 2023-05-05 16:15:13 +02:00
Ben Irvin
7747d1d3d1 initial commit 2023-05-05 13:11:59 +02:00
Gustav Hansen
a7d616e158
Merge pull request #16616 from strapi/fix/rw-settings-btn-spacing 
Fix: Reset gap between stage action buttons
 2023-05-04 17:42:06 +02:00
Gustav Hansen
16b2e3c35b Fix: Remove drag handler preview when dragging a stage 2023-05-04 15:55:20 +02:00
Gustav Hansen
b52e977182 Fix: Reset gap between stage action buttons 2023-05-04 15:34:01 +02:00
Gustav Hansen
87a0a58adc Chore: Update success notification text 2023-05-04 15:00:30 +02:00
Paul
5b8969ab7b
Upd ru from en.json 
Added 7 new strings
 2023-05-04 15:37:00 +03:00
Josh
ef9ed92c45 chore: update ds@1.7.3 2023-05-04 11:45:05 +01:00
Marc
a169d81090
Merge pull request #16484 from strapi/feat/declare-content-api-endpoints-in-admin 2023-05-04 10:09:05 +02:00
Convly
939beff915 Merge branch 'releases/4.10.2' 2023-05-03 15:18:53 +02:00
Convly
a02b19866a v4.10.2 2023-05-03 15:04:25 +02:00
Nathan Pichon
3fa939d16a
Merge pull request #15748 from strapi/chore/docs-api-ref 
docs: api reference
 2023-05-03 09:57:19 +02:00
Simen Daehlin
0185466fed
Merge branch 'main' into fix/rename-content-builder-message 2023-05-02 20:07:19 +01:00
Gustav Hansen
93c85d856d
Merge pull request #16585 from strapi/feature/review-workflow-1 
Enhancement: Review workflow colors and reordering
 2023-05-02 16:27:14 +02:00
Nathan Pichon
fd2f06ee8e
Merge branch 'main' into chore/docs-api-ref 2023-05-02 15:25:49 +02:00
Gustav Hansen
2b1d7e854c
Merge pull request #16587 from strapi/chore/cm-settings-cleanup 
Chore: CM - Minor cleanup of configure the view
 2023-05-02 14:09:14 +02:00
Marc
e71fa3ec1e
Merge pull request #16364 from strapi/fix/mysql-deadlock-performance-issues 2023-05-02 13:49:20 +02:00
Gustav Hansen
392fa438b7 CM: Add max length for stage names in the list-view 2023-05-02 12:54:09 +02:00
Gustav Hansen
c996eca2ea Settings: Fix color badge with long stage names 2023-05-02 12:08:20 +02:00
Gustav Hansen
a8adb71ec2
Merge pull request #16562 from strapi/feature/review-workflow-1-normalize-color 
Settings: Normalize color hex; display custom color values
 2023-05-02 11:57:27 +02:00
Gustav Hansen
40eafd428d Chore: CM - Minor cleanup of configure the view 2023-05-02 11:53:17 +02:00
Josh
595edd3d0d chore: add translatable label to Marketplace Sortby Select 2023-05-02 10:41:29 +01:00
Josh
85b3eeb64f chore: update to DS 1.7.2 
chore: add snapshots

chore: update to 1.7.0

chore: fix tests

chore: fix hp & upload tests

chore: fix admin tests

chore: fix user-permissions FE test

chore: update snapshots and helper-plugin

fix: multi-select

chore: bump to 1.7.1

chore: bump to 1.7.2

chore: update snapshots

fix: broken test

chore: update snapshots
 2023-05-02 10:23:23 +01:00
Marc-Roig
7f7b11099f
Merge branch 'feature/review-workflow-1-normalize-color' into review-workflow-1/fix-update-only-stage-color 2023-05-02 11:15:45 +02:00
Simen Daehlin
504fee7795 Renamed message when running in production. 2023-05-02 10:00:38 +01:00
Marc
1815e881cb
Merge pull request #16583 from strapi/review-workflow-1/color-migration 2023-05-02 11:00:12 +02:00
Marc-Roig
00ec2c98a8
fix: unit tests 2023-05-02 10:51:27 +02:00
Marc-Roig
7b9940acf4
Merge branch 'feature/entity-service-wrapOutput' into feature/private-s3-url-signing-content-api 2023-05-02 10:50:59 +02:00
Gustav Hansen
dc33e41ce2 Settings: Normalize color hex to be lowercase; display custom values 2023-05-02 10:40:38 +02:00
Marc-Roig
7281ffc268
Merge branch 'main' into feature/entity-service-wrapOutput 2023-05-02 10:32:04 +02:00
Jean-Sébastien Herbaux
cd5e791448
Merge pull request #16516 from strapi/ts-support-2/automatic-type-generation 2023-05-02 09:45:07 +02:00
gitstart
50540747e0 chore: revert less readable translation update 
Co-authored-by: oxenprogrammer <7220167+oxenprogrammer@users.noreply.github.com>
 2023-05-02 05:54:01 +00:00
gitstart
45d81c8d3c Merge commit '83d394f47f5b5ee11b31f535997dd73358434317' of https://github.com/GitStartHQ/strapi into fix/description-min-and-max-characters 2023-05-02 05:53:58 +00:00
dependabot[bot]
6ed2132d3a
Bump react-intl from 6.3.2 to 6.4.1 
Bumps [react-intl](https://github.com/formatjs/formatjs) from 6.3.2 to 6.4.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@6.3.2...react-intl@6.4.1)

---
updated-dependencies:
- dependency-name: react-intl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-30 23:56:52 +00:00
Dominic Seitz
202a7d0b79
Merge branch 'main' into main 2023-04-30 18:51:17 +02:00
Marc-Roig
57ebe9c3e8
chore: change comment 2023-04-29 12:01:18 +02:00
Marc-Roig
ff33454691
feat: migrateReviewWorkflowStagesColor 2023-04-29 12:00:50 +02:00
Marc-Roig
dad3437033
chore: add default stage color constant 2023-04-29 11:59:33 +02:00
derrickmehaffy
2382e26b97 fix typo in config path for SSO domain 2023-04-28 09:42:28 -07:00