yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 00:09:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,244 Commits 125 Branches 497 Tags
Commit Graph

17244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
acalvino4
7c765e5167 issues-8914 allow multiple images to be selected and inserted from wysiwyg 2021-02-16 11:13:31 -07:00
Alexandre Bodin
ae29f535d7 Update plugin sentry version 2021-02-16 17:39:46 +01:00
jonmol
7a6432da73
added a way to have a less expensive search (#9316) 
* added a way to have a less expensive search

* renamed skipSearch to searchable

* forgot to remove one skipSearch

* skip non searchable fields on mongoose query

* cleaned up the if statement

* reverted change to strapi-plugin-upload/models

Co-authored-by: Luis del Rio <ldelriof@gmail.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-02-16 17:37:30 +01:00
Alexandre Bodin
cefdde18f4 Init db lifecycles manager 2021-02-16 16:48:16 +01:00
Alexandre BODIN
7eb1ff5b96
Merge pull request #8890 from strapi/features/sentry-plugin 
Add Sentry plugin
 2021-02-16 16:47:23 +01:00
cyril lopez
a431d30d31
Merge pull request #9405 from strapi/i18n/rbac-settings-plugins 
I18n/rbac settings plugins
 2021-02-16 16:44:26 +01:00
soupette
5d022339a6 Apply conditions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-16 16:43:16 +01:00
Alexandre BODIN
0c56684dfe
Merge pull request #9402 from strapi/i18n/init-db 
I18n/init db
 2021-02-16 16:22:07 +01:00
soupette
6a6fb0594a Add condition modal to plugins and settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-16 16:20:00 +01:00
Alexandre Bodin
155ac2f3b4 order lifecycles to be accurate with order of execution 2021-02-16 15:34:10 +01:00
soupette
95eeed0dec Created conditions modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-16 15:16:16 +01:00
Alexandre Bodin
fad50fe569 Add basic default locale set & make attribute non writable 2021-02-16 14:36:11 +01:00
Alexandre Bodin
cc701d1c0e Merge branch 'features/i18n' into i18n/init-db 2021-02-16 12:56:32 +01:00
Alexandre BODIN
144299559e
Merge pull request #9393 from strapi/i18n/delete-locale 
add delete locale route
 2021-02-16 12:39:17 +01:00
Alexandre Bodin
d64bd85262 Refactor some code & clean comments 2021-02-16 12:23:51 +01:00
Marvin Frachet
db3784ce32
Adding icons for Single Types and Collection type (#9416) 2021-02-16 12:00:24 +01:00
Marvin Frachet
e5edd0a1c9
[i18n] delete a locale (#9404) 2021-02-16 12:00:05 +01:00
soupette
5a53675b8f Add logic to set to false the conditions when the properties are all falsy 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-16 11:26:42 +01:00
Pierre Noël
dc663de43e add unit tests 2021-02-16 10:26:47 +01:00
Alexandre BODIN
6dd67d5c76
Fix pool config (#9417) 2021-02-16 10:16:49 +01:00
mfrachet
46486ec95f [i18n] fixing add locale params 2021-02-16 09:54:31 +01:00
ELABBASSI Hicham
1cf82089ec
Merge pull request #9394 from strapi/sso/use-sso-registration 
sso/use sso registration
 2021-02-16 09:52:53 +01:00
Alexandre BODIN
49b2df29c4
Merge branch 'master' into features/sentry-plugin 2021-02-16 09:50:06 +01: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
dependabot[bot]
11005176ca
Bump swagger-ui-dist from 3.41.1 to 3.43.0 (#9413) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.41.1 to 3.43.0.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.41.1...v3.43.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-16 09:42:51 +01:00
mfrachet
f72f8ec2b9 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 2021-02-16 09:42:42 +01:00
Alexandre Bodin
88dbf33139 Merge branch 'features/sentry-plugin' of github.com:strapi/strapi into features/sentry-plugin 2021-02-16 09:29:20 +01:00
Alexandre Bodin
321d7c1361 Fix unit tests 2021-02-16 09:29:12 +01:00
Rémi de Juvigny
0aed8e18f5 Improved docs to disable the plugin 2021-02-15 19:34:45 +01:00
HichamELBSI
a61aebaaa3 Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-02-15 19:09:40 +01:00
Alexandre Bodin
8d2ab6e1b0 Move sentry middleware to middlewares folder 2021-02-15 15:45:30 +01:00
soupette
fb35ac5b64 Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-15 14:59:42 +01:00
Thew Dhanat
06ebbee166
strapi-plugin-upload accepts localServer configuration (#9191) 
* Update index.js

* Update index.js

* Update index.js

* Update index.js
 2021-02-15 14:58:59 +01:00
Marvin Frachet
cdcbb0de4b
[i18n] add a locale from the ISO list (#9397) 2021-02-15 14:55:08 +01:00
Paul Weinsberg
96516d5d7f
Enable develop --poll flag to watch file changes in network directories (#8773) 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-02-15 14:34:44 +01:00
Pierre Noël
9bca167d03 add delete locale route 2021-02-15 14:21:25 +01:00
soupette
bd8c2320f4 Merge branch 'i18n/rbac-form' of github.com:strapi/strapi into i18n/rbac-settings-plugins 2021-02-15 14:06:39 +01:00
soupette
a8d0d91d8b Merge branch 'i18n/rbac' of github.com:strapi/strapi into i18n/rbac-form 2021-02-15 14:06:09 +01:00
cyril lopez
43b44f3b59
Merge pull request #9368 from strapi/i18n/rbac-refactoring 
[I18n] RBAC CT & ST refactoring
 2021-02-15 14:01:32 +01:00
soupette
78fa5374a5 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-15 13:31:46 +01:00
soupette
4b528451ba Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-15 13:24:21 +01:00
soupette
7dbc795288 Add plugins and settings tabs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-15 12:49:54 +01:00
Alexandre BODIN
a39dae880c
Merge pull request #9392 from strapi/i18n/toggle-i18n-on-ct 
handle toggle i18n on CT and fields
 2021-02-15 12:09:59 +01:00
Pierre Noël
bd359b6a3d add unit tests 2021-02-15 11:43:58 +01:00
Alexandre Bodin
eb935a8b71 Cleanup lifecycle in strapi app 2021-02-15 11:40:30 +01:00
Alexandre Bodin
be1b8f20e8 Cleanup to be mergeable now 2021-02-15 11:32:37 +01:00
Alexandre Bodin
6f4655a266 Add tests & refactor into services 2021-02-15 11:24:28 +01:00
soupette
b225028b0f Merge branch 'i18n/rbac-form' of github.com:strapi/strapi into i18n/rbac-settings-plugins 2021-02-15 11:11:56 +01:00
cyril lopez
5721572fdf
Merge pull request #9400 from strapi/i18n/rbac-form-doc 
Add documentation
 2021-02-15 11:11:32 +01:00
soupette
516b15ea7c Change wording to leafs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-15 11:10:49 +01:00