yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,425 Commits 129 Branches 498 Tags
Commit Graph

1757 Commits

Author SHA1 Message Date
Alexandre BODIN
77be3ea4c5
Merge pull request #7467 from strapi/users-permissions/create-new-role 
Users and Permissions in Settings menu
 2020-08-31 15:33:02 +02:00
soupette
16261bb156 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-31 14:17:30 +02:00
soupette
1c4fafeeee Change users plugin settings menu section label 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 16:17:27 +02:00
soupette
b02c8b2c72 Fix small bugs. 
co-authored elabbassih@gmail.com

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 14:52:55 +02:00
soupette
3c7ea06f2a Fix permissions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 11:38:27 +02:00
soupette
bcd9075229 Remove useless files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 09:43:48 +02:00
soupette
658ae9676f Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 09:39:28 +02:00
soupette
98a4401a09 Fix modal delete behaviour 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 18:09:26 +02:00
soupette
b328a3a38a Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 17:23:45 +02:00
soupette
2e67e19bd6 Fix bugs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 15:57:35 +02:00
soupette
5a7d89c807 Refacto create page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 15:00:10 +02:00
soupette
a8ea727e63 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 16:01:27 +02:00
soupette
82ae1fc6c1 Fixes #7584. 
Update the documentation override

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 14:55:09 +02:00
soupette
fb6010369a Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 10:38:54 +02:00
HichamELBSI
4e4a77ff0f Add new role 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-17 17:40:44 +02:00
dependabot[bot]
888036ddbe
Bump react from 16.13.0 to 16.13.1 
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.13.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-13 17:22:49 +00:00
Pierre Noël
fb2db4b050 v3.1.4 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-13 19:05:20 +02:00
Pierre Noël
231263a353 v3.1.4 2020-08-13 18:58:14 +02:00
soupette
001cc0f865 Fix trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 10:00:31 +02:00
soupette
faf5ddfebc Fix subscriptions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 09:56:06 +02:00
soupette
1e9f816b0b Add events 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 09:48:28 +02:00
soupette
e688910128 Refacto code 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 09:28:29 +02:00
soupette
d1c7f8873c PUT providers 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 08:32:40 +02:00
soupette
fb77ac3702 Init provider form 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-06 18:40:22 +02:00
soupette
17f8ab3296 Edit template 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-06 16:41:10 +02:00
soupette
f781790d67 Fix lint and Add modal edit templates 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-06 13:29:00 +02:00
soupette
2deea0748c Send advanced settings data 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-05 15:21:25 +02:00
soupette
d41f02bb54 Merge branch 'features/users-permissions' of github.com:strapi/strapi into front/list-views 2020-08-05 14:49:19 +02:00
soupette
99728005d1 Clean unneeded files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 18:13:22 +02:00
soupette
25cfefc894 Add form logic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 18:10:35 +02:00
soupette
23e2c3d171 Fix loading states 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 17:48:23 +02:00
soupette
63f4859e31 Init advanced settings page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 17:45:45 +02:00
HichamELBSI
c21ca119e4 Add Roles list 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-04 17:05:58 +02:00
soupette
5f834d2288 Created Email templates list 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 16:38:04 +02:00
soupette
1602886deb Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 16:27:07 +02:00
soupette
a1592c9626 Created providers list view 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 15:59:19 +02:00
soupette
8575995080 Add page title to settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 14:33:43 +02:00
HichamELBSI
cb0f33c756 Update permissions 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-04 13:19:48 +02:00
Pierre Noël
b5959705b2 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:29 +02:00
Pierre Noël
05cc400905 update grant + doc twitter 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
Pierre Noël
75cb374f89 Update the provider loggin doc + display absolute redirect uri in front 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
HichamELBSI
43ee492fcb Init Users & Permissions settings section 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-03 17:11:58 +02:00
Alexandre Bodin
97922f99ae v3.1.3 2020-07-31 09:59:56 +02:00
Akash P
27ee50d1e5
Fix #7252: fix relation name 
fix regression issue due to pull #7204

Signed-off-by: Akash P <aksdevac@gmail.com>
 2020-07-31 12:59:46 +05:30
Alexandre Bodin
6aaa018ff5 v3.1.2 2020-07-29 13:34:01 +02:00
Alexandre Bodin
ac62bac98e Upgrade lodash 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:05:50 +02:00
dependabot[bot]
aea96bca68
Bump lodash from 4.17.15 to 4.17.19 (#7239) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 11:10:32 +02:00
Alexandre Bodin
da338f92c4 Merge branch 'documentation' 2020-07-28 10:50:10 +02:00
Jim LAURIE
4c4a4c1dd3
Docs review (#6848) 
* docs: improve getting started

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* docs: review quickstart video and some steps

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* docs: review concepts

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* docs: review email - upload plugins

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* fix: PR feedback

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* fix: PR feedback type conflict

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-07-28 10:48:55 +02:00
Juan David Landazabal
55f576bd1d
Fix/#7197/Change custom populate state to own service (#7204) 
* Fix/#7197/Change custom populate state to own service

To avoid issue with population we change the service of state user to there own service call "fetchState", also to keep a separate customization

Signed-off-by: Juan David <juand.business@gmail.com>

* specific service for fetch  authenticated user

Signed-off-by: Juan David <juand.business@gmail.com>

* Update comment

Signed-off-by: Juan David <juand.business@gmail.com>

* Add some comments

Signed-off-by: Juan David <juand.business@gmail.com>
 2020-07-28 09:18:18 +02:00