yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-25 22:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,305 Commits 138 Branches 514 Tags
Commit Graph

27305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Convly
eb6e6db843 Fix duplicate errors being logged 2023-01-25 10:31:01 +01:00
Christian
1a4b57b366
Merge pull request #15446 from strapi/deits/diagnostics 
[DEITS] Engine Diagnostics
 2023-01-25 10:10:51 +01:00
Convly
62725c8410 Merge branch 'features/deits' into deits/diagnostics 2023-01-25 10:02:43 +01:00
Convly
31a4925824 Merge branch 'main' into features/deits 2023-01-25 09:57:35 +01:00
Bassel Kanso
87bec86243
Merge pull request #15485 from strapi/deits/rollbacks 
[DEITS] Rollback import after failure
 2023-01-25 10:48:04 +02:00
Bassel Kanso
8810b049f5
Merge pull request #14389 from strapi/chore/transactions 
Use transactions and expose a transactional API
 2023-01-25 10:45:32 +02:00
Gustav Hansen
d3d0265927
Merge pull request #15551 from strapi/dependabot/npm_and_yarn/docs/ua-parser-js-0.7.33 
chore(deps): bump ua-parser-js from 0.7.31 to 0.7.33 in /docs
 2023-01-25 08:52:42 +01:00
Gustav Hansen
ccab323cf2
Merge pull request #15430 from strapi/enhancement/ctb-edit-ct-draft-publish 
CTB: Replace ToggleInput with Checkbox for the d&p switch
 2023-01-25 08:49:11 +01:00
DMehaffy
98e05eeb49
Merge pull request #15553 from strapi/chore/contrib-roadmap-link 
Docs: Update productboard link in contributing guide
 2023-01-24 16:40:35 -07:00
Julie Plantey
80d58f63c7
Merge pull request #15552 from strapi/fix/VideoPreview-size 
[fix] ML Video preview size
 2023-01-24 20:31:08 +01:00
Bassel Kanso
1e867f152d
Merge branch 'main' into chore/transactions 2023-01-24 19:08:13 +02:00
Bassel
65660d18e1 add some adittional tests 2023-01-24 19:07:43 +02:00
Bassel
ec9150b1d8 add some unit tests 2023-01-24 18:56:41 +02:00
Gustav Hansen
708acdcd71 Docs: Update productboard link in contributing guide 2023-01-24 17:02:00 +01:00
Julie Plantey
8b135b0725 update video preview size to be the same size as Avatar 2023-01-24 16:55:21 +01:00
dependabot[bot]
5c96d7bfa8
chore(deps): bump ua-parser-js from 0.7.31 to 0.7.33 in /docs 
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.31 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.33)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-24 15:48:35 +00:00
Gustav Hansen
e1559cea33
Merge pull request #15544 from strapi/dependabot/npm_and_yarn/cookiejar-2.1.4 
chore(deps): bump cookiejar from 2.1.3 to 2.1.4
 2023-01-24 16:47:51 +01:00
Josh
70f188c78f
Merge pull request #15547 from strapi/chore/ds-160 2023-01-24 15:28:57 +00:00
Convly
80c0153907 Fix diff formatting for schemas matching 2023-01-24 16:15:55 +01:00
Bassel
cc3c50c24c remove chalk coloring from error 2023-01-24 16:59:57 +02:00
Bassel
18bcfd95d3 refactoring createLinkQuery transaction 2023-01-24 16:57:12 +02:00
Christian Capeans
5f8422140e Add operation to the format diagnostic functino 2023-01-24 15:54:16 +01:00
Gustav Hansen
d61d4ece5e
Merge pull request #15549 from strapi/fix/wysiwyg-preview 
WYSIWYG: Fix preview pane styles
 2023-01-24 15:35:57 +01:00
Bassel
936d8abae2 add types for transaction 2023-01-24 16:35:06 +02:00
Josh
6b43c01732 fix: update to 1.6.1 to fix styling issue with buttons 2023-01-24 14:12:56 +00:00
Gustav Hansen
e7915a01f2 WYSIWYG: Fix preview styles 2023-01-24 15:08:06 +01:00
Convly
516963a080 Merge branch 'main' of github.com:strapi/strapi into features/deits 2023-01-24 15:07:37 +01:00
Bassel
f0dbb4be31 apply fixes: 
- fix callback return type
- fix callback params
 2023-01-24 15:55:43 +02:00
Christian Capeans
fb850a43dc Remove unnecessary part of import 2023-01-24 14:52:03 +01:00
Christian Capeans
9e19aed7fc Remove unnecessary typing 2023-01-24 13:47:41 +01:00
Christian Capeans
5c9831d547 Merge branch 'features/deits' into deits/diagnostics 2023-01-24 13:43:39 +01:00
Bassel
d11bd7af0a apply fixes: 
- fix callback return type
- fix callback params
 2023-01-24 14:39:24 +02:00
Christian Capeans
56528817e2 Fix tests 2023-01-24 13:34:42 +01:00
Josh
e8bc90744d chore: update DS to 1.6.0 2023-01-24 11:34:12 +00:00
Ben Irvin
5f73198bd3
Merge pull request #15542 from strapi/deits/misc-tests 2023-01-24 11:29:18 +01:00
Ben Irvin
9e66140d67 add todo 2023-01-24 11:25:20 +01:00
Jamie Howard
2153d4d90d
Merge pull request #15424 from strapi/feature/min-max-description 2023-01-24 10:16:55 +00:00
Christian Capeans
a68350ace0 Abstract format to index 2023-01-24 11:11:26 +01:00
Christian Capeans
39c8a80339 Fix file structure 2023-01-24 10:59:45 +01:00
Bassel
81f4a931a9 fix unit tests 2023-01-24 11:24:28 +02:00
dependabot[bot]
d86e12afe5
chore(deps): bump cookiejar from 2.1.3 to 2.1.4 
Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/bmeck/node-cookiejar/releases)
- [Commits](https://github.com/bmeck/node-cookiejar/commits)

---
updated-dependencies:
- dependency-name: cookiejar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-24 09:04:16 +00:00
Pierre Noël
32d057b535
Merge pull request #15412 from strapi/security/updateKnex 
Update Knex to 2.4.0 to fix CVE-2016-20018
 2023-01-24 10:02:27 +01:00
Ben Irvin
2fc0b75ac3 fix logic for extensions 2023-01-24 09:38:57 +01:00
Ben Irvin
2697a6c682 fix comment 2023-01-24 09:38:00 +01:00
Ben Irvin
d98d297b25 rename utils 2023-01-24 09:35:09 +01:00
Ben Irvin
4eaf02c430 fix import 2023-01-24 09:28:05 +01:00
Ben Irvin
527de8fcd3 spy on console.info 2023-01-24 09:11:40 +01:00
Ben Irvin
0aee06379a add import tests and fixes 2023-01-24 09:09:52 +01:00
DMehaffy
127c047057
Merge pull request #15532 from strapi/fix/throwSaneErrorForPlugins 
Fix: handle missing plugin with proper error message
 2023-01-23 14:14:08 -07:00
Pierre Noël
811e7313f2
Merge pull request #15507 from Cpaczek/remove-pg-magic-numbers 
Remove PG Magic Numbers
 2023-01-23 19:03:59 +01:00