yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,745 Commits 127 Branches 497 Tags
Commit Graph

2729 Commits

Author SHA1 Message Date
Alexandre Bodin
469991f9f2 Merge branch 'master' into features/i18n 2021-02-18 14:36:32 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 2021-02-18 11:28:28 +01:00
cyril lopez
e21f06d4b6
Merge branch 'master' into issues-8914-allow-multiple-image-insertion-wysiwyg 2021-02-18 07:54:34 +01:00
HichamELBSI
1a42da3007 Merge branch 'master' into features/sso 2021-02-17 11:43:34 +01:00
acalvino4
7c765e5167 issues-8914 allow multiple images to be selected and inserted from wysiwyg 2021-02-16 11:13:31 -07:00
dependabot[bot]
3bccd24bc4
Bump markdown-it-ins from 3.0.0 to 3.0.1 (#9414) 
Bumps [markdown-it-ins](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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-16 09:43:39 +01:00
Pierre Noël
b3a9b5ad76 add pluginOptions 2021-02-10 14:29:54 +01:00
Convly
4369af5361 Merge branch 'master' of github.com:strapi/strapi into features/sso 2021-02-09 15:26:28 +01:00
Alexandre Bodin
544f98b8ee v3.4.6 2021-02-03 19:32:36 +01:00
cyril lopez
788a81db95
Fixes #9294 (#9306) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-03 14:35:55 +01:00
Alexandre Bodin
8287e2ea21 Merge branch 'master' into features/sso 2021-02-03 12:11:03 +01:00
Pierre Noël
24e1d979a7 update tests 2021-02-02 11:30:24 +01:00
Alexandre Bodin
4c3bd90ec0 Merge branch 'develop' into features/sso 2021-02-02 10:51:28 +01:00
soupette
88919eb84c Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-01 14:32:58 +01:00
cyril lopez
0a283dd7ce
Merge branch 'master' into master 2021-02-01 09:56:47 +01:00
soupette
e1b7c8b67c Fixes #9259 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-29 16:58:04 +01:00
mfrachet
326f6d8d51 Increasing padding bottom to prevent question button from overlapping 2021-01-29 15:24:57 +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
Convly
bd91f748d8 Merge master into features/sso 2021-01-27 16:34:43 +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
Virgil B
8eca3534c7
Merge branch 'master' into master 2021-01-26 13:45:19 +02:00
Virgil B
063c9b8ba5
Fixed syntax error 2021-01-26 13:43:53 +02:00
Virgil B
f67ca1688b
fix reverse text on code/quote blocks 2021-01-26 13:26:36 +02:00
Alexandre Bodin
4f9cc8a22c v3.4.5 2021-01-26 11:59:47 +01:00
Virgil B
9168b8823a
Merge branch 'master' into master 2021-01-26 12:10:37 +02:00
cyril lopez
8b39f5ac05
Fixes #9180 (#9204) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-26 11:09:49 +01:00
Virgil B
5a87c9af8f
Fixed Wysiwyg reversing text 
After adding a MD formatting block (b, i, u, etc.) the text would be reversed. This fixes that issue as well as automatically selecting the placeholder text when no selection is being made.
 2021-01-26 11:49:31 +02: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
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