yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-04 03:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,211 Commits 123 Branches 507 Tags
Commit Graph

24211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
de2ed2bfa4 Wip 2022-09-16 09:57:12 +02:00
Gustav Hansen
410c0cef76
Merge pull request #14298 from WalkingPizza/fix/13058 
Do not allow reserved names for singular/plural API names
 2022-09-15 20:38:48 +02:00
Gustav Hansen
e142ac65b6 CTB: Improve test names for singular/ plural fields 2022-09-15 16:50:13 +02:00
Gustav Hansen
d8abbe35aa
Merge pull request #14299 from WalkingPizza/fix/13038 
Update `lang` attribute on locale change
 2022-09-15 16:39:51 +02:00
Gustav Hansen
2d8272ad5b
Merge pull request #14430 from strapi/chore/jest-29-0-3 
Chore: Upgrade jest to 29.0.3 and jest-watch-typeahead to 2.x
 2022-09-15 15:20:41 +02:00
markkaylor
baad89e678
Merge pull request #14368 from strapi/custom-fields/types 
[Custom fields] Add customFields typescript interface
 2022-09-15 08:47:13 -04:00
Gustav Hansen
af85262931 Chore: Upgrade jest to 29.0.3 and jest-watch-typeahead to 2.x 2022-09-15 14:21:41 +02:00
markkaylor
1d7caa398c
Merge branch 'features/custom-fields' into custom-fields/types 2022-09-15 07:42:02 -04:00
markkaylor
76311ef276
Merge pull request #14393 from strapi/custom-fields/rm-plugin 
[Custom fields] Rename color-picker custom field plugin
 2022-09-15 07:41:12 -04:00
markkaylor
9a85276edb
Merge branch 'features/custom-fields' into custom-fields/rm-plugin 2022-09-15 07:16:00 -04:00
Pierre Noël
f0d4a95bb9
Merge pull request #14418 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1215.0 
Bump aws-sdk from 2.1208.0 to 2.1215.0
 2022-09-15 11:36:43 +02:00
GitStart
1642c18734
Merge branch 'main' into STRAP-54 2022-09-15 07:31:52 +01:00
Simone
6a56072e1e
Merge pull request #14394 from strapi/api-token-v2/select-all-bug 
Select permissions with the "Select all" command
 2022-09-14 15:50:50 +02:00
markkaylor
16cab06908
Merge pull request #14232 from strapi/chore/custom-fields-docs-link 
Update documentation link for custom fields
 2022-09-14 09:33:13 -04:00
Simone Taeggi
a1ce4d8fa6 Merge branch 'features/api-token-v2' into api-token-v2/select-all-bug 2022-09-14 14:48:04 +02:00
Simone Taeggi
8753fae8ff Merge branch 'main' into features/api-token-v2 2022-09-14 14:47:38 +02:00
dependabot[bot]
950d460ce7
Bump aws-sdk from 2.1208.0 to 2.1215.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1208.0 to 2.1215.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1208.0...v2.1215.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-14 09:25:11 +00:00
Alexandre BODIN
28788e25f3
Merge pull request #14372 from geetsww/main 
Remove outdated Strapi-Docker link from README
 2022-09-14 10:54:59 +02:00
Mark Kaylor
c84e975a94 Add missing dependency causing test to fail 2022-09-13 15:57:56 -04:00
Mark Kaylor
c2062e4096 Update node version 2022-09-13 14:08:59 -04:00
Benjamin Geets
175009554b
Merge branch 'main' into main 2022-09-13 18:14:11 +02:00
Pierre Noël
5b56324ac8
Merge pull request #14170 from strapi/fix/upload-new-file-to-entity 
Fix relations not correctly set when uploading a new file to an entity
 2022-09-13 17:55:06 +02:00
Julie Plantey
0ebf0e5f88
Merge pull request #14397 from strapi/fix/14395 
[Fix] CM LV custom labels
 2022-09-13 17:36:59 +02:00
markkaylor
4a3ee5ec5b
Update comment 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2022-09-13 10:57:25 -04:00
Mark Kaylor
062f92cc99 Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/rm-plugin 2022-09-13 10:56:43 -04:00
markkaylor
95d7fe5a97
Merge branch 'features/custom-fields' into custom-fields/types 2022-09-13 10:46:53 -04:00
Mark Kaylor
21fd40e243 Merge branch 'main' of github.com:strapi/strapi into features/custom-fields 2022-09-13 10:30:19 -04:00
Mark Kaylor
23d9adbfef Convert type in register function 2022-09-13 10:04:39 -04:00
Pierre Noël
72eec1fb7c Merge branch 'main' into fix/upload-new-file-to-entity 2022-09-13 16:00:05 +02:00
Mark Kaylor
ed2b0588c6 Fix name and version 2022-09-13 08:47:00 -04:00
Mark Kaylor
a67ff09585 Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/rm-plugin 2022-09-13 08:20:49 -04:00
markkaylor
1ebd4afdff
Merge pull request #14391 from strapi/custom-fields/fix-type-conversion 
[Custom fields] Fix type conversion
 2022-09-13 08:17:04 -04:00
Mark Kaylor
22727a5779 Add custom fields description 2022-09-13 07:56:51 -04:00
Julie Plantey
150f697bc8 use custom label for CM LV headers 2022-09-13 10:53:33 +02:00
Marc
e961086382
Merge pull request #14373 from konstantinmuenster/patch-2 2022-09-13 04:34:40 +02:00
David Lüder
4ea9d481a9
Merge branch 'main' into filter-translation-neq-removal 2022-09-13 02:29:59 +02:00
Simone Taeggi
4907cbb36b update test 2022-09-12 23:32:27 +02:00
Simone Taeggi
f3ef246013 fix select all bug 2022-09-12 22:57:04 +02:00
Simone Taeggi
961a3cb202 merge main branch 2022-09-12 22:56:52 +02:00
Mark Kaylor
dadd495077 Update snapshot 2022-09-12 14:53:37 -04:00
Mark Kaylor
c4197573cd Lint fix 2022-09-12 14:53:13 -04:00
Mark Kaylor
d686d4975b Use standard CSS comments to avoid lint error 2022-09-12 14:43:39 -04:00
Mark Kaylor
8f0e20d226 Rename plugin custom-fields => color-picker 2022-09-12 14:16:35 -04:00
Mark Kaylor
923d87fdbf Move customField to content-type and component valid types 2022-09-12 11:22:10 -04:00
Mark Kaylor
08e40eecf9 Remove type conversion util 2022-09-12 10:44:15 -04:00
Mark Kaylor
1f8b261bc7 Update snapshots 2022-09-12 10:36:42 -04:00
Mark Kaylor
39c04410c1 Convert customField type before sending to server 2022-09-12 10:36:13 -04:00
Marc
9dc51aa95a
Merge branch 'main' into patch-2 2022-09-12 14:59:47 +02:00
Adedoyin Akande
277d42c010
Merge branch 'main' into add-locales 2022-09-12 12:28:09 +01:00
Julie Plantey
3b53153723
Merge pull request #14290 from WalkingPizza/fix/13648 
Trim admin's first name when validating
 2022-09-12 10:31:32 +02:00