yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-26 23:22:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,157 Commits 140 Branches 511 Tags
Commit Graph

17157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
8230d1aaec Fix conflicts and remove not migrated components 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-23 11:14:08 +02:00
cyril lopez
d557499271
Merge pull request #10764 from strapi/chore/remove-plugins 
Remove plugins views
 2021-08-23 11:03:17 +02:00
soupette
4b6341aa18 Merge branch 'v4/ds-migration' of github.com:strapi/strapi into chore/remove-plugins 2021-08-23 10:57:25 +02:00
soupette
7824f78dab Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-23 10:56:48 +02:00
Alexandre Bodin
ba8d082188 Cleanup sort 2021-08-23 10:51:32 +02:00
cyril lopez
4d8aaa9858
Merge pull request #10768 from strapi/core/doc-helper-plugin 
Core/doc helper plugin
 2021-08-20 15:54:15 +02:00
soupette
d8209894fa Fix admin development 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-20 15:30:54 +02:00
ronronscelestes
2939dae9ec added should not crash test 2021-08-20 15:16:21 +02:00
ronronscelestes
5d05c84e3e PR feedback fixes 2021-08-20 15:09:29 +02:00
soupette
6099fdf046 Add docs to components folder 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-20 11:19:50 +02:00
soupette
79bd635385 Clean stories 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-20 09:45:33 +02:00
soupette
23dd51f598 Created new src folder and start cleaning old components 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-20 09:32:59 +02:00
soupette
3061190203 Add storybook 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-20 09:20:35 +02:00
Alexandre Bodin
4fbd411f69 Fix lint 2021-08-19 23:28:29 +02:00
soupette
0071df7c18 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 17:59:20 +02:00
soupette
131a506f80 Removed buffetjs from roles lv 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 17:12:21 +02:00
soupette
77eedf2577 Commented the settings view that are not yet migrated 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 16:46:06 +02:00
soupette
0c516640ae Remove plugins views 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 16:38:32 +02:00
cyril lopez
de87cb8107
Merge pull request #10732 from strapi/webhooks-listview-ds 
DS integration in Webhooks Listview
 2021-08-19 15:41:58 +02:00
ronronscelestes
c987be0d5b fix conflicts 2021-08-19 15:41:41 +02:00
ronronscelestes
9e5ff42af2 add webhook link button if canCreate + notifyStatus 2021-08-19 15:04:01 +02:00
ELABBASSI Hicham
cb7a324778
Merge pull request #10757 from strapi/v4/ds/remove-bootstrap 
Remove bootstrap
 2021-08-19 14:21:05 +02:00
ronronscelestes
e9fb65d1ea merged v4/ds-migration 2021-08-19 13:54:53 +02:00
ronronscelestes
52422440f0 updated to parts alpha 15 + LinkButton 2021-08-19 12:00:53 +02:00
mfrachet
54ac90626d Remove bootstrap 2021-08-19 10:26:47 +02:00
Alexandre Bodin
f528a865cb Merge branch 'master' of github.com:strapi/strapi into releases/v4 2021-08-19 10:12:58 +02:00
soupette
393bf5f1be Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 09:42:19 +02:00
Alexandre Bodin
5202c4ed5c v3.6.7 v3.6.7 2021-08-19 09:32:12 +02:00
soupette
48239ab116 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 09:30:45 +02:00
Richard Nsama
fb7f280e1a
Added a POST route to the SSO routes to support SAML login callbacks (#10690) 2021-08-19 09:29:11 +02:00
Alexandre Bodin
84984cf030 Fix singleType entity service find 2021-08-18 19:49:13 +02:00
HichamELBSI
ec85a4adf8 DS Migration : Auth pages (Forgot/reset password, Oops page) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-18 17:43:57 +02:00
ronronscelestes
caef15ed42 updated translations 2021-08-18 17:37:38 +02:00
Alexandre Bodin
9baf1af73e Fix i18n copy attributes 2021-08-18 16:57:18 +02:00
ronronscelestes
81ae331395 loading state updated 2021-08-18 14:28:06 +02:00
ronronscelestes
6a609ccc0b changed enabled - disabled format message 2021-08-18 11:49:29 +02:00
ronronscelestes
1929d72e3f added a column for provider icon 2021-08-18 11:45:34 +02:00
markkaylor
c3eff49770
add tracking event to strapi awesome banner (#10701) 2021-08-18 11:12:21 +02:00
Alexandre Bodin
d36c03727b Add case insensitive operators for contains 2021-08-18 09:46:09 +02:00
Alexandre Bodin
a4d3ac34bd Merge branch 'master' into releases/v4 2021-08-17 19:10:29 +02:00
Alexandre Bodin
a041d76d8a Fix tests conflicting 2021-08-17 18:54:20 +02:00
ronronscelestes
4c73122e76 draft DS integration 2021-08-17 18:51:41 +02:00
Alexandre Bodin
fd86d1926f Handle polymorphic relation field filter and order 2021-08-17 18:08:42 +02:00
Alexandre Bodin
6a559d6db3 Split helpers and support populate * 2021-08-17 15:22:04 +02:00
ronronscelestes
e8c352eb8e Merge branch 'v4/ds-migration' into webhooks-listview-ds 2021-08-17 15:03:41 +02:00
ronronscelestes
975b1e984d added 1 to rowsCount in Table to able focus on last row 2021-08-17 14:58:05 +02:00
ELABBASSI Hicham
e10c6a344a
Merge pull request #10733 from strapi/migration/sign-up 
DS Migration : Sign up view
 2021-08-17 14:38:04 +02:00
ronronscelestes
b94448218c added useFocusWhenNavigate hooks 2021-08-17 14:14:45 +02:00
ronronscelestes
f79f6eda59 Merge branch 'v4/ds-migration' into webhooks-listview-ds 2021-08-17 14:05:36 +02:00
ronronscelestes
5ce9d2c209 deleted a comment 2021-08-17 14:01:31 +02:00