yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,178 Commits 129 Branches 498 Tags
Commit Graph

19178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
d3aedca699
Merge pull request #11579 from strapi/v4/allow-access-token-param 
Allow access_token query param for auth
 2021-11-16 09:34:36 +01:00
Alexandre Bodin
113bea8e7f Support query access_token 2021-11-16 09:25:55 +01:00
cyril lopez
7c2b17bc00
Merge pull request #11574 from strapi/fix-tracking-cropping 
Fix Tracking cropping
 2021-11-16 08:30:50 +01:00
Alexandre BODIN
4622e4be82
Merge pull request #11552 from strapi/v4/graphql-add-id-filter-ct 
[V4] Add an ID key to the collection type's filters in GraphQL
 2021-11-15 19:27:24 +01:00
ronronscelestes
daf2e5010d
[DS] Typography Users&Permissions/Roles (#11569) 
* create a role done

* edit a role done

* list page done

* updated tests

* feedback fix

* updated tests
 2021-11-15 18:27:32 +01:00
ELABBASSI Hicham
8367872c74
Merge pull request #11575 from strapi/typography-up-email-templates 
[DS] Typography in Users&Permissions/Email templates
 2021-11-15 18:24:32 +01:00
cyril lopez
baae2f0252
Merge pull request #11545 from strapi/accordion-error-state 
CM/ Accordion Error state
 2021-11-15 17:46:30 +01:00
ronronscelestes
8450dd87b3 typography integrated 2021-11-15 16:39:36 +01:00
mfrachet
b6a8d2de2d Fix Tracking cropping 2021-11-15 16:38:00 +01:00
Marvin Frachet
a041026d90
Allow to edit local file before uploading (#11571) 2021-11-15 16:17:06 +01:00
ronronscelestes
df7ed74804
typography component integrated, fixed envelop icon, fixed wrong default message for configuration subtitle (#11567) 2021-11-15 15:56:32 +01:00
Convly
09aaa1202e Merge branch 'releases/v4' of github.com:strapi/strapi into v4/graphql-add-id-filter-ct 2021-11-15 15:53:38 +01:00
ronronscelestes
8b30d4c87d feedback fix 2021-11-15 15:29:18 +01:00
ronronscelestes
ff12371f9c cleaned ctb data models 2021-11-15 14:29:03 +01:00
Marvin Frachet
70da516801
Add tile empty state in ML (#11564) 2021-11-15 14:15:59 +01:00
cyril lopez
b356766f1c
Merge pull request #11543 from strapi/v4/tracking 
[V4] Tracking
 2021-11-15 14:06:38 +01:00
soupette
672f5276b0 Fix typo 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-15 14:05:39 +01:00
ronronscelestes
dc6713be69 remove log 2021-11-15 12:17:03 +01:00
ronronscelestes
d991d51333 fixed rep component child has error trad 2021-11-15 12:10:22 +01:00
ronronscelestes
d6322b5ca0 removed unnecessary comment 2021-11-15 12:01:15 +01:00
soupette
c262c84f83 Add missing events to CM 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-15 11:57:29 +01:00
ronronscelestes
b2bfab277e removed unnecessary overflow visible on dragged item 2021-11-15 11:56:22 +01:00
ronronscelestes
405fb6897a feedback fix 2021-11-15 11:49:14 +01:00
soupette
610d5976bc Add tracked event to upload plugin 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-15 11:47:23 +01:00
ronronscelestes
e09a287f30 added error message trad for DZ component contains error(s) 2021-11-15 11:36:37 +01:00
ronronscelestes
9a1c15267f fixed dz shadow and dz accordion content background color 2021-11-15 11:26:53 +01:00
ELABBASSI Hicham
27b2f2de7a
Merge pull request #11529 from strapi/typography-admin-roles 
[DS] Typography Admin Roles
 2021-11-15 10:21:27 +01:00
soupette
f2259ee269 Add event to marketplace page 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-15 10:12:29 +01:00
soupette
91c33b9c8e Add missing events in CM listview 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-15 10:05:43 +01:00
soupette
374f6be2af Merge branch 'releases/v4' of github.com:strapi/strapi into v4/tracking 2021-11-15 09:24:45 +01:00
cyril lopez
68496b96a4
Merge pull request #11538 from strapi/fix-heading-typography 
Fix headings / Users + Application page
 2021-11-15 09:24:15 +01:00
cyril lopez
f0346c29c2
Merge pull request #11504 from strapi/marketplace-coming-soon 
v4/ Marketplace coming soon
 2021-11-15 09:23:32 +01:00
cyril lopez
7d43499e03
Merge pull request #11551 from strapi/fix-number-input-falsy 
Fix falsy check in generic input
 2021-11-15 09:21:27 +01:00
soupette
4a4c5eca49 Merge branch 'releases/v4' of github.com:strapi/strapi into v4/tracking 2021-11-15 09:20:51 +01:00
Marvin Frachet
7759e66315
Wysiwyg media library (#11539) 2021-11-15 09:11:08 +01:00
Alexandre BODIN
2ce6ef7d5b
Merge pull request #11554 from strapi/v4/graphql-fix-date-filtering 
[V4] Fix datetime filtering on GraphQL
 2021-11-12 17:53:23 +01:00
Convly
7769bf3def Merge branch 'releases/v4' of github.com:strapi/strapi into v4/graphql-fix-date-filtering 2021-11-12 16:49:22 +01:00
Alexandre BODIN
1a2c4b2d86
Merge pull request #11553 from strapi/v4/graphql-fix-dz-querying 
[V4] Fix DynamicZone queries for GraphQL
 2021-11-12 16:33:58 +01:00
Convly
e9e16b1fc9 Fix date filtering by not treating date objects as operators groups 2021-11-12 16:30:48 +01:00
Convly
b21a3c3288 Fix missing default value for params in entity-service.load 2021-11-12 15:51:43 +01:00
Convly
ad8a5e7634 Handle case where the filter is manually disabled 2021-11-12 15:15:41 +01:00
Convly
bac9e8145e Add an ID filter to the collection type's args 2021-11-12 15:07:32 +01:00
Alexandre BODIN
f4facb654b
Merge pull request #11475 from strapi/v4/new-sanitize-fixes 
[V4] Enhancements for the new sanitize processes
 2021-11-12 14:52:47 +01:00
Alexandre BODIN
022f57fa79
Merge pull request #11129 from strapi/v4/graphql-subscriptions 
[V4] Handle graphql subscriptions
 2021-11-12 10:47:56 +01:00
mfrachet
a9955fbb3b Fix falsy check in generic input 2021-11-12 10:09:28 +01:00
Convly
da41a49612 Use config module instead 2021-11-12 10:07:08 +01:00
Convly
cf96129d7c Don't remove Subscription type if subscriptions are disabled 2021-11-12 10:05:11 +01:00
ELABBASSI Hicham
64d286f20f
Merge pull request #11532 from strapi/filter/datetime 
Fix filters (CM + Media Library)
 2021-11-10 19:16:00 +01:00
Convly
25e62db93a use 'sanitizers' instead of 'utils' 2021-11-10 17:08:54 +01:00
ronronscelestes
414d028a13 dz error state 2021-11-10 17:04:57 +01:00