yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-01 12:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 113 Branches 491 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Noël
182ec648d5 add loading of ee files + add create role 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:56:55 +02:00
soupette
971533ddfd Fix webpack resolve 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:56:53 +02:00
HichamELBSI
3bca1efce7 Init permission tabs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 10:56:53 +02:00
Alexandre Bodin
5269db9894 fix bug on merge 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:56:50 +02:00
soupette
8dc68f2016 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:56:19 +02:00
HichamELBSI
240d3fb613 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 10:55:41 +02:00
HichamELBSI
e5c34ef939 Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 10:55:12 +02:00
HichamELBSI
d0f651755c Add new role 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 10:55:06 +02:00
soupette
e4b9c80b08 Change ee folder directory 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:54:21 +02:00
soupette
188448ed96 Update snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:54:19 +02:00
soupette
b04821369e Update lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:54:17 +02:00
soupette
590a598035 Fix tests setup 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:54:12 +02:00
soupette
6945c6e12d Split EE and CE 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:53:33 +02:00
soupette
a8ace25056 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:53:31 +02:00
soupette
9ad7736148 Add register-admin page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:53:29 +02:00
soupette
666678326f Add init call 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:53:27 +02:00
HichamELBSI
ce79755435 Remove permissions/init call from the admin 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 10:53:25 +02:00
Alexandre Bodin
35d87bfdcd Cleanup 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:53:23 +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
Convly
34de63766f Restore link.js 2020-07-08 10:51:54 +02:00
Convly
9d9da4f467 add admin::permission model and setup its relation w/ the role model 2020-07-08 10:51:52 +02:00
soupette
d491e033a1 Improve codebase 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:51:50 +02:00
Pierre Noël
4f4898af74 refacto routes 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:51:48 +02:00
Pierre Noël
abcaa7f831 add PUT /admin/roles/:id 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:51:46 +02:00
Pierre Noël
89f408c67e add unit test 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:51:44 +02:00
Pierre Noël
dd3bc76948 add GET /admin/roles 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:51:43 +02:00
soupette
4a833811c7 Fix form 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:51:41 +02:00
soupette
fa99e43b9c Add submit logic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:51:39 +02:00
soupette
626f731270 Fix padding bottom 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:51:37 +02:00
soupette
da9586fe42 Add magic link to edit user view 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:51:35 +02:00
soupette
79a04eb38b Remove temp utility 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:51:33 +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
851ba201ac Add /users/me routes 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:51:01 +02:00
Alexandre Bodin
cf4c70b01e Init routes 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:50:59 +02:00
soupette
5d5be40020 Upgrade buffet 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:50:57 +02:00
soupette
89ada4c467 Fix login 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:50:55 +02:00
Pierre Noël
d20617b8b8 add test for service find 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:50:53 +02:00
Pierre Noël
407949a70a use findAll instead of find 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:50:51 +02:00
Pierre Noël
f9df191157 fix bad doc 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:50:49 +02:00
Pierre Noël
5a4e6c0cf5 add GET /admin/roles 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:50:48 +02:00
Convly
651d42dbea fix PR comments, move pagination logic to the database layer, handle searches 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:50:44 +02:00
Convly
08d121cd2d Remove useless parseInt from findPageQueryFactory.js 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:49:28 +02:00
Convly
c9b02b2e25 Fix response object shape for get /admin/users 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:49:26 +02:00
Convly
60b24dd3c3 Add GET /admin/users route and new pagination system 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:49:22 +02:00
Pierre Noël
81640de2e7 add base for e2e tests 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:46:19 +02:00
Pierre Noël
eec2937d9c add doc comments 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:46:17 +02:00
Pierre Noël
60118d24c1 add Promise.resolve to a mock function 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:46:15 +02:00
Pierre Noël
37924553ea add test + services.role.create 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:46:13 +02:00
Pierre Noël
1c65d3c10a add GET /roles/:id 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:46:11 +02:00
HichamELBSI
d1bd6a0ef1 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 10:46:09 +02:00