yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-16 20:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 117 Branches 489 Tags
Commit Graph

9899 Commits

Author SHA1 Message Date
Pierre Noël
dd36d43b52 change wording didnt to doesnt 2022-03-31 11:01:40 +02:00
Pierre Noël
7ef77c8481 refactor upload bootstrap 2022-03-31 11:01:39 +02:00
Pierre Noël
8e9c7285dd implement uploadStream wrapping for actionOptions 2022-03-31 11:01:39 +02:00
ivanThePleasant
03a135678e Initial commit for opt-in-telemetry, added the command to the strapi.js 2022-03-31 11:35:33 +03:00
ronronscelestes
6c516f194f translation added 2022-03-31 10:28:58 +02:00
ronronscelestes
e3fd6ec601 Merge branch 'features/menu-logo' of https://github.com/strapi/strapi into menu-logo/form-init 2022-03-31 10:09:48 +02:00
Vincent
223d7c4580
Merge pull request #12971 from strapi/menu-logo/project-settings-permission 
feat(menu-logo): added a permission for project level settings
 2022-03-31 10:07:53 +02:00
Mark Kaylor
9dba223ec6 add custom styles 2022-03-30 18:22:11 +02:00
Rémi de Juvigny
2e90570a4f Remove duplicate banner 2022-03-30 16:52:47 +02:00
Rémi de Juvigny
96c3b2e61f Update tests 2022-03-30 16:49:00 +02:00
Rémi de Juvigny
98a303f1e0 Add missing a plugin banner 2022-03-30 16:48:34 +02:00
Gustav Hansen
c83babe779
Merge pull request #13006 from strapi/fix/components-date-main-field 
Allow date fields to be selected as component main fields
 2022-03-30 16:41:38 +02:00
Alexandre Bodin
f25774168c v4.1.6 2022-03-30 15:34:12 +02:00
Gustav Hansen
7b4c17dc14 CellContent: improve truthy check and do not rely on isNumber 2022-03-30 12:03:46 +02:00
Gustav Hansen
5202fb10d1 FieldComponent: Stop forwarding isNested to RepeatableComponents 2022-03-30 11:36:44 +02:00
ronronscelestes
60b6a1c743 updated branch + updated ApplicationInfosPage tests 2022-03-30 11:27:32 +02:00
ronronscelestes
fc0b6fdebb Merge branch 'menu-logo/configurations-provider' of https://github.com/strapi/strapi into menu-logo/form-init 2022-03-30 11:04:46 +02:00
ronronscelestes
6f591874dd feedback refacto v2 2022-03-30 10:58:02 +02:00
ivanThePleasant
15e2b96fc6 Improved logic for tests to pass 2022-03-30 11:54:06 +03:00
Mark Kaylor
b5ff583430 move useNavigatorOnLine hook 2022-03-30 10:45:10 +02:00
soupette
8c9be85ffe Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-30 09:33:45 +02:00
ivanThePleasant
675c19219b Reverted admin telemetry changes and rewrote it for an easier approach 2022-03-30 10:25:18 +03:00
ivanThePleasant
6e08bc2045 Revert "Added telemetry disable logic to the admin panel events" 
This reverts commit c6307ece6357737a5c7afdc60169672b6122c617.
 2022-03-30 10:19:28 +03:00
Gustav Hansen
c3383c63b1 RepeatableComponent: Simplify error handling and fix all nesting levels 2022-03-30 08:34:41 +02:00
Gustav Hansen
1f811ed9a7 RepeatableComponent: Fix error messages when component is nested 2022-03-30 08:34:41 +02:00
Gustav Hansen
25db315e28 DynamicTable: Show id for media and relations in components 2022-03-30 08:32:44 +02:00
Gustav Hansen
6d04c64efb Allow date fields to be selected as component main fields 2022-03-29 19:39:29 +02:00
Alexandre BODIN
b2fa446947
Merge pull request #12918 from strapi/chore/knex-v1 
Make strapi compatible with knex v1
 2022-03-29 19:34:45 +02:00
ivanThePleasant
ab69f2bde1 Adjusted admin tests to reflect changes with telemetry 2022-03-29 20:18:13 +03:00
Mark Kaylor
ef8091821f replace function with variable 2022-03-29 17:21:06 +02:00
Mark Kaylor
fc59c6e2ea rename component 2022-03-29 17:06:54 +02:00
vincentbpro
146d9e4e9c test: update e2e permission snapshots 2022-03-29 16:55:04 +02:00
Gustav Hansen
f05ce9b317
Merge pull request #12972 from strapi/fix/cm-list-number 
CM: Fix displaying number fields in the DynamicTable
 2022-03-29 16:31:20 +02:00
Mark Kaylor
4d90bd850a use dumb header component 2022-03-29 16:25:46 +02:00
Gustav Hansen
97f51652bb
Merge pull request #12632 from strapi/CONTENT-47/uid-error-message 
EditViewDataManagerProvider: Handle API errors independently from yup
 2022-03-29 16:24:50 +02:00
vincentbpro
47dc3ce9e3 test: update e2e permission snapshots 2022-03-29 15:56:23 +02:00
ivanThePleasant
c6307ece63 Added telemetry disable logic to the admin panel events 2022-03-29 16:49:29 +03:00
Alexandre Bodin
2791a2a5ae Merge branch 'master' into chore/knex-v1 2022-03-29 15:49:00 +02:00
Gustav Hansen
28bb1da2a6
Merge pull request #13002 from strapi/fix/prettier-all 
Chore: Prettify all files
 2022-03-29 15:15:14 +02:00
cyril lopez
7524309d9f
Merge pull request #12846 from strapi/feat/folder-card-component 
ML: Add FolderCard component
 2022-03-29 15:13:10 +02:00
Gustav Hansen
8aaaff77d4 Chore: Prettify all files 2022-03-29 14:20:41 +02:00
Gustav Hansen
e776192eed
Revert "Fix actionOptions not taking into account by the upload provider" 2022-03-29 11:29:45 +02:00
Gustav Hansen
bac28de5e8
Merge pull request #12838 from strapi/fix/upload-actionOptions 
Fix actionOptions not taking into account by the upload provider
 2022-03-29 11:10:04 +02:00
Gustav Hansen
8dc44ccdff CM: Fix displaying number fields in the DynamicTable 2022-03-29 10:33:14 +02:00
soupette
c683b735eb Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-29 10:10:27 +02:00
Kevin Antonio Rateni Iatauro
117dbcf4f3
Merge branch 'strapi:master' into feature/plugin-name-kebab 2022-03-29 10:04:57 +02:00
soupette
6e87aa0667 Make sure to send the events only once 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-29 09:39:45 +02:00
ivanThePleasant
47dd5cd178 Corrected if clause mistake 2022-03-28 20:58:08 +03:00
Gustav Hansen
103854a3ba FolderCard: remove legacy useId prefix param 2022-03-28 19:45:38 +02:00
Alexandre Bodin
3e3a7755eb Merge branch 'master' into chore/knex-v1 2022-03-28 19:44:13 +02:00