yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 23:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 125 Branches 496 Tags
Commit Graph

6461 Commits

Author SHA1 Message Date
cyril lopez
96f9156ef5
Merge pull request #11620 from strapi/v4/fix-wysiwyg-hint 
[V4] fix wysiwyg hint
 2021-11-18 14:44:28 +01:00
soupette
b310e5ccd1 Fix snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 14:08:02 +01:00
soupette
2b9980038c Fix Dz label padding 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 14:06:18 +01:00
soupette
5f85849435 Fix build release script 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 13:03:02 +01:00
vincentbpro
fa482eec41 Merge branch 'releases/v4' of github.com:strapi/strapi into v4/fix-wysiwyg-hint 2021-11-18 10:19:57 +01:00
soupette
b4173b9281 Remove plugins.js file 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 08:51:38 +01:00
Alexandre BODIN
84301a358d
Merge pull request #11612 from strapi/v4/fix-empty-component-permissions 
[V4] Fix empty component permissions
 2021-11-17 18:11:54 +01:00
vincentbpro
539e849643 tests: added tests for getLastName util 2021-11-17 17:01:53 +01:00
vincentbpro
6ca4087c0f fix: removed unnecessary empty string test 2021-11-17 17:01:11 +01:00
Convly
091d360f7b Fix missing permission for empty components in CTs 2021-11-17 16:57:22 +01:00
soupette
e9c370ae75 Fix DZ thread background-color 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-17 16:18:29 +01:00
cyril lopez
bbe27d84ee
Merge pull request #11609 from strapi/v4/plugins-page 
[V4] Plugins page
 2021-11-17 16:15:54 +01:00
cyril lopez
cb293d9d7b
Merge pull request #11590 from strapi/typography-homepage 
[DS] Typography in Homepage
 2021-11-17 15:33:52 +01:00
soupette
ed20b01206 Add plugins page 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-17 15:10:25 +01:00
soupette
5767590ac4 Merge branch 'releases/v4' of github.com:strapi/strapi into v4/plugins-page 2021-11-17 14:43:46 +01:00
vincentbpro
b437b26d29 fix: reusing inputJSON hint component for WYSIWYG 2021-11-17 14:40:55 +01:00
cyril lopez
4b2127797f
Merge pull request #11588 from strapi/typography-sso 
[DS] Typography in SSO
 2021-11-17 14:26:49 +01:00
soupette
e7c1eb4ed3 Fix some ui bugs 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-17 14:07:56 +01:00
cyril lopez
3969927c2e
Merge pull request #11602 from strapi/fix-password-icon 
[v4] Fix password icon color
 2021-11-17 11:47:34 +01:00
soupette
db24f10dd3 Fix footer padding 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-17 11:45:14 +01:00
soupette
8ddebe5cc0 Fix password icon color 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-17 11:36:40 +01:00
ronronscelestes
097e56672b removed unnecessary log in webhooks 2021-11-16 17:28:19 +01:00
cyril lopez
3a31a96067
Merge pull request #11594 from strapi/typography-webhooks 
[DS] Typography in webhooks
 2021-11-16 16:49:03 +01:00
ronronscelestes
a7ee05d49c feedback fix 2021-11-16 16:14:08 +01:00
Alexandre BODIN
57928b7bdc
Merge pull request #11436 from strapi/feat/differentiate-first-admin 
Differentiate first admin
 2021-11-16 15:42:04 +01:00
Alexandre BODIN
6660e2ff50
Merge pull request #11583 from strapi/v4/creation-date-fields-cm 
Add createdAt and updatedAt back into the CM layouts and metas
 2021-11-16 15:26:14 +01:00
ronronscelestes
a1551a4d0f removed it.only 2021-11-16 15:06:35 +01:00
ronronscelestes
32fc03a15c fixed tests LV not showing data 2021-11-16 15:05:08 +01:00
ronronscelestes
61556b70af typography in LV 2021-11-16 15:00:53 +01:00
ronronscelestes
4ba49202d7 typography edit component + trigger message fixed 2021-11-16 14:51:34 +01:00
cyril lopez
91f256e36f
Merge pull request #11585 from strapi/chore/remove-buffetjs 
[v4] Remove all Buffetjs dependencies
 2021-11-16 14:00:17 +01:00
ronronscelestes
8cbb331fff started typography integration + fixed combobox created value crashing the app 2021-11-16 12:23:49 +01:00
ronronscelestes
4ae0f538d1 typography integrated 2021-11-16 11:40:28 +01:00
vincentbpro
532c8d6959 tests: updated e2e tests 2021-11-16 11:29:57 +01:00
ronronscelestes
ec8b6062a0
[DS] Typography in API tokens (#11577) 
* list page done - fixed description ellipse

* edit/create page done

* fixed snapshots which didn't wait for data to be loaded

* fixed date test changing everyday with new Date
 2021-11-16 11:21:18 +01:00
ronronscelestes
fba8f405b1 feedback fix + replaced Layout component in the right order 2021-11-16 11:19:59 +01:00
ronronscelestes
8d63de8d42 added Settings title + fixed tests 2021-11-16 11:01:51 +01:00
cyril lopez
6114a4f0df
Merge pull request #11581 from strapi/ctb/default-values 
[v4] CTB: Fix default values
 2021-11-16 10:16:20 +01:00
soupette
4e9cae7bc1 Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-16 10:15:57 +01:00
soupette
c53099746c Add timestamps to cm filters 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-16 09:44:50 +01:00
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
soupette
986a010f4c Fix lint 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-16 09:25:30 +01:00
soupette
0e2eda20f5 Move css import of cropperjs into GlobalStyle 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-16 08:13:19 +01:00
soupette
faa557ecbf Remove buffetjs dependencies 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-16 08:10:36 +01:00
Alexandre Bodin
3bc73a28c0 Add createdAt and updatedAt back into the CM layouts and metas 2021-11-15 19:26:56 +01:00
soupette
52c0752b11 Merge branch 'releases/v4' of github.com:strapi/strapi into ctb/default-values 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-15 18:24:44 +01:00
soupette
1be1d9a747 Fix ctb default values 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-15 18:22:03 +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
vincentbpro
635988559a tests: updated snapshots 2021-11-15 17:34:03 +01:00