yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 11:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,131 Commits 121 Branches 507 Tags
Commit Graph

1563 Commits

Author SHA1 Message Date
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
JuanCarlosJr97
e81c6ba567
Updating api.js deleting console.log (#7185) 
Signed-off-by: Juan Carlos Blanco Delgado <juancarlosjr97@gmail.com>
 2020-07-27 11:05:45 +02:00
Igor Tatarintsev
bb6365213b
Bump VK provider version (#6594) 
Signed-off-by: Igor Tatarintsev <ietatarin@gmail.com>
 2020-07-24 11:10:09 +02:00
Alexandre Bodin
35bae7df57 v3.1.1 2020-07-23 18:53:55 +02:00
Pierre Noël
7465b74d25 fix typo + remove comment 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-23 11:09:41 +02:00
Pierre Noël
4dc853a6e1 update doc + add localhost in confirmation links if url is not set 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-23 11:09:21 +02:00
Alexandre Bodin
1bbf1bc0dc v3.1.0 2020-07-21 19:30:45 +02:00
Alexandre Bodin
62b2192c95 Update license info 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 18:40:52 +02:00
Alexandre Bodin
6bafa35a36 Merge branch 'releases/3.1.0' into features/rbac 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-18 10:12:40 +02:00
Alexandre Bodin
4d31935716 v3.0.6 2020-07-16 17:03:04 +02:00
Alexandre Bodin
b71ffa6c6c Merge branch 'master' into features/rbac 2020-07-16 14:52:55 +02:00
Pierre Noël
066221f5b8 init migration guide to 3.1.x 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:58:14 +02:00
soupette
80c7d385d5 Reorder translation files by key value and add script to remove the unneeded keys 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 12:05:25 +02:00
Diogo Correia
ba6753f21a
Make jwt not required for register mutation (#6716) 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-07-15 09:54:27 +02:00
MattieBelt
39284d196b Fix all lowercase action name 
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-07-14 12:40:06 +02:00
Convly
e63306b559 Rewrote users-permissions's controller to fit with rbac, fix various bugs in content-manager's controllers 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:44 +02:00
Convly
8797d25501 Add hasPermissions policy to concerned routes 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:44 +02:00
soupette
044c47e732 Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:07:27 +02:00
soupette
7c8140491d Add permissions to edit page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:07:25 +02:00
soupette
51722ca3a1 Add permissions to homepage 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:07:23 +02:00
Convly
ef94229d81 Add Condition Provider & Permissions Engine 2020-07-08 11:05:49 +02:00
soupette
6a298fc991 Rename permissions components 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:10 +02:00
Pierre Noël
7e1a91dda6 add use strict 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:08 +02:00
Pierre Noël
e078c0b022 rename permissions to actions, inverted params of provider.get, separated formatter, add possibility to not specigy pluginName for ::application 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:07 +02:00
Pierre Noël
707746ef45 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
Pierre Noël
ae0dcb9745 add route GET /admin/permissions 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
soupette
50c16dee16 Move plugins trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:05 +02:00
soupette
3c8c15efca Add permissions check to plugins main components except the ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:04 +02:00
soupette
7f4bb2a5bc Update plugin object 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:04:27 +02:00
soupette
b68245b8b1 Add permissions to plugins links in the menu only 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:04:25 +02:00
Alexandre Bodin
7a056c2f45 Add admin registeration API 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:53:19 +02:00
Alexandre Bodin
252bb3afe3 Remove email update of admin during test that break next tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:51:03 +02:00
Alexandre Bodin
a4f294f1c4 Use passport standard error handling 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:38 +02:00
Convly
364de7d2e8 Update admin::administrator queries to match its new name 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:18 +02:00
soupette
62a79a5fc0 Created basic routing for the settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:45:28 +02:00
Juan David Landazabal
f4959d9560
Allow custom populate in ctx.state.user (#6770) 
* Allow custom populate in user model

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

* use merge from lodash to join a custom populate

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

* refactor fech
 2020-07-06 09:43:30 +02:00
richardgrey
47197419e1 Add Ukrainian translations for the whole project 
Signed-off-by: richardgrey <richie.grey@gmail.com>
 2020-06-30 17:23:01 +04:00
Alexandre Bodin
eaf40e1ada v3.0.5 2020-06-23 12:18:00 +02:00
soupette
6dffb1a8d2 Fixes #6775 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-06-23 12:09:23 +02:00
Alexandre Bodin
9ed11a6682 v3.0.4 2020-06-19 09:19:52 +02:00
soupette
08ad19babe Fixes #6733 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-06-19 08:29:53 +02:00
Alexandre Bodin
c909d7162d v3.0.3 2020-06-18 19:17:15 +02:00
Christos Malliaridis
d77ab73d75 Remove unnecessary import of useState 
Signed-off-by: Christos Malliaridis <c.malliaridis@gmail.com>
 2020-06-17 11:09:18 +02:00
Christos Malliaridis
00b1c7571a
Merge branch 'master' into fix/input-checkbox-behavior 2020-06-17 10:53:33 +02:00
Jim LAURIE
4582c55bc3
fix: init reset password permission close #6440 (#6696) 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-06-16 11:51:27 +02:00