yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 23:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,528 Commits 111 Branches 487 Tags
Commit Graph

2237 Commits

Author SHA1 Message Date
soupette
426d4340e5 Fix didChangeDisplayedFields 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-10 14:04:57 +01:00
Alexandre Bodin
0a1027f980 Use error object info to expose it or not 2021-11-10 13:24:07 +01:00
Alexandre Bodin
4d537814c8 Merge branch 'releases/v4' of github.com:strapi/strapi into releases/v4 2021-11-10 13:19:32 +01:00
ronronscelestes
bd21c1602f fix tests 2021-11-10 12:33:01 +01:00
HichamELBSI
d9ac85a991 Fix filters for upload 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-11-10 12:19:45 +01:00
HichamELBSI
f597afd59b Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-11-10 12:10:20 +01:00
ronronscelestes
1fd5e2fa37 fixed headings in users and application page 2021-11-10 11:57:08 +01:00
ronronscelestes
b825b40709 removed unnecessary comment 2021-11-10 11:51:54 +01:00
ronronscelestes
2ae5c1331e Merge branch 'releases/v4' of https://github.com/strapi/strapi into marketplace-coming-soon 2021-11-10 11:46:04 +01:00
ronronscelestes
936f539a66 feedback fixes 2021-11-10 11:45:55 +01:00
ronronscelestes
a6316d2fb1 merge conflicts and tests fix 2021-11-10 11:27:41 +01:00
ronronscelestes
b41e83e705 feedback fix 2021-11-10 11:17:56 +01:00
ronronscelestes
fbf816821d removed unnecessary comment + fixed chevron stuck with active style because of focus-within 2021-11-10 11:13:21 +01:00
Marvin Frachet
6af55fa6f5
Fix ML QA (#11534) 2021-11-10 10:52:10 +01:00
cyril lopez
55c6d635c2
Merge pull request #11535 from strapi/fix-allowed-types-files 
[v4] Fix allowedTypes when it is undefined
 2021-11-10 10:45:54 +01:00
soupette
fc9de3f160 Fix spacing for multiple relations 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-10 10:06:48 +01:00
soupette
25b62547a1 Fix allowedTypes when it is undefined 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-10 09:54:05 +01:00
Dieter Stinglhamber
efbd9fcf42 update route generation 2021-11-10 09:29:15 +01:00
soupette
d5f575cb0d Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-10 08:44:18 +01:00
HichamELBSI
c484119c3e Fix filters (datetimepicker in CM + ML) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-11-10 00:17:59 +01:00
ELABBASSI Hicham
7acad193f4
Merge pull request #11527 from strapi/typography-users 
[DS] Typography Settings-Users
 2021-11-09 21:08:25 +01:00
Alexandre Bodin
a1c31c7e43 Fix csp policy for the ML 2021-11-09 20:49:21 +01:00
ronronscelestes
c45ed576a1 reintegrated main row label style active 2021-11-09 19:47:13 +01:00
ronronscelestes
5b1b553e05 updated snapshots + removed unecessary styling 2021-11-09 19:25:03 +01:00
ronronscelestes
edd3ce4c3c fixed label and Chevron font-weight and color when hover or isActive 2021-11-09 19:12:43 +01:00
ronronscelestes
937da81b69 replaced Text by Typography + fixed carret Icon color in edit page 2021-11-09 19:03:32 +01:00
Convly
07fef39592 Merge branch 'releases/v4' of github.com:strapi/strapi into v4/up-resolvers-picker-fix 2021-11-09 18:38:20 +01:00
ELABBASSI Hicham
a321b9562f
Merge pull request #11524 from strapi/typography-application-page 
[DS] Typography Application page
 2021-11-09 18:05:56 +01:00
cyril lopez
db75d30a23
Merge pull request #11526 from strapi/fix/cm-clone 
Fix CM list view clone url
 2021-11-09 18:01:28 +01:00
ronronscelestes
fb9fac6f48 replaced Text components with Typography 2021-11-09 17:41:21 +01:00
HichamELBSI
9374a0525d Fix CM list view clone url 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-11-09 17:32:45 +01:00
soupette
62409adcc8 Fix menu react-selct 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-09 17:25:42 +01:00
HichamELBSI
4cb3662232 Fix datetime in filters 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-11-09 17:23:09 +01:00
ronronscelestes
10714f3d8c Merge branch 'releases/v4' of https://github.com/strapi/strapi into marketplace-coming-soon 2021-11-09 17:21:50 +01:00
ronronscelestes
b506666d44 feedback fix 2021-11-09 17:21:43 +01:00
soupette
f0aab2b8f5 Fix some ui issues in the relations component 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-09 17:12:28 +01:00
ronronscelestes
e0af233631 updated snapshots 2021-11-09 16:51:22 +01:00
ronronscelestes
b7cf120334 typography added to application page 2021-11-09 16:41:32 +01:00
soupette
dea9028921 Fix collection type wording 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-09 16:38:11 +01:00
cyril lopez
cf6fca0e45
Merge pull request #11520 from strapi/core/webpack-dev-server 
[v4] Bump webpack dev server
 2021-11-09 16:28:58 +01:00
ronronscelestes
faa1c452da Merge branch 'releases/v4' of https://github.com/strapi/strapi into marketplace-coming-soon 2021-11-09 16:28:37 +01:00
ronronscelestes
d77c838fdd submit plugin link hidden - blog post link updated with the right link 2021-11-09 16:28:27 +01:00
ronronscelestes
ac110ecf6f fixed content box title font weight + snapshots 2021-11-09 16:24:17 +01:00
ronronscelestes
56feffb15b updated snapshots 2021-11-09 16:19:41 +01:00
cyril lopez
06b541552e
Merge pull request #11517 from strapi/fix-wysiwyg 
[v4] Fix some  wysiwyg issues
 2021-11-09 16:18:12 +01:00
soupette
8a3920b321 Remove draft-js dependency 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-09 16:18:01 +01:00
ronronscelestes
15d8341233 removed Text from stories 2021-11-09 16:15:12 +01:00
soupette
be7dcc527a Bump mini-css-extract-plugin 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-09 16:11:46 +01:00
ronronscelestes
95e41b21b7 page size URL query 2021-11-09 16:10:14 +01:00
ronronscelestes
325a7d1e14 dynamic table 2021-11-09 16:06:55 +01:00