yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-16 12:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,520 Commits 120 Branches 494 Tags
Commit Graph

17520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
96968dd7e1 Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 11:21:15 +01:00
soupette
362a0675f5 Add locale to queryInfos defaultParams 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 11:02:50 +01:00
soupette
659c85923a Persist pluginOptions search 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 10:17:00 +01:00
soupette
9a510f4e1f Merge branch 'i18n/rbac-cm-manager-attempt-fix' of github.com:strapi/strapi into i18n/cm-edit-layout 2021-03-12 10:06:19 +01:00
soupette
319d464e78 Merge branch 'i18n/rbac-rework-front' of github.com:strapi/strapi into i18n/rbac-cm-manager-attempt-fix 2021-03-12 10:04:20 +01:00
soupette
5f755b4d8f Merge branch 'features/i18n' of github.com:strapi/strapi into i18n/rbac-rework-front 2021-03-12 10:02:48 +01:00
Alexandre Bodin
c57b3be1eb Merge branch 'master' into features/i18n 2021-03-12 09:45:51 +01:00
cyril lopez
2b29398c82
Merge pull request #9690 from velopert/fix/ko-many-to-one 
Fix Korean translations for relation.manyToOne
 2021-03-12 09:08:52 +01:00
dependabot[bot]
6d4d74e8fd
Bump byte-size from 7.0.0 to 7.0.1 
Bumps [byte-size](https://github.com/75lb/byte-size) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/75lb/byte-size/releases)
- [Commits](https://github.com/75lb/byte-size/compare/v7.0.0...v7.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-12 05:50:14 +00:00
dependabot[bot]
dac6abfcf6
Bump fs-extra from 9.0.1 to 9.1.0 
Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 9.0.1 to 9.1.0.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/9.0.1...9.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-12 05:43:19 +00:00
Minjun Kim
581f640b86
Fix Korean translations for relation.manyToOne 
Previously shown as `Article N : 1 Comments` while it should show `Article 1 : N Comments`
Since en.json uses `has many` for this description, do the same for Korean translation
 2021-03-12 08:27:50 +09:00
soupette
d294e22674 Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 17:36:34 +01:00
soupette
fd3dda166f Add translation to labelIcon 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 17:02:33 +01:00
Alexandre BODIN
32f6dfb812
Allow set writable attributes in coreApi for a model to overwritte CM writable (#9687) 2021-03-11 16:19:49 +01:00
soupette
ebff06938d Created middleware to enhance the edit view layout 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 15:48:35 +01:00
soupette
55873fdd5a Move layout to redux store 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 15:06:58 +01:00
soupette
55f3ff08f5 Update layout to have the targetModel pluginOptions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 14:44:02 +01:00
Alexandre Bodin
33552e43b8 v3.5.3 v3.5.3 2021-03-11 14:25:37 +01:00
germangonzo
a40e3b0014
Fix error with polymorphic relations when the attribute name is different to related (#9396) 2021-03-11 14:11:23 +01:00
Yuri Burk
87900d741b
Fixed bug that wasn't enabling to click behind notification div (#9562) 
* Fixed bug that wasn't enabling to click behind notification div

* Update new notification to include pointer-events

* Update new notification wrapper to include pointer-events
 2021-03-11 14:08:46 +01:00
ELABBASSI Hicham
1a07977ae2
Merge pull request #9685 from strapi/fix/wysiwyg-send-button 
Fix WYSIWYG state
 2021-03-11 13:56:03 +01:00
HichamELBSI
17c29747b4 Fix WYSIWYG state 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-03-11 11:20:41 +01:00
Alexandre Bodin
458a846a3e Fix dependabot not allowed to use secrets 2021-03-11 11:09:02 +01:00
soupette
0d37bee8cc Fix createDefaultCTForm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 10:41:18 +01:00
Alexandre Bodin
2ea169cbee Do not count localizations in CM 2021-03-11 10:27:48 +01:00
Alexandre Bodin
b48b2177ef Merge branch 'features/i18n' into i18n/localizations-sync 2021-03-11 09:06:52 +01:00
dependabot[bot]
8167f90b56
Bump bootstrap from 4.5.3 to 4.6.0 (#9662) 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.5.3 to 4.6.0.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.5.3...v4.6.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-03-10 19:15:56 +01:00
Alexandre BODIN
354aa1d8d2
Merge pull request #9658 from strapi/i18n/cm-fields 
Use non writables instead of static creator fields in fields logic
 2021-03-10 17:09:43 +01:00
dependabot[bot]
fcc409de7c
Bump date-fns from 2.16.1 to 2.19.0 (#9666) 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.16.1 to 2.19.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.16.1...v2.19.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-03-10 12:01:06 +01:00
Alexandre Bodin
4d51c2b2f2 Merge branch 'master' of github.com:strapi/strapi 2021-03-10 10:49:56 +01:00
Alexandre Bodin
7ebc29d85b Add workflow run on push to master 2021-03-10 10:49:44 +01:00
Alexandre BODIN
b3635962a3
Fix component assoc resolvers in graphql (#9660) 2021-03-10 10:46:46 +01:00
Alexandre Bodin
48c3817541 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n 2021-03-10 10:15:13 +01:00
Alexandre Bodin
ce6054f10c Allow listing locales in api 2021-03-10 10:15:01 +01:00
mfrachet
63f2441627 revert logs 2021-03-10 10:09:54 +01:00
mfrachet
09f6c1bf0f revert logs 2021-03-10 10:05:48 +01:00
mfrachet
651f598be8 fixing locale picker 2021-03-10 10:05:11 +01:00
mfrachet
e34ad1a64b remove console 2021-03-10 09:30:50 +01:00
mfrachet
e86cb0ce1d wip 2021-03-10 09:28:45 +01:00
mfrachet
a04322d585 wip 2021-03-10 09:15:24 +01:00
Alexandre Bodin
298a954888 Use non writables instead of static creator fields in fields logic 2021-03-09 20:50:23 +01:00
soupette
cdcac62ee2 Init RBAC Manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-09 15:54:00 +01:00
soupette
36b537eade Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-09 14:14:14 +01:00
dependabot[bot]
9e22c280de
Bump sanitize-html from 2.1.1 to 2.3.2 (#9488) 
Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.1.1 to 2.3.2.
- [Release notes](https://github.com/apostrophecms/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.1.1...2.3.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-09 14:10:41 +01:00
Brett Willis
a799872a86
Fix display of falsey values in component banner (#9605) 2021-03-09 14:09:42 +01:00
henk23
8f8c25a1d3
Fix german translation (#9623) 2021-03-09 14:08:10 +01:00
cyril lopez
aea9758265
Merge pull request #9616 from strapi/i18n/rbac-permissions-manager 
[I18n] RBAC permissions manager
 2021-03-09 12:32:13 +01:00
soupette
e0d39ae390 Merge branch 'features/i18n' of github.com:strapi/strapi into i18n/rbac-permissions-manager 2021-03-09 12:22:17 +01:00
Alexandre Bodin
85c8b4c739 Merge branch 'features/i18n' into i18n/localizations-sync 2021-03-09 11:48:03 +01:00
Alexandre BODIN
e82c7fb611
Merge pull request #9642 from strapi/i18n/default-params-locale 
I18n/default params locale
 2021-03-09 11:44:08 +01:00