yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 16:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 115 Branches 488 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
60b571d2fa
Merge pull request #6967 from strapi/rbac/fix-permissions-issues 
Fix some light issues in permissions-manager & engine
 2020-07-10 12:01:45 +02:00
Convly
59526ff0d6 Fix some light issues in permissions-manager & engine 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-10 11:18:12 +02:00
soupette
e46b56e460 Clean models 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-10 10:38:52 +02:00
Alexandre Bodin
8d92bf8a0a Add min validator 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-09 18:10:16 +02:00
Kim, Harim
f3e078caf6
Add logic to change file name to migration script, add additional description of file name (#6793) 
Signed-off-by: harimkims <harimkims@gmail.com>
 2020-07-09 16:32:05 +02:00
Akhil Mohan
b8271dd403
Fix broken link install plugin popup (#6698) 
* fixed broken link

New link for documentation that pops up as overlay in Strapi. (plugin install blocker)

* updated the requested change for fix broken link
 2020-07-09 16:30:25 +02:00
ELABBASSI Hicham
c680392a81
Merge pull request #111 from strapi/fix/ui-bugs 
Fix CE roles edition
 2020-07-09 14:29:41 +02:00
soupette
251646ea19 Add delete action 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-09 14:16:17 +02:00
soupette
8ec5a17806 Fix CE roles edition 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-09 12:16:01 +02:00
Alexandre Bodin
e0dde4cd0f Add license.txt to default gitignore 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 19:57:37 +02:00
ELABBASSI Hicham
970c0446a6
Merge pull request #110 from strapi/fix/copy 
Copy ee folder only for admin
 2020-07-08 18:39:08 +02:00
soupette
8ccc6aeda5 Copy ee folder only for admin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 18:36:43 +02:00
cyril lopez
dca59f268a
Merge pull request #109 from strapi/rbac-licensed/move-front-ee 
Move front EE folder
 2020-07-08 18:23:19 +02:00
HichamELBSI
7c52b2d715 Move front EE folder 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 18:16:55 +02:00
cyril lopez
7a688494fe
Merge pull request #108 from strapi/fix/cm-trads-refresh 
Fix trads refresh
 2020-07-08 18:11:52 +02:00
Alexandre Bodin
5a7ccdb375 Fix license txt 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 18:03:59 +02:00
soupette
b62cb702d1 Fix trads refresh 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 17:29:35 +02:00
Alexandre Bodin
cfb5631fe0 Remove empty root ee folder 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 17:28:55 +02:00
Alexandre BODIN
f2d449a965
Merge pull request #107 from strapi/chore/disallow-disabling-last-super-admin 
Chore/disallow disabling last super admin
 2020-07-08 17:20:06 +02:00
Alexandre Bodin
9ec714fb2f Disallow disabling last super admin 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 16:43:20 +02:00
Alexandre Bodin
eb181bb9b2 Merge branch 'feature/rbac-licensed' of github.com:strapi/strapi-private into feature/rbac-licensed 2020-07-08 16:07:15 +02:00
Alexandre Bodin
38d67fc873 Fix mongo issues 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 16:07:11 +02:00
cyril lopez
764fb863dc
Merge pull request #106 from strapi/chore/upgrade-buffetjs 
Chore/upgrade buffetjs
 2020-07-08 15:23:47 +02:00
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