yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 01:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,097 Commits 115 Branches 488 Tags
Commit Graph

7070 Commits

Author SHA1 Message Date
Convly
ea9d810423 Sort aggregate key in transfer table 2022-12-05 10:31:04 +01:00
Convly
fe7047c33e Add IAsset type 2022-12-05 10:30:24 +01:00
Bassel
1d5057de4d Merge branch 'features/deits' into deits/import-configs 2022-12-05 11:28:48 +02:00
Bassel Kanso
88bb880840
Merge pull request #14896 from strapi/deits/restore-mechanism 
[DEITS] restore mechanism
 2022-12-05 11:24:19 +02:00
Christian Capeans
3690019075 Merge branch 'features/deits' into deits/cli-tests 2022-12-05 10:17:37 +01:00
Josh
e66352c649 test: fix test for hook & add one surrounding cache 2022-12-05 08:41:57 +00:00
gitstart
c1faa543ef chore: updates implementation logic 2022-12-05 05:17:58 +00:00
gitstart
37440bb814 Merge commit 'e3c273cf36d7d12547fcc4bea1778df513aedb46' of https://github.com/GitStartHQ/strapi into STRAP-63 2022-12-05 05:17:54 +00:00
Josh
52a4811d5d refactor: make it quicker to access cache 2022-12-02 17:43:57 +00:00
Josh
38d13deafa fix: use a global cache for custom inputs so they can be accessed anywhere 2022-12-02 17:23:00 +00:00
Bassel
3b715d01e1 update unit tests 2022-12-02 17:35:12 +02:00
Bassel
8b23bd5d2f change to beforeTransfer 2022-12-02 17:15:27 +02:00
Bassel
d02f411c96 fixing some tests 2022-12-02 13:20:23 +02:00
Bassel
3ec0b91013 Merge branch 'features/deits' into deits/restore-mechanism 2022-12-02 11:59:12 +02:00
Bassel
36b49e6149 change from beforestreaming to beforetransfer 2022-12-02 11:55:39 +02:00
Bassel
e23bc25925 update unit tests 2022-12-02 11:53:11 +02:00
Bassel
26dd3b4426 move defaults to command line 2022-12-02 11:47:55 +02:00
Ben Irvin
2573582c2c mock fs-extra 2022-12-01 17:03:23 +01:00
Ben Irvin
f911262119 Merge branch 'features/deits' into deits/ts-strapi-eslint-config 2022-12-01 14:29:16 +01:00
Ben Irvin
0888e34f67 merge features/deits 2022-12-01 14:21:06 +01:00
gitstart
d92bd64264 chore: corrects wrong editor focus checking method 2022-12-01 11:28:38 +00:00
Bassel
7b2a82d724 import project configurations 
Co-authored-by: Christian <christiancp100@gmail.com>
 2022-12-01 13:20:24 +02:00
Ben Irvin
e2b379993b make subitems grey 2022-12-01 11:54:41 +01:00
Ben Irvin
fce7114f6f add export to utils and rename file 2022-12-01 11:45:49 +01:00
Simone
ba11711c7e
Merge branch 'main' into fix/change-strapi-icons-color-in-dashboard 2022-12-01 11:36:41 +01:00
Ben Irvin
f35289918a Merge branch 'features/deits' into deits/import-progress 2022-12-01 11:32:52 +01:00
Marc
9cef257369
Merge pull request #15003 from strapi/fix/many-to-many-relationship-to-the-same-content 2022-12-01 09:25:48 +01:00
Christian Capeans
2d9253f5af Merge branch 'features/deits' into deits/cli-tests 2022-11-30 19:05:54 +01:00
Christian
589a06ab58
Merge pull request #14972 from strapi/deits/export-archive 
[DEITS] Add tests for local file destination provider
 2022-11-30 18:03:35 +01:00
Simone
6290d8a68a
Merge branch 'main' into fix/change-strapi-icons-color-in-dashboard 2022-11-30 17:51:29 +01:00
Simone Taeggi
76ce0677f6 update snapshots 2022-11-30 17:43:57 +01:00
Simone Taeggi
1c1ae40675 change the svg path colors 2022-11-30 17:42:16 +01:00
Ben Irvin
49419031c5 default confirmation to N 2022-11-30 17:33:44 +01:00
Ben Irvin
3086bb0f37 update progress tables 2022-11-30 17:33:31 +01:00
Simone
2d93875e30
Merge pull request #14927 from strapi/chore/tracking-edit-field-name 
Tracking system, editing collection name
 2022-11-30 17:00:24 +01:00
Convly
5453885f7a v4.5.3 2022-11-30 16:27:25 +01:00
Convly
20669b3e2c tmp 2022-11-30 16:08:27 +01:00
dependabot[bot]
d8a02ca9b8
chore(deps): bump msw from 0.42.3 to 0.49.1 
Bumps [msw](https://github.com/mswjs/msw) from 0.42.3 to 0.49.1.
- [Release notes](https://github.com/mswjs/msw/releases)
- [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mswjs/msw/compare/v0.42.3...v0.49.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 14:53:50 +00:00
Ben Irvin
76b48a30a8 Merge branch 'features/deits' into deits/import-progress 2022-11-30 15:42:44 +01:00
Bassel
d5e10d1b5c Merge branch 'features/deits' into deits/restore-mechanism 2022-11-30 16:40:56 +02:00
Ben Irvin
10dfd9381c Merge branch 'main' into features/deits 2022-11-30 15:34:40 +01:00
Ben Irvin
0718a1c0c4
Merge branch 'features/deits' into deits/import-progress 2022-11-30 15:26:50 +01:00
Ben Irvin
6077039196
Merge branch 'features/deits' into deits/ts-strapi-eslint-config 2022-11-30 15:24:08 +01:00
Simone
574985f9f0
Merge branch 'main' into enhancement/axios-refactoring 2022-11-30 14:57:09 +01:00
Simone
6fb62ca739
Merge branch 'main' into chore/tracking-edit-field-name 2022-11-30 14:56:18 +01:00
Simone
85425719d1
Merge branch 'main' into chore/tracking-edit-field-name 2022-11-30 14:50:18 +01:00
Christian Capeans
3c3e3b6ca8 Add missing dependencies 2022-11-30 13:05:42 +01:00
Christian Capeans
b69d73aa34 Merge branch 'features/deits' into deits/export-archive 2022-11-30 13:01:27 +01:00
Ben Irvin
a8c7d46b30 use commander to 8.2.0 2022-11-30 11:58:40 +01:00
dependabot[bot]
e49ee71ce2
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4 
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 5.2.0 to 5.3.4.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/v5.3.4/packages/react-router-dom)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 10:45:09 +00:00