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

24152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Kaylor
df97f6ebda Add react-clipboard dependency back and update translation 2022-10-05 16:23:54 +02:00
Mark Kaylor
f2450b9298 Add compatibility tooltip 2022-10-04 18:05:26 +02:00
Josh
709dfb6a18
Merge pull request #14502 from strapi/feature/field-descriptions 2022-10-03 11:38:59 +01:00
Pierre Noël
cbef873047
Merge pull request #14485 from strapi/dependabot/npm_and_yarn/vm2-3.9.11 
Bump vm2 from 3.9.10 to 3.9.11
 2022-10-03 11:58:52 +02:00
Josh
17e9908bdf fix: use Stack instead of styled Flex 2022-10-03 10:10:55 +01:00
Josh
0233fff9e8 fix: use theme tokens 2022-10-03 08:36:17 +01:00
Josh
4b293e7a41 Merge branch 'main' into feature/field-descriptions 2022-10-03 08:17:50 +01:00
Jean-Sébastien Herbaux
02af04644a
Merge pull request #14498 from strapi/enhancement/cloud-hosting-tracking 
Add cloud hosting telemetry property
 2022-10-01 01:39:33 +02:00
Convly
ac232dee3e Merge branches 'enhancement/cloud-hosting-tracking' and 'main' of github.com:strapi/strapi into enhancement/cloud-hosting-tracking 2022-09-30 17:55:32 +02:00
Jean-Sébastien Herbaux
1ff8c46512
Merge pull request #14507 from strapi/fix/up-e2e-auth-tests 
Update UP e2e test following API token V2 release
 2022-09-30 17:54:53 +02:00
Convly
47a5516a60 Update UP e2e test following API token V2 release 2022-09-30 14:17:52 +02:00
Convly
569f9a4012 Merge branch 'main' of github.com:strapi/strapi into enhancement/cloud-hosting-tracking 2022-09-30 12:01:00 +02:00
Convly
706b8a5d56 Revert to STRAPI_HOSTING 2022-09-30 11:40:05 +02:00
Josh
5a961534ed feat: add attribute description to field modal in content builder 2022-09-30 09:55:56 +01:00
Convly
fa503ef438 v4.4.1 v4.4.1 2022-09-29 23:50:44 +02:00
Jean-Sébastien Herbaux
58f1fd6f3a
Merge pull request #14500 from strapi/fix/users-perms-vuln 
Fix wrong filter param used with the entityService in UP
 2022-09-29 23:43:19 +02:00
derrickmehaffy
a230f29587 Fix wrong filter param used with the entityService 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-09-29 14:02:26 -07:00
Convly
340b17d6da Update wording 2022-09-29 18:12:05 +02:00
Convly
55fbe1ad10 Remove console.log 2022-09-29 17:41:54 +02:00
Convly
a1c7185252 Add hostedOnStrapiCloud property to the telemetry events 2022-09-29 17:35:18 +02:00
Jamie Howard
a742a5d6bc
Merge pull request #14458 from strapi/fix/13360/camel-case-email 
Treat email as lowercase when creating a user
 2022-09-29 13:48:55 +01:00
Josh
02f287b4ee
Merge pull request #14475 from strapi/feature/media-library-cards 2022-09-29 08:54:18 +01:00
dependabot[bot]
0e7fe4c744
Bump vm2 from 3.9.10 to 3.9.11 
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.10 to 3.9.11.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.10...3.9.11)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-28 14:36:50 +00:00
Jean-Sébastien Herbaux
d0bb8b3dc4
Merge pull request #14459 from CleberRossi/bugfix/admin-panel-src-admin-folder-13975 
Fixing error when building without src/admin #13975
 2022-09-28 16:24:03 +02:00
Cleber Rossi
f02b959f42
Merge branch 'strapi:main' into bugfix/admin-panel-src-admin-folder-13975 2022-09-28 10:33:23 -03:00
Convly
d9febfb963 v4.4.0 v4.4.0 2022-09-28 14:25:44 +02:00
Jean-Sébastien Herbaux
e70919bed7
Merge pull request #14163 from strapi/features/custom-fields 
[CustomField] Add custom fields
 2022-09-28 13:35:43 +02:00
Rémi de Juvigny
6e659b4554
Merge branch 'main' into features/custom-fields 2022-09-28 11:00:59 +02:00
Jean-Sébastien Herbaux
b0ab17f634
Merge pull request #14117 from strapi/features/api-token-v2 
Api token v2
 2022-09-28 10:50:34 +02:00
markkaylor
78934cacc8
Merge pull request #14474 from strapi/custom-fields/suspense-dz 
Add suspense boundary in dynamic zones
 2022-09-27 19:02:16 +02:00
Rémi de Juvigny
86b5757d4a Move focus trap inside suspense 2022-09-27 18:17:49 +02:00
Rémi de Juvigny
60e13be6c3 Add text inside loader 2022-09-27 17:51:23 +02:00
Josh
c6a0b55a6d chore: updata snapshots 2022-09-27 16:44:38 +01:00
Josh
f36c4d07f8 Revert "chore: update snapshots" 
This reverts commit d3304b8a5c419bf3a29037847e2f4f2f45c4ced4.
 2022-09-27 16:37:05 +01:00
Josh
b6a9095ff1 feat(test): add tests for interactions 2022-09-27 16:36:20 +01:00
Josh
d3304b8a5c chore: update snapshots 2022-09-27 16:09:56 +01:00
Rémi de Juvigny
ea72a6e893 Add Suspense boundary in dynamic zones 2022-09-27 17:02:40 +02:00
Josh
cd6f4408d9 feat: handle desired actions 2022-09-27 15:58:03 +01:00
Josh
102e4d1c84 refactor: use one AssetCardBase 2022-09-27 13:57:30 +01:00
Jamie Howard
bfbab082cf fix(admin): lowercase email when creating user 2022-09-26 15:52:08 +01:00
markkaylor
71ba262ce2
Merge pull request #14465 from strapi/custom-fields/small-fixes-and-tests 
[Custom fields] small fixes and tests
 2022-09-26 15:28:17 +02:00
Mark Kaylor
b695a42a2f add test case back and fix check for property on object 2022-09-26 14:48:06 +02:00
Mark Kaylor
6321a4d970 Move mock 2022-09-26 13:25:52 +02:00
Mark Kaylor
023596ffbd Remove unneccesary mock data 2022-09-26 13:23:24 +02:00
Mark Kaylor
df5c80cf76 Add tests for FormModal forms 2022-09-26 13:16:27 +02:00
Mark Kaylor
a21e4a683a Update mock data to test custom fields 2022-09-23 16:56:19 +02:00
Mark Kaylor
323cf3bf24 Avoid single line return 2022-09-23 15:49:59 +02:00
Mark Kaylor
5e8cb0f63b Respect alphabetical order 2022-09-23 15:36:44 +02:00
Mark Kaylor
b6bbd3e534 Remove use of lodash 2022-09-23 15:33:18 +02:00
Alexandre Bodin
d1c529b584 Merge branch 'main' into features/custom-fields 2022-09-22 10:37:11 +02:00