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,157 Commits 125 Branches 497 Tags
Commit Graph

17157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
0d5140dd7b
Bump hosted-git-info from 3.0.7 to 3.0.8 (#9487) 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 3.0.7 to 3.0.8.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/latest/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v3.0.7...v3.0.8)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-23 10:21:36 +01:00
cyril lopez
ea53e57dca
Merge pull request #9443 from strapi/i18n/rbac 
[I18n] RBAC
 2021-02-22 13:56:48 +01:00
cyril lopez
eb7dc893f2
Merge pull request #9481 from strapi/i18n/rbac-telemetry 
Add telemetry back
 2021-02-22 13:06:51 +01:00
soupette
9626c72268 Add telemetry back 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-22 12:05:21 +01:00
Alexandre BODIN
d5049777ea
Stop populating component when populating relation to avoid infinitie loop but allow any component depth (#9464) 2021-02-22 11:09:36 +01:00
cyril lopez
6ea3093221
Merge pull request #9461 from strapi/i18n/rbac-put-permissions 
[I18n] RBAC PUT permissions
 2021-02-22 10:52:35 +01:00
cyril lopez
d5a1de0bc2
Merge pull request #9460 from strapi/i18n/rbac-post-permissions-to-api 
[I18n] RBAC POST permissions
 2021-02-22 10:42:56 +01:00
soupette
110b6b4b97 Add form interactions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-22 10:41:35 +01:00
cyril lopez
e787973758
Merge pull request #9459 from strapi/i18n/rbac-disable-form 
[I18n] RBAC disable properties interactions
 2021-02-22 10:23:45 +01:00
Bernhard Volz
f3f9bf02de
Update of webpack configuration: fix for issue #9442 in upstream (#9477) 2021-02-22 10:18:11 +01:00
Maxime Castres
b8327cb996
Add demo link on top of the README to be more visible (#9407) 
Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
 2021-02-22 10:13:48 +01:00
Jorrit Schippers
5b1d38d551
Fix repository url in strapi-admin/package.json (#9449) 2021-02-22 09:58:54 +01:00
dependabot[bot]
da551665c4
Bump sift from 13.1.10 to 13.5.0 (#9475) 
Bumps [sift](https://github.com/crcn/sift.js) from 13.1.10 to 13.5.0.
- [Release notes](https://github.com/crcn/sift.js/releases)
- [Changelog](https://github.com/crcn/sift.js/blob/master/changelog.md)
- [Commits](https://github.com/crcn/sift.js/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-22 08:56:43 +01:00
soupette
28a1468439 Add logic to retrieve the initial values for the plugins & settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 17:46:53 +01:00
soupette
d6e70a737d Add logic to set the correct leaf when in edition 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 17:34:52 +01:00
soupette
b256776fbb Format permissions to match api specs, handle POST 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 16:44:15 +01:00
soupette
1896771de6 POST plugins & settings permissions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 14:29:41 +01:00
Brett Willis
6d252b12e1
Tests: Explicit sorting where we test offset and limit (#9388) 
* Explicit sorting where we use offset and limit

* Test array equality ignoring order

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-02-19 13:52:26 +01:00
soupette
731f51199f Disable condition modal for ce 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 11:23:33 +01:00
soupette
9f4a19fe3f Disable content type properties for ce 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 11:07:38 +01:00
soupette
fb28853848 Disable global actions for CE 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 10:57:34 +01:00
soupette
6392317f9b Disable the entire form for super admin role 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 10:44:16 +01:00
cyril lopez
b79ecf6468
Merge pull request #9457 from strapi/i18n/rbac-split-ee-ce 
[i18n] RBAC Move files to ce folder.
 2021-02-19 10:05:51 +01:00
soupette
313ccdbcdd Move files to ce folder. 
Co-authored-by: HichamELBSI elabbassih@gmail.com

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-19 09:57:28 +01:00
Marvin Frachet
28f8182bdf
Splitting the profile page and adding the language toggle (#9421) 2021-02-19 09:30:13 +01:00
soupette
66d6a6bc54 Merge branch 'features/i18n' of github.com:strapi/strapi into i18n/rbac 2021-02-19 09:07:59 +01:00
Marvin Frachet
6291476d31
Fixing page titles (#9446) 2021-02-18 16:54:37 +01:00
soupette
8695853ea0 Fix ctb checkbox input 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 16:04:07 +01:00
Marvin Frachet
3241e27359
[i18n] fix typo on permissions (#9447) 2021-02-18 15:51:44 +01:00
cyril lopez
7ff03c0e3a
Merge pull request #9445 from strapi/features/i18n-front 
[i18n] Front-end
 2021-02-18 15:27:56 +01:00
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