yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-21 23:28:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,539 Commits 120 Branches 490 Tags
Commit Graph

30539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Convly
4c4fd652b9 Merge branch 'features/deits' of github.com:strapi/strapi into deits/diagnostics 2023-01-13 16:45:51 +01:00
Convly
ec41c1ce38 Init diagnostics 2023-01-13 16:43:20 +01:00
Julie Plantey
cffb932413 chore: update snapshots 2023-01-13 16:24:06 +01:00
Julie Plantey
e1c3fedfa8 Merge branch 'main' of https://github.com/strapi/strapi into features/authLogo 2023-01-13 16:20:19 +01:00
Julie Plantey
67c35bcb7d disabled fetching when cannot read + change Form component name to CustomizationInfos 2023-01-13 16:20:13 +01:00
markkaylor
a0f0b2d2be
Merge pull request #15411 from strapi/audit-logs/modal-json-compo 
[audit logs] Add JSON component to modal
 2023-01-13 15:37:21 +01:00
Marc-Roig
25e1435173 Revert "remove relations populate configuration" 
This reverts commit cea950fd9657df6434d22ecd29c1bbfd8d9a0912.
 2023-01-13 15:35:21 +01:00
Josh
91f39fe978
Merge branch 'main' into chore/add-browserlist 2023-01-13 14:22:00 +00:00
Marc-Roig
319c7473f3 test components order is preserved 2023-01-13 15:20:46 +01:00
Simone Taeggi
5bc130df4d fix node 18.13 problem with unicode space 2023-01-13 15:11:12 +01:00
Rémi de Juvigny
a56b2812a0
Merge pull request #15429 from strapi/audit-logs/log-details 
[Audit logs] Enhance audit log details
 2023-01-13 14:52:12 +01:00
Jamie Howard
1eec59973a feat(content-manager): cover all field types 
feat(content-manager): construct min/max description separately from main description
 2023-01-13 13:36:56 +00:00
markkaylor
5e1fda7e13
Merge pull request #15442 from strapi/fix/ds-link-doc 
Fix incorrect location for command
 2023-01-13 14:25:16 +01:00
Josh
07c9b3b54f fix: add browserslist-to-esbuild to devDeps for helper-plugin 2023-01-13 11:19:12 +00:00
markkaylor
89f7fe4999
Fix incorrect location for command 2023-01-13 11:33:51 +01:00
Bassel
faf4d728cd Merge branch 'main' into chore/transactions 2023-01-13 12:26:20 +02:00
Mark Kaylor
7e30022dc0 Use experimental json input release 2023-01-13 11:24:18 +01:00
Bassel
12dd68f4a7 Improve transaction API: 
- make it possible to have nested transactions
- wrap the knex transaction api and apply changes everywhere it was used
 2023-01-13 12:23:30 +02:00
Marc-Roig
dd98293a55 better filtering in inverse order column 2023-01-13 10:53:30 +01:00
Josh
3ca0a71ae8 chore: make sure we still export the UMD version to avoid breaking changes 2023-01-13 09:39:49 +00:00
Josh
80c0ec95d5 chore: tidy up deps and export cjs & esm modules 2023-01-13 09:31:56 +00:00
Ben Irvin
a4d0b0d6a3
Merge pull request #15423 from strapi/deits/cli-force-yes 2023-01-13 10:25:56 +01:00
Ben Irvin
ecec7a3481
Merge pull request #15406 from strapi/deits/transfer-protocols 2023-01-13 10:25:36 +01:00
Rémi de Juvigny
3a227b6f1e Add model name to entry events 2023-01-13 10:24:08 +01:00
Ben Irvin
154e7be7cc
Merge branch 'features/deits' into deits/transfer-protocols 2023-01-13 10:19:49 +01:00
Simone Taeggi
5ae7cf19e9 revert jest-styled-components-version 2023-01-13 10:18:29 +01:00
markkaylor
bec0be562b
Merge pull request #15439 from strapi/chore/ds-docs 
[docs] Add linking the design system docs
 2023-01-13 10:15:38 +01:00
Ben Irvin
0c7d4057c4
Merge pull request #15437 from strapi/deits/env-disable-transfer 2023-01-13 10:15:17 +01:00
Ben Irvin
738ab7e4e3
Update packages/core/admin/server/register.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-01-13 10:06:35 +01:00
dependabot[bot]
6c9af765ec
chore(deps-dev): bump core-js from 3.26.1 to 3.27.1 
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.26.1 to 3.27.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.27.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-13 09:03:04 +00:00
Mark Kaylor
220c3c1aba Add linking the design system docs 2023-01-13 09:56:57 +01:00
Ben Irvin
c2bd576407 configure env variables to disable/enable remote transfer route 2023-01-13 09:41:05 +01:00
Simone Taeggi
8c8e0391b2 update snapshots 2023-01-13 09:40:28 +01:00
Simone Taeggi
8fe799beb8 revert jest-styled-components dependency 2023-01-13 09:33:18 +01:00
Ben Irvin
08a73ddb21 Merge branch 'features/deits' into deits/transfer-protocols 2023-01-13 09:13:17 +01:00
Ben Irvin
a79f92e068 merge branch "main" 2023-01-13 09:13:00 +01:00
Josh
9ec14bc8c8 chore: revert strict additon 
it doesn't work as anticipated at the moment
 2023-01-12 17:30:47 +00:00
Rémi de Juvigny
a91a9016ad Add user ID to audit log modal 2023-01-12 18:21:53 +01:00
dogusdeniz
d92d63e3d0
Merge branch 'main' into v4/generator-migration 2023-01-12 19:53:03 +03:00
Julie Plantey
8f542f4be5 bump DS to 1.4.2 2023-01-12 17:17:57 +01:00
Ben Irvin
995ec014fa
Update packages/core/strapi/lib/commands/utils/helpers.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-01-12 17:12:48 +01:00
Ben Irvin
46a45a157a use 'strict' for transfer 2023-01-12 17:11:53 +01:00
Ben Irvin
6e4acfbe4e cleanup text 2023-01-12 17:08:28 +01:00
Ben Irvin
ad20696ac2 simplify logic 2023-01-12 17:06:13 +01:00
Simone Taeggi
169e427d77 revert snapshot 2023-01-12 16:59:00 +01:00
Ben Irvin
e752777541 fix table order 2023-01-12 16:49:23 +01:00
Julie Plantey
4e52ca13a3 feedback fixes: conditional logo, refactor Stack, canSubmit, test naming 2023-01-12 16:37:18 +01:00
Ben Irvin
429b8f0604 fix typo 2023-01-12 16:35:26 +01:00
Simone Taeggi
96ca883835 test update snapshot 2023-01-12 16:31:31 +01:00
Jamie Howard
11ab76cc7a feat(content-manager): display min/max limits with field description 2023-01-12 15:13:35 +00:00