yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-16 20:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,027 Commits 122 Branches 494 Tags
Commit Graph

17027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
706baae9ec Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 14:58:33 +01:00
soupette
fb1845bb1c Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 14:44:01 +01:00
Alexandre Bodin
469991f9f2 Merge branch 'master' into features/i18n 2021-02-18 14:36:32 +01:00
Marvin Frachet
34f6c8feb8
Update PULL_REQUEST_TEMPLATE.md (#9444) 
This PRs add another step in the PR template called "How to test it?" aiming to provide as much information as possible to verify the behaviour / fix introduced by a PR
 2021-02-18 14:29:26 +01:00
cyril lopez
894e3d6142
Merge pull request #9386 from strapi/i18n/rbac-form 
[I18n] RBAC refactoring form interactions
 2021-02-18 14:19:24 +01:00
soupette
63fa27e032 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 13:48:14 +01:00
cyril lopez
f1f245448f
Merge pull request #9420 from strapi/i18n/rbac-conditions 
[I18n] RBAC conditions
 2021-02-18 13:39:38 +01:00
soupette
2077c89030 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 12:20:48 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 v3.5.0 2021-02-18 11:28:28 +01:00
Alexandre BODIN
adf05599a5
Fix sanitize polumorphic entites that can be undefiend or ids only (#9441) 2021-02-18 11:20:32 +01:00
soupette
268247d41a Add conditions button state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 11:19:59 +01:00
Rémi de Juvigny
f5823c1ce5
Add install instructions to strapi-plugin-sentry docs (#9440) 2021-02-18 10:43:36 +01:00
Alexandre BODIN
9160c46a80
Merge pull request #9430 from strapi/i18n/lifecycles-rework 
Add Lifecycles for i18n
 2021-02-18 09:23:07 +01:00
cyril lopez
8d7006840b
Merge pull request #9422 from acalvino4/issues-8914-allow-multiple-image-insertion-wysiwyg 
fix #8914 allow multiple images to be inserted into wysiwyg
 2021-02-18 08:46:23 +01:00
cyril lopez
e21f06d4b6
Merge branch 'master' into issues-8914-allow-multiple-image-insertion-wysiwyg 2021-02-18 07:54:34 +01:00
Alexandre Bodin
77906863aa fix typos 2021-02-17 18:40:45 +01:00
Alexandre BODIN
7102ebbcef
Merge pull request #9009 from strapi/features/sso 
Features/sso
 2021-02-17 18:29:39 +01:00
cyril lopez
f57cebcaf3
Merge pull request #9433 from strapi/fix/first-admin-logout 
Fix first admin logout bug
 2021-02-17 18:02:16 +01:00
HichamELBSI
04ec62e6c2 Fix first admin logout bug 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-02-17 17:48:59 +01:00
Alexandre Bodin
e7189d2578 Fix typos & remove unecessary parameter 2021-02-17 17:21:32 +01:00
Alexandre Bodin
c1da5a5685 Add lifecyle manager tests 2021-02-17 15:51:47 +01:00
Alexandre Bodin
9020fc4e91 Add lifecycles to manage locale & localizations fields 2021-02-17 13:00:49 +01:00
HichamELBSI
2f974c739b Merge branch 'master' into features/sso 2021-02-17 12:28:30 +01:00
dependabot[bot]
b8c2cf5338
Bump @swc-node/jest from 1.0.3 to 1.1.0 (#9428) 
Bumps [@swc-node/jest](https://github.com/Brooooooklyn/node-swc) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/Brooooooklyn/node-swc/releases)
- [Commits](https://github.com/Brooooooklyn/node-swc/compare/@swc-node/jest@1.0.3...@swc-node/jest@1.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-17 11:52:03 +01:00
HichamELBSI
1a42da3007 Merge branch 'master' into features/sso 2021-02-17 11:43:34 +01:00
cyril lopez
890c3bbf2c
Update packages/strapi-admin/admin/src/translations/en.json 
Co-authored-by: Samuel Pirès <samuel.pires@strapi.io>
 2021-02-17 10:16:14 +01:00
Alexandre BODIN
a7a1d5e2d5
Merge branch 'master' into issues-8914-allow-multiple-image-insertion-wysiwyg 2021-02-17 09:42:15 +01:00
soupette
417f3f8f8e Add more tests to reducer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-17 09:28:19 +01:00
Rémi de Juvigny
db0f437272
Add init option to strapi-plugin-sentry (#9423) 2021-02-17 09:15:32 +01:00
dependabot[bot]
8359368477
Bump @babel/runtime from 7.12.5 to 7.12.13 (#9427) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.12.5 to 7.12.13.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.13/packages/babel-runtime)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-17 09:14:04 +01:00
cyril lopez
a2d922daae
Merge pull request #9418 from strapi/fix/api-params 
[i18n] fixing add locale params
 2021-02-17 08:10:13 +01:00
soupette
9e33fbcee7 Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-16 20:01:50 +01:00
Augustine Calvino
a56697fea1
Merge branch 'master' into issues-8914-allow-multiple-image-insertion-wysiwyg 2021-02-16 11:29:35 -07:00
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