yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 18:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,485 Commits 116 Branches 488 Tags
Commit Graph

2710 Commits

Author SHA1 Message Date
mfrachet
2755a10885 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 2021-02-05 08:16:07 +01:00
mfrachet
1f2f4c2986 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 2021-02-02 13:38:48 +01:00
Pierre Noël
24e1d979a7 update tests 2021-02-02 11:30:24 +01:00
Pierre Noël
291aeb07bc add read/create/update route for locales 2021-01-29 10:12:34 +01:00
cyril lopez
0b55c84d9f
Merge branch 'master' into fix/9236 2021-01-29 09:05:17 +01:00
Jorrit Schippers
175422d760
Update .npmignore files (#8865) 
Add .editorconfig, .snyk, __tests__, jest.config.js
Remove .npmignore and .gitignore from admin subdirectories

Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-28 16:57:29 +01:00
soupette
47edbcbfb0 Fixes #9236 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-27 15:42:18 +01:00
Jorrit Schippers
3f63902d4b
Use https:// in package.json and README.md files (#9227) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-26 17:06:25 +01:00
Alexandre Bodin
4f9cc8a22c v3.4.5 2021-01-26 11:59:47 +01:00
cyril lopez
8b39f5ac05
Fixes #9180 (#9204) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-26 11:09:49 +01:00
Alexandre BODIN
54af039f17
Fix is-creator condition not applied on find (#9213) 
* Fix is-creator condition not applied on find

* Add test
 2021-01-26 10:18:43 +01:00
soupette
8f958553b9 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-26 10:06:16 +01:00
Pierre Noël
387ded4a99
Fix relation search (#9156) 
* add params to relation route to omit existing relations

* small refacto

* use omit approach

* Fix relation select (Front)

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

* Fix relation select review

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

* update doc aos + remove useless cast to string

Co-authored-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-25 17:58:18 +01:00
Robin Louis van Komen
2288b43e8b
add danish translations to some packages (#8353) 
* add danish translations to some packages

* make sure that danish has a native language name

* add missing danish translations for draft/publish system
 2021-01-25 09:07:55 +01:00
Alexandre Bodin
542786f263 v3.4.4 2021-01-20 17:31:59 +01:00
p_0g_8mm3_
86242a01b2
Update German translations (#9141) 
* fix typos

* use more common words for relation

* simplify, shorten

* make translations consistent

* improve upload plugin translation

* fix minor errors

* fix permissions plugin translations

* change mail back to kai@doe.com

* change name back to Kai Doe

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-01-18 17:49:30 +01:00
cyril lopez
99d4e9a481
Fix search (#9139) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-18 12:09:04 +01:00
Thew Dhanat
5bbb8e6d10
Merge branch 'master' into Validate-boolean-is-not-null-when-required 2021-01-14 22:30:40 +07:00
Pierre Noël
1e8a8b0dc2
Fix sortable config disabled at launch (#9115) 
* fix sortable config for RF

* fix isSortable tests + add tests
 2021-01-14 12:16:47 +01:00
dependabot[bot]
2eab3f2cfb
Bump markdown-it from 11.0.1 to 12.0.4 (#9087) 
Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 11.0.1 to 12.0.4.
- [Release notes](https://github.com/markdown-it/markdown-it/releases)
- [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it/compare/11.0.1...12.0.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-14 10:53:20 +01:00
Alexandre Bodin
553d64cafd v3.4.3 2021-01-14 10:46:50 +01:00
Artem Shtelzer
df33626751
Merge branch 'master' into bugfix/fix-remove-key-in-object 2021-01-13 13:29:51 +02:00
Alexandre Bodin
7505de6ad9 v3.4.2 2021-01-13 12:16:44 +01:00
Jorrit Schippers
8d88f5e97f
Consolidate lodash dependency to 4.17.20 (#8861) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>

Co-authored-by: Pierre Noël <petersg83@users.noreply.github.com>
 2021-01-13 12:08:13 +01:00
Kim, Harim
ac3d10006c
Add session option to Strapi query for Mongo Multi-Document transaction (#6447) 
* add session option to mongo queries for transaction

Signed-off-by: harimkims <harimkims@gmail.com>

* seperate session parameter in buildQuery functions

Signed-off-by: harimkims <harimkims@gmail.com>

* clarify comment about mongoose create requirement

Signed-off-by: harimkims <harimkims@gmail.com>

Co-authored-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-13 10:37:23 +01:00
dependabot[bot]
5f87279894
Bump markdown-it-mark from 3.0.0 to 3.0.1 
Bumps [markdown-it-mark](https://github.com/markdown-it/markdown-it-mark) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/markdown-it/markdown-it-mark/releases)
- [Changelog](https://github.com/markdown-it/markdown-it-mark/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it-mark/compare/3.0.0...3.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-13 06:28:26 +00:00
Convly
5228236246 Merge branch 'master' into features/sso 2021-01-12 11:36:11 +01:00
Artem Shteltser
76479a9567 Test to check if removeKeyInObject not corrupt moment objects 2021-01-12 12:14:33 +02:00
Artem Shteltser
54350200eb Fixed removeKeyInObject.js which have been breaking moment objects 2021-01-12 12:14:32 +02:00
Thew Dhanat
2362b215d7
Merge branch 'master' into Validate-boolean-is-not-null-when-required 2021-01-12 15:44:21 +07:00
dependabot[bot]
f711a56929
Bump markdown-it-emoji from 1.4.0 to 2.0.0 (#9097) 
Bumps [markdown-it-emoji](https://github.com/markdown-it/markdown-it-emoji) from 1.4.0 to 2.0.0.
- [Release notes](https://github.com/markdown-it/markdown-it-emoji/releases)
- [Changelog](https://github.com/markdown-it/markdown-it-emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it-emoji/compare/1.4.0...2.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-12 09:24:26 +01:00
Thew Dhanat
47e9da89e5
Merge branch 'master' into Validate-boolean-is-not-null-when-required 2021-01-12 07:15:54 +07:00
Pierre Noël
08f9b05d21
Fix query when filtering and sorting on a relational field (#9045) 
* fix query when filtering and sorting on a relational field

* add tests + refacto

* remove useless code
 2021-01-11 17:21:01 +01:00
Jerod Fritz
da1277e90a
Update en.json is->are (#8922) 
When no results are returned in the admin the collections are referred to in the plural however the english references a singular.  For example There is no Restaurants should be There are no Restaurants
 2021-01-11 16:55:03 +01:00
Davide Rossi
e268b0bd6b
Improves Italian translation (#8961) 
* Fixes italian translations for filter function

* Fixes some inconsistencies and adds some missing strings to italian translation of content-type-builder plugin

* Adds all the missing strings in IT translation for content-type-builder plugin

* Fixes and updates italian translation of content-manager plugin

* Updates italian translation of content-type-builder plugin

* Updates italian translation for users-permissions and documentation plugin

* Updates italian translations of admin UI and various plugins

* Minor style fixes on italian translation of users-permissions plugin
 2021-01-11 16:54:17 +01:00
ThewBear
d2eba6655d Validate boolean is not null when required 2021-01-10 23:44:54 +07:00
Convly
c3a2c7024d PR review adjustments 2021-01-08 10:09:10 +01:00
Convly
2431149912 Lint fixes 2021-01-08 10:09:09 +01:00
Convly
9748d702ad Merge & fix 2021-01-08 10:09:09 +01:00
Convly
2a483ba958 Cleanup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:08 +01:00
Convly
857a78e252 Add all missing e2e tests (draft) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:22 +01:00
p_0g_8mm3_
cac2550c2b add missing content manager translations 2021-01-07 20:09:05 +01:00
HichamELBSI
47d641d8c0 Fix UI review on SSO 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-07 17:37:12 +01:00
HichamELBSI
0f33931d28 Update buffetjs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-04 14:47:54 +01:00
soupette
ed6b206c19 Merge branch 'master' of github.com:strapi/strapi into front/bugs-fix 2021-01-04 12:26:27 +01:00
soupette
e074574761 Fixes #8994 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-04 11:46:58 +01:00
soupette
f166ce0b72 Fixes #9016 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-04 11:43:10 +01:00
Artem Shteltser
bde6f93925 Fixed removeKeyInObject 2021-01-04 11:19:47 +02:00
HichamELBSI
fec4ac3f04 Fix react-tooltip install 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:32 +01:00
HichamELBSI
4ec79afa9d import Tooltip and Separator from buffet 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:32 +01:00