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
29,164 Commits 138 Branches 514 Tags
Commit Graph

4830 Commits

Author SHA1 Message Date
Christian Capeans
c44df82be3 Fix small issues 2023-03-14 09:11:44 +01:00
Gustav Hansen
df3ee9117f
Merge pull request #16036 from smoothdvd/patch-2 
Update zh-Hans.json to catch up latest en.json
 2023-03-14 08:57:46 +01:00
Alexandre BODIN
2eb85b17c7
Merge branch 'main' into chore/rbac-ce 2023-03-13 18:13:11 +01:00
markkaylor
f78ba41c59
Merge pull request #15778 from strapi/fix/non-required-json-input 2023-03-13 14:23:08 +01:00
Alexandre Bodin
4f462fb536 Remove unused assets 2023-03-13 14:17:34 +01:00
markkaylor
7533a8dcc7
Merge branch 'main' into fix/non-required-json-input 2023-03-13 08:56:46 +01:00
Simone Taeggi
c05e1fae0f add notification error when the token salt is missing 2023-03-10 12:11:48 +01:00
Rémi de Juvigny
7c197ba0d1 Merge remote-tracking branch 'origin/main' into feature/audit-logs-config 2023-03-09 18:44:30 +01:00
Simone Taeggi
8008bb6dd5 show error when there is no salt token 2023-03-09 17:55:30 +01:00
Jamie Howard
32d019ecbe feature(ee): add db entries to persist ee feature tables 2023-03-09 16:50:51 +00:00
Simone Taeggi
faa5820548 change ctx.badRequest to ctx.notImplemented 2023-03-09 17:36:19 +01:00
Simone Taeggi
26d9f6c8e0 add a specific error on the BE when the Token Salt token is missing 
Co-authored-by: Christian <christiancp100@gmail.com>
 2023-03-09 14:44:20 +01:00
Rémi de Juvigny
a53767f9b3 Add license updates tests 2023-03-09 14:39:43 +01:00
Christian Capeans
c4cd8b1e15 Add token type select to frontend 2023-03-09 11:18:57 +01:00
smoothdvd
e9e369f8db
Update zh-Hans.json to catch up latest en.json 2023-03-09 16:47:51 +08:00
Alexandre Bodin
6f225b6979 Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce 2023-03-09 02:45:03 +01:00
Alexandre Bodin
29dadec292 Feedbacks 2023-03-09 02:43:16 +01:00
Christian Capeans
de6aa0baed Add authorization 2023-03-08 14:15:53 +01:00
Simone Taeggi
3a149fe26e Merge branch 'main' into data-transfer/limit-token-name-length 2023-03-08 12:22:46 +01:00
Christian Capeans
674b13eb23 Merge branch 'features/data-transfer' of https://github.com/strapi/strapi into data-transfer/pull 2023-03-08 11:31:15 +01:00
Simone Taeggi
eae7fc9b1d chore: update DS to 1.6.5 and fix a unit test 2023-03-08 10:36:08 +01:00
markkaylor
39e41973a8
Merge branch 'main' into fix/audit-logs-test-error 2023-03-08 13:22:22 +05:30
Simone Taeggi
6bdbe17068 upgrade the design-system and icons dependencies, the snapshots and a failing unit test 2023-03-07 18:13:28 +01:00
Alexandre Bodin
b1d1a6a272 Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce 2023-03-07 16:19:54 +01:00
Simone Taeggi
b6ea2a544e Merge branch 'main' into data-transfer/limit-token-name-length 2023-03-07 16:08:35 +01:00
Josh
edc8c32056 chore: replace spacing with gap 
chore: update snapshots

fix: css on roles settings
 2023-03-07 14:27:20 +00:00
Alexandre Bodin
3d554829db Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce 2023-03-07 14:46:37 +01:00
Alexandre Bodin
11821500d2 Update FE snapshot 2023-03-07 14:17:01 +01:00
Josh
6b07ba03c0
Merge pull request #15969 from strapi/dependabot/npm_and_yarn/react-select-5.7.0 2023-03-07 09:18:56 +00:00
Josh
024758e731 chore: update snapshots for react-select classNames 2023-03-07 08:35:27 +00:00
Marc
c90c7ee82a
Merge pull request #15978 from strapi/dependabot/npm_and_yarn/chalk-4.1.2 2023-03-07 09:18:45 +01:00
Alexandre Bodin
e3a4b431ba clean comment 2023-03-07 08:41:07 +01:00
Alexandre Bodin
8278afe3f3 Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce 2023-03-07 08:27:15 +01:00
markkaylor
a3ad977212
Merge branch 'main' into fix/audit-logs-test-error 2023-03-07 08:46:39 +05:30
Mark Kaylor
6e96e68a87 Fix tbody cannot appear as child of div error 2023-03-07 08:42:24 +05:30
Alexandre Bodin
6c36872dd2 Fix test 2023-03-06 22:17:56 +01:00
Alexandre Bodin
6a003d738c Move frontend 2023-03-06 22:15:57 +01:00
Alexandre Bodin
e0e2084422 Move RBAC into CE 2023-03-06 21:46:45 +01:00
Sergio Peña
50235362be Fix some traslations removing dots 2023-03-06 17:59:13 +00:00
Fernando Chavez
0578e6e19b reduce scope of audit logs test to only test audit logs feature 2023-03-06 17:47:33 +01:00
Rémi de Juvigny
08e1d1a54a Use internal service state 2023-03-06 12:24:30 +01:00
Alexandre BODIN
b9e92de1af
Merge pull request #15976 from strapi/chore/fix-invalid-path 
Fix invalid require using internal paths
 2023-03-03 18:41:11 +01:00
Alexandre Bodin
e789cd81f3 Avoid local strapi conflicting with global 2023-03-03 17:17:02 +01:00
Christian Capeans
3093fa32f1 Refactor the push handler for the data transfer 
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
 2023-03-03 17:16:24 +01:00
Josh
3234fcc61d
Merge pull request #15900 from strapi/fix/relations-caching-between-locales 2023-03-03 15:42:28 +00:00
Josh
0c2aa6d5bc fix: add default params to cache key to avoid flickering of unlocalised relations 2023-03-03 15:02:55 +00:00
Josh
08160f1943 fix: alignment should be center not flex-start 2023-03-03 14:26:54 +00:00
Josh
cad6fb7429 chore: remove unnecessary test 2023-03-03 14:17:23 +00:00
Josh
f4f2b5ab2e fix: dont merge the state if the ID changes 
fix: dont merge the state if the ID changes

fix: pass id to querykey & add cleanup method to useRelation hook

fix: pass defaultParams as part of the cache key

Revert "fix: reset cache for `relation` keys in i18n plugin"

This reverts commit 34b2fd9fabfcb93fb9f416616802e10b79133112.

fix: pass defaultParams as part of the cache key

chore: spread cachekey in search query

fix: move logic to useRelations hook that handles removing from the store.

fix: broken test

refactor: rename method to onUnmount
 2023-03-03 14:17:23 +00:00
dependabot[bot]
6b19d1bf42
Bump react-select from 5.6.0 to 5.7.0 
Bumps [react-select](https://github.com/JedWatson/react-select) from 5.6.0 to 5.7.0.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.6.0...react-select@5.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-03 14:13:10 +00:00