yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 00:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,682 Commits 113 Branches 488 Tags
Commit Graph

3647 Commits

Author SHA1 Message Date
p_0g_8mm3_
930c07375c
Fix wording on upload more button 
Co-authored-by: Gustav Hansen <gu@stav.dev>
 2022-04-03 23:07:03 +02:00
p_0g_8mm3_
04b6bbfc08
Fix date time example 
Co-authored-by: Gustav Hansen <gu@stav.dev>
 2022-04-03 23:06:44 +02:00
p_0g_8mm3_
f70732b040
Fix date example 
Co-authored-by: Gustav Hansen <gu@stav.dev>
 2022-04-03 23:06:23 +02:00
pr0gr8mm3r
ee0595d605 incorperate review suggestions 2022-04-03 23:05:21 +02:00
Mark Kaylor
bf2851fe9f hide submit button when offline 2022-04-01 16:10:31 +02:00
Alexandre Bodin
b1df5a6067 Merge branch 'releases/4.1.7' 2022-04-01 09:55:43 +02:00
Mark Kaylor
5838c0619e Merge branch 'master' of github.com:strapi/strapi into features/marketplace-offline-layout 2022-04-01 09:45:35 +02:00
Gustav Hansen
260a68d8e6
Merge pull request #13018 from strapi/fix/upload-action-options 
Fix actionOptions not taking into account by the upload provider
 2022-03-31 18:02:22 +02:00
ronronscelestes
1ae79aba0f stepper and from computer init 2022-03-31 17:54:44 +02:00
Alexandre Bodin
1699aac151 v4.1.7 2022-03-31 17:53:39 +02:00
Rémi de Juvigny
d8676887bf
Merge pull request #13012 from strapi/missing-plugin 
Add missing a plugin banner to the marketplace
 2022-03-31 16:31:29 +02:00
Mark Kaylor
18ee563584 add Main component and remove as 2022-03-31 16:12:02 +02:00
Pierre Noël
f245e9dbe2 fix upload bootstrap unit test 2022-03-31 16:00:05 +02:00
Alexandre Bodin
c21b662f44 Merge branch 'releases/4.1.6' 2022-03-31 15:52:49 +02:00
Mark Kaylor
119ebb46b8 fix path to hook 2022-03-31 15:01:31 +02:00
Mark Kaylor
4362e3ba18 replace box with img 2022-03-31 15:01:13 +02:00
Mark Kaylor
a30e8052e7 add tests 2022-03-31 14:54:46 +02:00
vincentbpro
a298c243db feat(logo-customization): added validation for update project-settings 2022-03-31 13:11:19 +02:00
ivanThePleasant
937fc9874a Finished implementing opt-in-telemetry function 2022-03-31 12:56:47 +03:00
ronronscelestes
7168f929b3 feedback review: spacing and translation 2022-03-31 11:40:53 +02:00
vincentbpro
fe984cddfe feat(logo-customization): created update project-settings route 2022-03-31 11:33:54 +02:00
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
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