yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 00:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 112 Branches 488 Tags
Commit Graph

9899 Commits

Author SHA1 Message Date
Dieter Stinglhamber
ba25b7b651 remove unallowed fields from admin::user relations 2021-11-24 15:15:23 +01:00
vincentbpro
813c740af8 Merge branch 'releases/v4' of github.com:strapi/strapi into v4/fix-fetch-all-entries 2021-11-24 10:14:57 +01:00
vincentbpro
a97c831cc0 tests: added tests for when maxLimit not configured(graphql) 2021-11-24 10:13:02 +01:00
Alexandre BODIN
880b38b4cc
Merge pull request #11656 from nixxoff/fix/error-path 
fix(#11223): naming error for the files path
 2021-11-24 09:56:27 +01:00
Marvin Frachet
cdf255ed4b
Fix missing description in CM relation box (#11659) 2021-11-24 08:54:38 +01:00
nixxoff
a1e53c744f fix: admin import 2021-11-24 04:32:01 +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
vincentbpro
34140bcae7 refactor: moved maxLimit maxing outside of applyMaxLimit 2021-11-23 18:27:18 +01:00
vincentbpro
92e5a71256 tests: added tests for when maxLimit not configured 2021-11-23 18:24:42 +01:00
Alexandre BODIN
aaef74b58a
Merge pull request #11660 from strapi/v4/fix-sso-query 
[V4] Fix sso existing user query
 2021-11-23 18:20:00 +01:00
vincentbpro
abecfe8f16 tests: moved and splitted test file 2021-11-23 16:48:16 +01:00
vincentbpro
cc4ffd1f57 Merge branch 'releases/v4' into v4/fix-fetch-all-entries 2021-11-23 16:22:48 +01:00
vincentbpro
48b2c38d4e Merge branch 'releases/v4' into v4/make-lastname-optional 2021-11-23 15:47:22 +01:00
ronronscelestes
3aeaadff4f
[QA] WYSIWYG placeholder color (#11662) 
* added placeholder plugin and updated placeholder plugin to match UI

* updated tests
 2021-11-23 15:33:17 +01:00
Vincent
fcdc6fa9c6
Cli check install path first (#11565) 
* feat(cli): checking install path validity before starting prompt

* refactor: cleaner logic in create-strapi-app
 2021-11-23 14:53:00 +01:00
ELABBASSI Hicham
6e86b526f1
Fix some bugs (User edit & CM validations) (#11653) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-11-23 13:58:55 +01:00
ronronscelestes
2c6ece8c5e
[QA] Wysiwyg placeholder (#11658) 
* applied font for all codemirror

* updated snapshots
 2021-11-23 12:28:18 +01:00
Convly
fdefb1382c Use a custom findOneByEmail to search for existing user 2021-11-23 12:16:54 +01:00
Alexandre BODIN
08d27c0ea5
Merge pull request #11650 from strapi/v4/remove-relation-private-cts 
Prevent relation to api token and locale
 2021-11-23 11:41:54 +01:00
Dieter Stinglhamber
0446793ee9 use pluginOption visibility 2021-11-23 10:37:08 +01:00
vladgorbachev
c3f8c7138c fix(#11223): naming error for the files path 2021-11-23 02:46:45 +01:00
Dieter Stinglhamber
9cd8fbb272 fix useTrackRef in EditView 2021-11-22 14:36:23 +01:00
Dieter Stinglhamber
63d1a0cc8d rename createFromList events by addFromList 2021-11-22 14:25:03 +01:00
Dieter Stinglhamber
5c0c26343a add willCreateTokenFromList event 2021-11-22 14:25:03 +01:00
Dieter Stinglhamber
3c8b4fd747 add usage tracking in the api token 2021-11-22 14:25:03 +01:00
Dieter Stinglhamber
052059a4fb prevent relation to api token and locale 2021-11-22 11:07:24 +01:00
Alexandre BODIN
0c0789354d
Merge pull request #11627 from strapi/v4/pub-unpub-update-by 
Update updatedBy on publish / unpublish actions in the CM
 2021-11-19 17:08:07 +01:00
Alexandre Bodin
89429acf70 Check app and admin are defined in destroy 2021-11-19 13:24:59 +01:00
cyril lopez
ffe7c9d8b9
Merge pull request #11632 from strapi/cm/fix-timestamps 
[v4]Fix timestamps field
 2021-11-19 12:01:11 +01:00
cyril lopez
671bd433f4
Merge pull request #11633 from strapi/cm-accordion-qa 
[QA] DZ + Rep Components fixes
 2021-11-19 11:52:41 +01:00
cyril lopez
5603b5d363
Merge pull request #11641 from strapi/typography-last-fixes 
[DS] Typography last fixes
 2021-11-19 11:20:45 +01:00
ronronscelestes
e370124021 base login variant alpha fix 2021-11-19 11:07:30 +01:00
ronronscelestes
9e5732df08 updated tests 2021-11-19 11:00:20 +01:00
ronronscelestes
adff683696 removed Text from commented code in CM 2021-11-19 10:56:04 +01:00
ronronscelestes
a1ca9a152a auth page 2nd part, roles settings fix, documentation plugin page 2021-11-19 10:52:22 +01:00
ronronscelestes
d14a5271ce admin components, onboarding, auth page, profile page 2021-11-19 10:45:26 +01:00
Alexandre BODIN
7ed76b1e5b
Merge pull request #11503 from strapi/v4/factories 
Init factories for controllers, services, and routers
 2021-11-19 10:30:07 +01:00
ELABBASSI Hicham
586bc9de0a
Merge pull request #11596 from strapi/typography-settings-ml 
[DS] Typography in Settings/ML
 2021-11-19 10:18:43 +01:00
soupette
12299422fa Unlock app when there is an error when creating a user 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-19 09:48:38 +01:00
cyril lopez
cc03c09253
Merge pull request #11622 from strapi/v4/fix-release-script 
[V4] Prebuild the admin panel.
 2021-11-19 09:04:29 +01:00
Alexandre Bodin
7697bb16c3 Migrate code and remove auto generation of controller and services in memory 2021-11-18 21:26:26 +01:00
ronronscelestes
0eae75773f fixed duplicate selector 2021-11-18 20:02:54 +01:00
ronronscelestes
01bd5c209c Merge branch 'releases/v4' of https://github.com/strapi/strapi into typography-settings-ml 2021-11-18 19:33:40 +01:00
ronronscelestes
92c51123aa feedback fix 2021-11-18 19:33:31 +01:00
ELABBASSI Hicham
dc9c0f434c
Merge pull request #11631 from strapi/typography-cm/part-2 
[DS] Typography in CM / Part 2 - TO MERGE AFTER PART 1
 2021-11-18 18:53:28 +01:00
ELABBASSI Hicham
bd285d0a0f
Merge pull request #11626 from strapi/typography-cm/part-1 
[DS] Typography CM / Part 1
 2021-11-18 18:35:15 +01:00
ELABBASSI Hicham
acba37d5d9
Merge pull request #11598 from strapi/typography-i18n-settings 
[DS] Typography i18n settings
 2021-11-18 18:30:21 +01:00
ronronscelestes
3d2f120a0b dz action button blue when expanded + small border fix on repeatable component 2021-11-18 17:37:14 +01:00
soupette
9266b629d8 Fix timestamps field 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 17:25:51 +01:00
soupette
86e9995c26 Fix imports 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 16:55:45 +01:00