yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-03 14:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 109 Branches 487 Tags
Commit Graph

795 Commits

Author SHA1 Message Date
tillschweneker
6ba1a78cc7 [FIX] respect custom ENV_PATH when setting JWT_SECRET 2021-12-22 10:15:15 +01:00
Kim, Harim
8ad91851a3
Merge branch 'master' into fix/populate-user 2021-12-22 07:14:25 +09:00
Kim, Harim
bd0aa9e9f5
Fix unable to reset password in GraphQL mutation (#11964) 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-21 11:45:18 +01:00
harimkims
54d10ec83c Fix e2e test 2021-12-21 11:24:39 +09:00
harimkims
5ba0d2d657 Fix unable to populate user 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-21 10:43:36 +09:00
Fabien del Carmen
66ca7b2f4f
Merge branch 'master' into chore/test-config 2021-12-14 16:32:01 +01:00
Alexandre BODIN
8ae6fd5ae7
Merge branch 'master' into chore/test-config 2021-12-14 15:56:27 +01:00
Alexandre BODIN
a7ddc34d4e
Merge branch 'master' into fix/11789 2021-12-14 14:11:50 +01:00
harimkims
26c8dfbe5f send filter in context query 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-14 19:30:24 +09:00
Alexandre BODIN
da73164fbc
Merge pull request #11734 from iicdii/translation-ko 
Update ko translation, add missing key
 2021-12-14 10:14:09 +01:00
Alexandre BODIN
398ecd9071
Merge pull request #11752 from strapi/v4/product-copy-text-changes-v1 
Product copy text changes v1
 2021-12-09 10:13:34 +01:00
harimkims
74dee39682 Fix unable to filter users, add e2e test 2021-12-04 21:50:54 +09:00
Pierre Noël
d676242c8f Fix saving up settings 2021-12-03 11:49:22 +01:00
vincentbpro
36bfa44b70 Merge branch 'master' of github.com:strapi/strapi into v4/product-copy-text-changes-v1 2021-12-01 18:15:44 +01:00
Fabien del Carmen
e1ff4b052c
Merge branch 'master' into chore/test-config 2021-12-01 11:20:39 +01:00
harimkims
1d3c57b462 Update ko translation, add missing key 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-01 09:27:19 +09:00
Alexandre Bodin
57ec94a4ce Remove snyk files. We switched to their github integration instead 2021-11-30 14:22:48 +01:00
fdel-car
3864399eb8 Merge branch 'master' into chore/test-config 2021-11-30 12:36:11 +01:00
Alexandre Bodin
8b9d095388 Update snapshots 2021-11-30 12:00:44 +01:00
vincentbpro
b50d83729c style: text change go back 2021-11-30 10:57:56 +01:00
Alexandre Bodin
b181702f02 v4.0.0 2021-11-29 20:16:44 +01:00
DMehaffy
7e874e00a0 Update all documentation links to new docs url (#11424) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-11-29 18:13:52 +01:00
Alexandre BODIN
6e0f205213
Merge pull request #11708 from strapi/v4/fix-defaults-provider 
Remove defaults key from stored grant config
 2021-11-29 17:38:22 +01:00
Dieter Stinglhamber
cb7f44ea41 make author and maintainers field consistent accross packages 2021-11-29 16:23:55 +01:00
Pierre Noël
b0b4135ce0 remove defaults key from stored grant config 2021-11-29 16:05:45 +01:00
Alexandre Bodin
c288dcb902 Cleanup and normalize package.json files 2021-11-29 15:13:33 +01:00
Alexandre Bodin
1d6e3ef529 Fix url join 2021-11-29 10:41:26 +01:00
Marvin Frachet
62e35985ec
Bump parts alpha 70 (#11694) 
Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
 2021-11-26 18:48:14 +01:00
ronronscelestes
0c2e2748e3
[QA] Fix accordion in U&P Roles (#11693) 
* fixed radius accordion content, spaces between accordions, spaces between title and accordions

* updated snapshots
 2021-11-26 16:13:19 +01:00
Marvin Frachet
4cd5c4d982
Bump parts alpha 69 (#11684) 2021-11-25 17:23:37 +01:00
ronronscelestes
3232b8d7b8 added useFocusWhenNavigate in U&P Roles 2021-11-25 14:25:26 +01:00
mfrachet
637bf8e4f0 Fix stuff 2021-11-24 15:49:01 +01:00
mfrachet
abc478afbe Fix UP as a TEAM 2021-11-24 11:48:58 +01:00
ELABBASSI Hicham
29cde404a1
Bump DS to 68 (#11663) 
* Bump DS to 68

Signed-off-by: HichamELBSI <elabbassih@gmail.com>

* fixed Strikethrough import in WysiwygNav

Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
 2021-11-23 18:29:08 +01:00
Dieter Stinglhamber
0446793ee9 use pluginOption visibility 2021-11-23 10:37:08 +01:00
soupette
443c4d0785 Fix ctb navigation and upgrade DS version 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 16:21:49 +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
soupette
e7c1eb4ed3 Fix some ui bugs 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-17 14:07:56 +01:00
soupette
8ddebe5cc0 Fix password icon color 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-17 11:36:40 +01:00
ELABBASSI Hicham
4f34eaceba
Merge pull request #11573 from strapi/typography-up-providers 
[DS] Typography in Users&Permissions/Providers
 2021-11-16 11:10:11 +01:00
ELABBASSI Hicham
9bd28ed463
Merge pull request #11576 from strapi/typography-up-advanced-settings 
[DS] Typography in Users&Permissions/ Advanced settings
 2021-11-16 11:09:20 +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
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
ronronscelestes
95d0e80128 typography integrated 2021-11-15 16:58:13 +01:00
ronronscelestes
8450dd87b3 typography integrated 2021-11-15 16:39:36 +01:00
ronronscelestes
e92b85943a typography integrated 2021-11-15 16:14:02 +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
Convly
25e62db93a use 'sanitizers' instead of 'utils' 2021-11-10 17:08:54 +01:00
soupette
d5f575cb0d Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-10 08:44:18 +01:00