yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-06 15:22:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,520 Commits 120 Branches 493 Tags
Commit Graph

17520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pierre Noël
682e877644 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-18 18:37:57 +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
Pierre Noël
65a89df6f2
Merge pull request #10752 from strapi/v4/plugin-api/extensions 
V4/plugin api/extensions
 2021-08-18 12:10:16 +02:00
Pierre Noël
c547e64571 fix e2e tests 2021-08-18 11:58:17 +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
Mike Casebolt
192653cce9
remove newline at end 2021-08-17 17:34:48 -07:00
Mike Casebolt
694ac5c1cb
fix grammar 
"You are logged as the first administrator." -> "You are logged in as the first administrator."
 2021-08-17 17:29:08 -07: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
Alexandre Bodin
d5dd34278b Fix delete permissions 2021-08-17 13:48:52 +02:00
ronronscelestes
a94929d2db more PR review fixes 2021-08-17 13:44:21 +02:00
GQ
7a80bdaa8e
change common beginning to common path (#10509) 
* change common beginning to common path

* get common path

* add more tests

* add some space

Co-authored-by: Pierre Noël <petersg83@users.noreply.github.com>
 2021-08-17 13:25:14 +02:00
ronronscelestes
5b3113a14c set all webhooks to delete reducer created with tests works 2021-08-17 12:01:42 +02:00
ronronscelestes
834e0e9855 adding a reducer + test 2021-08-17 10:39:42 +02:00
HichamELBSI
f568ce08bd Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-16 18:38:24 +02:00
HichamELBSI
ad4cad32a0 Add sign up view 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-16 18:36:12 +02:00
Montlouis-Calixte Stéphane
ca93309349
Merge pull request #10720 from strapi/migration/admin-settings-list-roles 
List roles new design
 2021-08-16 16:52:42 +02:00
Montlouis-Calixte Stéphane
4d362510ad
Update packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js 
Co-authored-by: Marvin Frachet <marvin.frachet@strapi.io>
 2021-08-16 16:41:04 +02:00
ELABBASSI Hicham
9b38814ccd
Merge pull request #10716 from strapi/migration/ds-i18n-listview 
DS: migrate the i18N settings page
 2021-08-16 16:20:07 +02:00
mfrachet
36fc2ca492 Fixing reviews 2021-08-16 14:44:26 +02:00
bulby97
c78c4703f8 i18n aria-label 2021-08-16 14:38:32 +02:00
ronronscelestes
c270560007 small PR review fix 2021-08-16 14:09:47 +02:00
ronronscelestes
bb902a32cb PR review fixes 2021-08-16 12:00:05 +02:00
ronronscelestes
0254876627 Switch && Checkboxes actions + empty webhooks ds 2021-08-13 17:02:30 +02:00
Pierre Noël
face75bcba Merge branch 'pluginAPI/loadPlugin' into v4/plugin-api/extensions 2021-08-13 15:43:25 +02:00
Pierre Noël
63cc0832f2 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-13 15:43:04 +02:00
Pierre Noël
2d7454553a add extension system for content-types 2021-08-13 15:35:19 +02:00
ronronscelestes
73a03fbfc8 integrated DS + deleteOne, updateOne 2021-08-13 12:38:21 +02:00
mfrachet
d6fe1bf48a Fix sorting 2021-08-13 11:10:40 +02:00
mfrachet
604a72a43c Fix linting 2021-08-13 10:18:19 +02:00