yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-20 05:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,134 Commits 123 Branches 496 Tags
Commit Graph

14134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
41c8db9994 Fix dot position 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 15:23:08 +02:00
soupette
b328025661 Fix snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 15:01:12 +02:00
soupette
4dba7a65d3 Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 14:53:48 +02:00
Alexandre Bodin
085f2574ea Merge branch 'feature/rbac-licensed' of github.com:strapi/strapi-private into feature/rbac-licensed 2020-07-08 13:54:04 +02:00
Alexandre Bodin
109e41ea1f Fix e2e tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 13:53:56 +02:00
cyril lopez
db4f0cf8b7
Merge pull request #104 from strapi/chore/fix-rebase 
Chore/fix rebase
 2020-07-08 12:50:12 +02:00
cyril lopez
286305f688
Merge pull request #105 from strapi/rbac/post-rebase 
Fix rebase errors front
 2020-07-08 12:49:57 +02:00
HichamELBSI
91b42edb25 Fix rebase errors front 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 12:48:46 +02:00
Alexandre Bodin
634b80c96c Fix unit test back 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 12:29:45 +02:00
soupette
783356647c Fix conflict helper => hasPermissions.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 12:00:43 +02:00
soupette
d692a61db3 Fix AuthPage conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:56:22 +02:00
Convly
6d2c50ca05 Log strapi edition type to the console on startup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:48 +02:00
Alexandre Bodin
294760493e Feedback 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:48 +02:00
Alexandre Bodin
73ad654951 Add hashes 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:48 +02:00
Alexandre Bodin
a7d8889a6a Add telemtry 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:48 +02:00
Alexandre Bodin
2ff0bfe75e update key name 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:48 +02:00
Alexandre Bodin
76544f5d0b fix expire_at 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:48 +02:00
Alexandre Bodin
11fd34ab53 Cleanup 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:47 +02:00
Alexandre Bodin
5b4b95dc49 Add check 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:47 +02:00
HichamELBSI
f424bdfeb3 Fix conditions bullet behavior & UI issues 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 11:48:47 +02:00
Alexandre Bodin
aaa4192010 Fix default ML permissions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:47 +02:00
Alexandre Bodin
ba5f12778a fix clean permission 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:47 +02:00
soupette
61540b658a Fix filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:46 +02:00
HichamELBSI
8074c5e8d7 Fox some UI bugs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 11:48:46 +02:00
soupette
722282004d Fix delete forbidden in CM 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:46 +02:00
soupette
9e1ac1bdc9 Fix error message in CM when deleting an entry 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:46 +02:00
soupette
aaab4c17f5 Fix WYSIWYG and JSON inputs disabled state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:46 +02:00
soupette
4e71345ee6 Fix check API call 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:45 +02:00
Alexandre Bodin
9ec4c9ec8b Exclude creator in fields perm 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:45 +02:00
Alexandre Bodin
5c6851e6ba Update naming of permissions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:45 +02:00
Convly
31d748f52e Add private to User.settings::blocked 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:45 +02:00
Convly
c9ebae4c9f Fix authorization issues due to null subject registration 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:45 +02:00
Convly
0cf76721e9 Add missing subject on upload permissions 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:45 +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
Convly
a300e356c7 Removes the plugins::users-permissions.user subject from editor & author's content-manager permissions 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:44 +02:00
Convly
91bd4281c3 Fix permissions-manager query generation 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:44 +02:00
Convly
9cce0145c5 Fix elemMatch op bug (typo) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:44 +02:00
Alexandre Bodin
1c90614f8b Fix sanitizeEntity 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:44 +02:00
Convly
3953e5068b Add descriptive comment for hasPermissions transformers 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:43 +02:00
Convly
647b5a2b6e Remove useless check 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:43 +02:00
Convly
0e61698ef5 Fix upload w/ permissions bugs 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:43 +02:00
Alexandre Bodin
097c7f4477 Add sanitize 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:43 +02:00
Alexandre Bodin
8109af101c Handle specific find case of ST 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:43 +02:00
Alexandre Bodin
cdc9bc2167 Allow multiple args in policies 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:43 +02:00
Alexandre Bodin
1b460c76ff Fix find relation list for compo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:42 +02:00
Alexandre Bodin
3ff5f645c8 Add single type usecase and fix delete 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:42 +02:00
Alexandre Bodin
44a7e2321d Update findOne 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:42 +02:00
Convly
5f01d9ebe1 Add permissions on upload controller 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:42 +02:00
Alexandre Bodin
c31c86c8e5 Allow compo option 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:42 +02:00