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
29,765 Commits 120 Branches 490 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Noël
3741876099 change cron logic for metrics 2022-07-25 11:08:39 +02:00
dependabot[bot]
3b3e419f2f
Bump nodemailer from 6.7.3 to 6.7.7 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.7.3 to 6.7.7.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.7.3...v6.7.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-25 09:04:26 +00:00
Gustav Hansen
7431d8cde7
Merge pull request #13827 from strapi/dependabot/npm_and_yarn/react-intl-5.25.1 
Bump react-intl from 5.20.2 to 6.0.5
 2022-07-25 10:30:09 +02:00
Bassel Kanso
0ae051241a Merge branch 'master' into fix/graphql-playground 2022-07-25 11:27:24 +03:00
Bassel Kanso
6013ef5360 make api token strategy allow /graphql route with no token 2022-07-25 11:26:27 +03:00
Convly
0b8c7b59c6 Merge branch 'master' into features/typescript 2022-07-25 09:30:18 +02:00
Jean-Sébastien Herbaux
0c9eabe227
Merge pull request #13460 from strapi/typescript/schema-types-generation 
[TS] Schema Types Generation
 2022-07-25 08:56:22 +02:00
Mark Kaylor
09f7ad3916 Move conversion between register and bootstrap 2022-07-25 08:34:54 +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
Pierre Noël
bac1080f13 refactor strapi.cron 2022-07-22 17:28:51 +02:00
Mark Kaylor
41bf774c86 Refactor tests 2022-07-22 15:51:59 +02:00
Mark Kaylor
528dd2edaa Merge branch 'custom-fields/list-custom-fields' of github.com:strapi/strapi into custom-fields/list-custom-fields 2022-07-22 15:43:53 +02:00
markkaylor
12948e11ca
Merge pull request #13823 from strapi/list-custom-fields/add-howto-btn 
List custom fields/add howto btn
 2022-07-22 15:43:30 +02:00
Ben Irvin
d5712d7693 check call parameters 2022-07-22 15:40:12 +02:00
Ben Irvin
af4349a1a8 return after each relation type is handled 2022-07-22 15:32:25 +02:00
Mark Kaylor
cdab1407ea Add test customField 2022-07-22 13:59:05 +02:00
Mark Kaylor
5a52110ffa Convert custom field type on start after load 2022-07-22 13:38:39 +02: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
Simone Taeggi
26f15edf22 Merge branch 'master' into fix/ui-bug-datetimepicker-from-another-locale-13674 2022-07-22 09:02:48 +02:00
Simone Taeggi
82e8036d0e force the node LANG to us to run the unit tests 2022-07-21 18:54:07 +02:00
Simone Taeggi
cf3cbb34fe add args control to the datetimepicker storybook file 2022-07-21 17:04:10 +02:00
Convly
04ac3fb41a Update readme 2022-07-21 16:27:31 +02:00
Fernando Chavez
08ae9f65f0 Merge branch 'custom-fields/list-custom-fields' of https://github.com/strapi/strapi into list-custom-fields/add-howto-btn 2022-07-21 10:12:28 -04:00
Fernando Chavez
d2d879e385 Add how-to link on the custom fields tab 2022-07-21 10:12:22 -04:00
Alexandre BODIN
bc60b90b9e
Merge pull request #13578 from meherchandan/fix/case-insensitive-equal-filter 
fix: added new eqi operator for case insensitive equal search
 2022-07-21 15:53:25 +02:00
Convly
704cdd8ae7 Use ISOString instead of Date for Default date values 2022-07-21 15:48:47 +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
Alexandre BODIN
df4758fdc1
Merge pull request #13665 from j0nezz/fix/documentation-plugin-readme 
Documentation Plugin: update file paths in Readme to v4 structure
 2022-07-21 15:06:07 +02:00
Alexandre BODIN
46c826781e
Merge pull request #13787 from strapi/dependabot/npm_and_yarn/jest-circus-28.1.3 
Bump jest-circus from 28.1.2 to 28.1.3
 2022-07-21 14:56:50 +02:00
Mark Kaylor
85c1eb1e8e Rename prop uid => customFieldUid 2022-07-21 14:14:14 +02:00
Gustav Hansen
a60c5b9381 chore: Update snapshot tests 2022-07-21 14:10:57 +02:00
Gustav Hansen
1d4d2094e3 CM: Remove relational fields from sidebar in "configure the view" 2022-07-21 14:10:57 +02:00
Mark Kaylor
a29ebb847b Fix tests 2022-07-21 14:10:20 +02:00
Mark Kaylor
e59d8d047e Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/list-custom-fields 2022-07-21 11:34:05 +02:00
Simone Taeggi
d535d3bb72 update tests with correct locale date format 2022-07-21 11:06:06 +02:00
Convly
f158fa5534 Update yarn.lock 2022-07-21 10:47:09 +02:00
Convly
1406479866 Add content api layer & permission engine impl 2022-07-21 10:45:33 +02:00
Convly
b776f0d194 Update provider factory typings 2022-07-21 10:43:19 +02:00
Convly
f247f51c36 Update i18n hook name for the permission engine 2022-07-21 10:42:58 +02:00
Convly
70e69c1aa0 Update hooks definitions 2022-07-21 10:42:30 +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
Convly
ad154e74e3 Add the permission package 2022-07-21 10:39:53 +02:00
Rémi de Juvigny
0ebee64dd3
Merge pull request #13814 from strapi/custom-fields/attributes-list 
[Custom fields] Show custom field in CTB attributes list view
 2022-07-21 10:04:48 +02:00