yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-16 12:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 117 Branches 489 Tags
Commit Graph

2920 Commits

Author SHA1 Message Date
Julie Plantey
6389876df3
Merge pull request #13833 from smoothdvd/translations-zh-Hans 
update: improve chinese syntax
 2022-07-25 17:53:44 +02:00
Gustav Hansen
8d5ec5dfdc
Merge pull request #13822 from strapi/fix/cm-dynamiczone-label-description 
CM: Fix edit form for dynamiczones (allow label + description)
 2022-07-25 16:07:14 +02:00
Julie Plantey
ab4ae47d30
Merge pull request #13810 from strapi/fix/password-autocomplete 
[Fix] Passwords autocomplete
 2022-07-25 14:23:35 +02:00
dependabot[bot]
0500fc4a25
Bump immer from 9.0.6 to 9.0.15 
Bumps [immer](https://github.com/immerjs/immer) from 9.0.6 to 9.0.15.
- [Release notes](https://github.com/immerjs/immer/releases)
- [Commits](https://github.com/immerjs/immer/compare/v9.0.6...v9.0.15)

---
updated-dependencies:
- dependency-name: immer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-25 09:46:09 +00:00
Convly
0b8c7b59c6 Merge branch 'master' into features/typescript 2022-07-25 09:30:18 +02:00
杨飞
72cb1eb4ee Fixed the translation problem of zh-Hans on the user list page. 2022-07-24 11:40:35 +08:00
smoothdvd
25bddac016
update: improve chinese syntax 2022-07-23 08:05:18 +08:00
Gustav Hansen
01784575bf Merge branch 'master' into features/ML-folder 2022-07-22 12:48:41 +02:00
Gustav Hansen
ed90965cc1 chore: Update react-intl to 6.x 2022-07-22 12:45:36 +02:00
dependabot[bot]
e11f7b53f4
Bump react-intl from 5.20.2 to 5.25.1 
Bumps [react-intl](https://github.com/formatjs/formatjs) from 5.20.2 to 5.25.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@5.20.2...react-intl@5.25.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-22 09:05:23 +00:00
Convly
456f945d1e Fix condition checks 2022-07-22 10:43:06 +02:00
Jean-Sébastien Herbaux
2d11fe54b8
Merge pull request #13724 from strapi/dependabot/npm_and_yarn/sift-13.5.4 
Bump sift from 13.5.0 to 13.5.4
 2022-07-22 10:11:56 +02:00
Gustav Hansen
73a4172907
Merge pull request #13800 from strapi/chore/chunk-names 
Admin: add missing webpack chunk-names
 2022-07-21 15:47:01 +02:00
Gustav Hansen
cca59b4b49 CM: Fix edit form for dynamiczones (allow label + description) 2022-07-21 15:16:43 +02:00
Convly
ddb6a91503 Make RBAC an implementation of the @strapi/permissions engine 2022-07-21 10:41:40 +02:00
Convly
f7dd7f7017 Add dependency to @strapi/permissions from @strapi/admin 2022-07-21 10:40:30 +02:00
DMehaffy
8b9d2d663e
Merge pull request #13807 from strapi/fix/updatePassport 
update koa-passport to fix CVE-2022-25896
 2022-07-20 08:23:28 -07:00
ivanThePleasant
b0d73be3e7
Merge pull request #13813 from strapi/fix/admin-env-telemetry 
Add environment to the admin analytics calls the correct way
 2022-07-20 12:03:15 +03:00
ivanThePleasant
cc4a3ba507 Add environment to the admin analytics calls the correct way 2022-07-20 11:05:26 +03:00
Julie Plantey
e7cd4a9443
Merge pull request #13776 from yangfei4913438/translate 
add several items in zh-Hans and fixed some other minor bugs.
 2022-07-20 08:45:23 +02:00
Derrick Mehaffy
1fa180085f update koa-passport to fix CVE-2022-25896 2022-07-19 13:54:54 -07:00
Julie Plantey
1efd3651d7 autocomplete fix on edit user and profile page 2022-07-19 14:59:00 +02:00
Gustav Hansen
8717d18ac2 Admin: Enable sourcemaps in development mode 2022-07-19 14:26:57 +02:00
Gustav Hansen
23c36b8cd2 Admin: add missing webpack chunk-names 2022-07-19 11:55:04 +02:00
杨飞
627f426d8e optimization 2022-07-19 17:16:57 +08:00
Bassel Kanso
b08b0aae0a update tests 2022-07-19 11:08:01 +03:00
杨飞
9a59921d3e add several items in zh-Hans and fixed some other minor bugs. 2022-07-19 00:36:36 +08:00
Bassel Kanso
366e9c9abf add tests to reducer 2022-07-18 14:21:08 +03:00
Bassel Kanso
953c4dda65 update snapshot tests 2022-07-18 14:00:26 +03:00
Bassel Kanso
545ec388ae create data transformation function 2022-07-18 13:52:07 +03:00
Mark Kaylor
4949da189e Merge branch 'master' of github.com:strapi/strapi into features/custom-fields 2022-07-18 11:13:23 +02:00
Bassel Kanso
e1012e5b51 create getActionState 2022-07-15 18:21:27 +03:00
dependabot[bot]
d216be14d5
Bump html-loader from 3.0.1 to 3.1.2 
Bumps [html-loader](https://github.com/webpack-contrib/html-loader) from 3.0.1 to 3.1.2.
- [Release notes](https://github.com/webpack-contrib/html-loader/releases)
- [Changelog](https://github.com/webpack-contrib/html-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/html-loader/compare/v3.0.1...v3.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-15 09:03:32 +00:00
Bassel Kanso
1b184551f8 refactor token type state 2022-07-14 15:42:28 +03:00
Bassel Kanso
93ba7a72f6 Merge branch 'features/api-token-v2' into api-token-v2/granular-access-selection 2022-07-14 11:05:36 +03:00
Gustav Hansen
b3d6e8ab87
Merge pull request #13728 from strapi/chore/replace-moment-js 
Replace remaining moment-js calls with date-fns
 2022-07-14 09:54:12 +02:00
ivanThePleasant
ae35914dba Add environment property to admin telemetry calls 2022-07-13 16:55:33 +03:00
Rémi de Juvigny
c6a2184e76 Make CustomFields a singleton class 2022-07-13 15:46:46 +02:00
Rémi de Juvigny
48d12fb920 Apply Alex feedback 2022-07-13 14:44:22 +02:00
Alexandre Bodin
fe296baf71 v4.2.3 2022-07-13 14:20:58 +02:00
Pierre Noël
c7e522ef1f Merge branch 'master' into features/ML-folder 2022-07-13 13:28:28 +02:00
Bassel Kanso
7571562e0b add placeholder Select to token duration 2022-07-13 13:48:14 +03:00
Bassel Kanso
225b45a2c2 change to findOne and add some fixes 2022-07-13 12:15:32 +03:00
Pierre Noël
6d265c2917 fix permission-domain.test.js 2022-07-12 17:56:58 +02:00
Alexandre BODIN
0b1faa81bb
Merge pull request #13748 from strapi/fix/jest-config-github 
Fix jest running tests twice because of .github and jest behavior
 2022-07-12 17:10:46 +02:00
Rémi de Juvigny
b303a1a305 Register several custom fields at once 2022-07-12 14:24:57 +02:00
Alexandre Bodin
91c200490b Fix jest running because of .github and jest weird behavior 2022-07-12 13:54:06 +02:00
Gustav Hansen
141ef84114
Merge pull request #13746 from strapi/fix/richtext-table 
PreviewWysiwyg: Fix and improve styles for tables
 2022-07-12 11:33:50 +02:00
Rémi de Juvigny
fb1d5256b8 Add custom field name regex validation 2022-07-12 11:20:07 +02:00
Bassel Kanso
8f716278d1
Merge pull request #13658 from strapi/api-token-v2/time-selector 
Api token v2/time selector
 2022-07-12 11:41:22 +03:00