yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,502 Commits 138 Branches 514 Tags
Commit Graph

26502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Irvin
33429cef5b clean up 2023-01-25 10:21:24 +01:00
Ben Irvin
8bcafb42ed add some simple tests 2023-01-25 09:35:32 +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
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
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
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
Bassel
d11bd7af0a apply fixes: 
- fix callback return type
- fix callback params
 2023-01-24 14:39:24 +02:00
Josh
e8bc90744d chore: update DS to 1.6.0 2023-01-24 11:34:12 +00:00
Jamie Howard
2153d4d90d
Merge pull request #15424 from strapi/feature/min-max-description 2023-01-24 10:16:55 +00: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
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
Ben Irvin
ec750ca7de
Merge branch 'main' into security/updateKnex 2023-01-23 18:17:06 +01:00
DMehaffy
2695cefe66
Update packages/core/strapi/lib/core/loaders/plugins/index.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-01-23 10:02:19 -07:00
Bassel
c8d2f6cd16 refactor transactions: 
- fix the typings
- add rollback and commit to the callback params
 2023-01-23 18:45:00 +02:00
Jamie Howard
62e3f93251
Merge pull request #15509 from Cpaczek/add-dialect-to-start-up-log 2023-01-23 15:47:21 +00:00
Jamie Howard
ea95c70ae3 refactor(helper-plugin): simplify useFieldHint 2023-01-23 14:38:18 +00:00
derrickmehaffy
3814f95afc Fix: handle missing plugin with proper error message 2023-01-23 07:30:15 -07:00
Gustav Hansen
a8c0798bd7
Merge pull request #15512 from strapi/chore/cleanup-input-error-translations 
Chore: Make field constraint error messages more consistent
 2023-01-23 13:50:48 +01:00
Gustav Hansen
986bf26eed
Merge pull request #15443 from strapi/chore/edit-view-information 
CM: Refactor edit-view information box to be visually grouped
 2023-01-23 12:26:51 +01:00
Jamie Howard
a5bf7c1de9 chore(core) 2023-01-23 10:15:01 +00:00
Jamie Howard
057d325f5c Merge remote-tracking branch 'origin/main' into feature/min-max-description 2023-01-23 10:05:25 +00:00
Jamie Howard
2acdc52f30 fix(helper-plugin): simplify translation string 2023-01-23 09:59:26 +00:00
Gustav Hansen
e176245be1
Merge pull request #15523 from strapi/fix/styling-with-dl-dt-dd 
[Information]: styling with semantics
 2023-01-23 10:35:13 +01:00
Jamie Howard
a7df0940c0
Merge pull request #15501 from strapi/fix/cm-collection-type-sorting 2023-01-23 09:32:52 +00:00
Josh
9fa7f8c5bb
Update packages/core/admin/admin/src/content-manager/pages/EditView/Information/index.js 
Co-authored-by: Gustav Hansen <gustav.hansen@strapi.io>
 2023-01-23 09:32:36 +00:00
Gustav Hansen
51f16d50c9 Chore: Remove unused test utility 2023-01-23 10:30:07 +01:00
Gustav Hansen
304901ed7e Chore: Unify field constraint error messages 2023-01-23 10:12:36 +01:00
Marc
07f5c0aa66
Merge pull request #15217 from strapi/fix/duplicate-join-tables 2023-01-23 09:48:37 +01:00
Josh
c1ddc00564 fix: flex styling according to spec 
https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dl#wrapping_name-value_groups_in_div_elements
 2023-01-23 08:15:44 +00:00
Gustav Hansen
7ab3dc34d8
Merge pull request #15488 from strapi/chore/add-cloud-link-readme 
Add: Cloud link in README file
 2023-01-20 18:19:07 +01:00
Jamie Howard
b4b600808d chore(content-manager) 2023-01-20 16:22:56 +00:00
Jamie Howard
2ae9cd3a45 test(content-manager): leftMenu title sorting 
chore(content-manager)
 2023-01-20 15:28:50 +00:00
Julie Plantey
7d482c8256
Merge pull request #15513 from strapi/fix/MainNav-snapshots 
[Fix] AddLogoDialog snapshots
 2023-01-20 15:27:19 +01:00
Jamie Howard
6150b67915 Merge remote-tracking branch 'origin/main' into feature/min-max-description 2023-01-20 13:59:48 +00:00
Julie Plantey
922e76924e fix main nav snapshots failing 2023-01-20 14:00:09 +01:00
Jamie Howard
c3fd52c24a fix(helper-plugin): make units translatable 
refactor(helper-plugin)

fix(helper-plugin):combine translation strings
 2023-01-20 12:41:59 +00:00
Julie Plantey
e66609ec27
Merge pull request #15096 from strapi/features/authLogo 
[features][Auth logo customization]
 2023-01-20 13:03:24 +01:00
Gustav Hansen
b42f01f94e
Merge pull request #15499 from strapi/chore/cleanup-settings-sso 
Settings: Move SSO page into pages directory
 2023-01-20 12:33:57 +01:00
Gustav Hansen
8d175b1e69 CM: Refactor information sidebar tests 2023-01-20 12:13:47 +01:00
Bassel Kanso
70b11bb1e7
Merge branch 'main' into chore/transactions 2023-01-20 10:45:03 +02:00
Jamie Howard
688baffb9c fix(helper-plugin): BigInt mistake 2023-01-20 08:44:18 +00:00
Cameron Paczek
2b8776745d add db dialect to startup info log 2023-01-19 20:31:07 -08:00
Cameron
f9a367fae7
Merge branch 'main' into remove-pg-magic-numbers 2023-01-19 14:49:49 -08:00
Cameron Paczek
dc784812ac Remove PG Magic Numbers 2023-01-19 14:41:32 -08:00