yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-23 09:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,925 Commits 111 Branches 484 Tags
Commit Graph

10009 Commits

Author SHA1 Message Date
Christian Capeans
890169a17f Improve error message 2023-04-28 14:54:53 +02:00
Gustav Hansen
eb70b19e1b
Merge pull request #16506 from strapi/feature/review-workflow-1-cm-list-color 
CM: Render stage color in the list-view
 2023-04-28 14:04:16 +02:00
Gustav Hansen
84a9da4b2a
Merge pull request #16546 from strapi/feature/review-workflow-1-d-and-d-stages 
Settings: Add drag and drop to allow reordering of stages
 2023-04-28 14:03:58 +02:00
Marc-Roig
620567022a
fix: persist tables after sync 2023-04-28 13:28:17 +02:00
Gustav Hansen
2cba0325e0 CM: Render stage color in the list-view 2023-04-28 13:27:39 +02:00
Gustav Hansen
12638795e9 Chore: Update tests 2023-04-28 13:21:31 +02:00
Christian Capeans
87a65c6c1a Merge branch 'fix/protect-assets-backup' of https://github.com/strapi/strapi into fix/protect-assets-backup 2023-04-28 13:20:08 +02:00
Christian Capeans
1b52da5cd7 Improve error message 2023-04-28 13:19:14 +02:00
Ben Irvin
99ad20fe12 remove uuid types 2023-04-28 12:10:41 +02:00
Ben Irvin
b47b339a49 replace uuid package with crypto.randomUUID 2023-04-28 12:02:35 +02:00
Marc-Roig
c20f16e930
fix: do not remove tables if array is empty 2023-04-28 11:57:28 +02:00
dependabot[bot]
328154a2fc
Bump ws from 8.11.0 to 8.13.0 (#16512) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-28 08:43:14 +02:00
Arthur Brière
a5b1fb51c4
fix/fix-typo-in-fr-translations (#16544) 2023-04-28 08:37:05 +02:00
Ben Irvin
01c02b51b4
Rename build directory to build-command so it doesn't get ignored (#16523) 2023-04-28 08:27:31 +02:00
Christian
a3ab33afac
Merge branch 'main' into fix/protect-assets-backup 2023-04-27 22:14:06 +02:00
Christian Capeans
fff1cd3933 Avoid creating the backup folder if assets are not transfered 2023-04-27 22:07:19 +02:00
Marc-Roig
e88eee0ecf
fix: transform depdns on to array 2023-04-27 18:29:48 +02:00
Marc-Roig
9dae8499d5
fix: depends on should be an array 2023-04-27 18:11:17 +02:00
Gustav Hansen
9978e0fda3 Settings: Add drag and drop to allow reodering of stages 2023-04-27 18:01:33 +02:00
Gustav Hansen
476821033f CM: Allow list-view to be sorted by stages 2023-04-27 17:10:14 +02:00
Ben Irvin
2b77c4ac88
Merge pull request #16525 from strapi/fix/builder-set-collection-name 2023-04-27 15:54:47 +02:00
Ben Irvin
c33855d39e
Merge pull request #16508 from strapi/chore/add-error-on-empty-content-type-folder 2023-04-27 14:22:54 +02:00
Christian Capeans
1b8a5a7866 Improve error when assets backup folder cannot be created 2023-04-27 14:06:30 +02:00
Gustav Hansen
9de528d7d5 Merge branch 'main' into feature/review-workflow-1 2023-04-27 13:13:43 +02:00
Gustav Hansen
7d1e4b18e2
Merge pull request #16533 from strapi/chore/drag-layer-helper-plugn 
Chore: Split DragLayer out of the CM and make it available across the app
 2023-04-27 13:07:01 +02:00
Josh
c62bca7913 fix: AutoReload context value had incorrect names for object properties 2023-04-27 10:30:10 +01:00
Gustav Hansen
e5756043ef Chore: Split DragLayer out of the CM and make it available across the app 2023-04-27 09:55:28 +02:00
Rémi de Juvigny
27ee844d08 Remove log from tests 2023-04-27 09:54:56 +02:00
Convly
88a771b44c Merge branch 'main' into ts-support-2/automatic-type-generation 2023-04-27 09:30:27 +02:00
Convly
8167bb95d2 Automatically generate schemas TS types on dev server restart 
Default to false & add experimental tag
 2023-04-27 09:26:45 +02:00
Ben Irvin
32de22a421
Merge branch 'main' into fix/builder-set-collection-name 2023-04-26 16:01:43 +02:00
Alexandre Bodin
68604f9853 Merge branch 'main' of github.com:strapi/strapi into release/4.10.1 2023-04-26 15:50:41 +02:00
Alexandre Bodin
23b531cef5 v4.10.1 2023-04-26 15:45:41 +02:00
Alexandre Bodin
ce60415a07 Do not ignore build command on npm publish 2023-04-26 15:34:07 +02:00
Ben Irvin
63e35a6550 allow builder to set collection name 2023-04-26 15:19:01 +02:00
Alexandre Bodin
b36292e67b Merge branch 'releases/4.10.0' 2023-04-26 14:39:05 +02:00
Alexandre Bodin
9b5519778f v4.10.0 2023-04-26 14:32:28 +02:00
Gustav Hansen
2d8c8eec3c
Merge branch 'feature/review-workflow-1' into feature/review-workflow-1-edit-view-color 2023-04-26 14:11:58 +02:00
Marc
6fc31d84bd
Merge pull request #16482 from strapi/feautre/rw-colors 2023-04-26 13:43:43 +02:00
Gustav Hansen
ac89f99b1d CM: Display stage colors in the edit view sidebar 2023-04-26 12:46:05 +02:00
Josh
e3af28c527
Merge pull request #16418 from GitStartHQ/fix/condition-fields-break-checkbox 2023-04-26 11:23:17 +01:00
Ben Irvin
ea75258555 only check if schema exists 2023-04-26 11:56:40 +02:00
Ben Irvin
53a4abeb77 throw error instead of logging 2023-04-26 11:41:03 +02:00
Ben Irvin
04bbd2215e add error when content type wasn't loaded 2023-04-26 11:35:55 +02:00
Josh
d07d489109 chore: convert admin-utils to TS and reorganise preset setup 
chore

chore: fix tests

chore: fix workflow

chore: tidy ups

chore: test fixes

chore: skip nx cache

chore: pr amends

chore: fix rogue incorrect import
 2023-04-26 09:57:17 +01:00
Josh
407be7cbbd
Merge pull request #16481 from strapi/chore/refactor-hp-to-features 2023-04-26 09:56:28 +01:00
Gustav Hansen
10983f3ba7
Merge pull request #16499 from strapi/feature/review-workflow-1-settings-color 
Settings: Implement color select for stages
 2023-04-26 10:54:37 +02:00
Gustav Hansen
2c6624f64f Chore: Update reducer tests 2023-04-26 10:15:47 +02:00
Josh
4134c0e33b refactor: colocate code in helper-plugin features for clearer view 
refactor: move Notification logic into helper-plugin

refactor: wip

fix: typo

chore: fix tests

chore: ensure contexts are still exported

Update packages/core/helper-plugin/src/features/OverlayBlocker.js

Update packages/core/helper-plugin/src/features/AutoReloadOverlayBlocker.js

Co-Authored-By: Gustav Hansen <gustav.hansen@strapi.io>
 2023-04-26 09:06:18 +01:00
Alexandre BODIN
12d3068013
Migrate generators to ts (#16392) 2023-04-26 09:07:40 +02:00