yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 06:22:30 +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
Alexandre BODIN
6baa8dbb98
Merge pull request #7041 from strapi/chore/markdown-it 
Change preview for markdown-it in order to have all md support
 2020-07-20 13:19:48 +02:00
Alexandre BODIN
47de0851bc
Merge pull request #7046 from strapi/fix/ce-allow-role-name-edition 
Allow name edition in CE
 2020-07-20 12:46:48 +02:00
Alexandre Bodin
f4dfe8c1f2 Merge branch 'fix/ce-allow-role-name-edition' of github.com:strapi/strapi into fix/ce-allow-role-name-edition 2020-07-20 11:46:49 +02:00
soupette
9ba69f687c Disable super admin role edition 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 11:46:03 +02:00
Alexandre Bodin
9138034dbc Make admin role not editable at all 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 11:39:26 +02:00
Alexandre BODIN
3085994ec7
Merge pull request #7063 from abdonrd/slugify 
Update slugify dependency
 2020-07-20 11:30:51 +02:00
soupette
138f3bd0e9 Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 10:50:13 +02:00
soupette
27a19dc9ed Fixes #6520 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 10:34:38 +02:00
soupette
71d928414b Disable super admin role edition 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 10:10:13 +02:00
Abdón Rodríguez Davila
51d514b042 Removing carets 
Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>
 2020-07-20 09:46:14 +02:00
Abdón Rodríguez Davila
e34202bae2 Update slugify dependency 
Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>
 2020-07-18 19:32:31 +02:00
Alexandre Bodin
9b7c360f0c update lock file 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-18 10:38:40 +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
alxnkt
26540ca95c Add description 
Signed-off-by: alxnkt <alxnkt@mail.ru>
 2020-07-18 10:07:37 +02:00
alxnkt
65293fd21c Auto rotate JPEG images 
Signed-off-by: alxnkt <alxnkt@mail.ru>
 2020-07-18 10:07:37 +02:00
Alexandre BODIN
3c71278193
Merge pull request #7032 from strapi/rbac/admin-tests 
Add tests for strapi-admin services (rbac)
 2020-07-18 09:57:29 +02:00
Alexandre Bodin
9f9808dfd0 Make sure dot env is loaded by core app config and as first require when used 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-18 09:49:25 +02:00
Joris W
e1a09aba61
Update Dynamic Zone description 2020-07-17 18:10:34 +02:00
soupette
11afd28f35 Allow name edition in CE 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-17 12:37:21 +02:00
Convly
cf56735e29 Make better use of flatMap for hasAtLeastOneRegisteredField condition 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-17 12:01:16 +02:00
Convly
35cccd457f Add tests for strapi-admin/services (especially on /permissions/). Some bug fixes on the permissions-manager 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-17 12:01:16 +02:00
soupette
7b1e75a495 Add tip support 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-17 11:06:21 +02:00
Alexandre BODIN
012d07cd97
Merge pull request #7038 from strapi/rbac/filter-doc 
Add _where parameter OR and AND doc v1
 2020-07-16 19:10:47 +02:00
Alexandre Bodin
e68f8d0e83 Add _where parameter OR and AND doc v1 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-16 18:50:38 +02:00
soupette
4e0ff23878 Change preview for markdown-it in order to have all md support 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-16 17:35:51 +02:00
Alexandre Bodin
cd710d34e0 Merge branch 'master' into documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-16 17:10:06 +02:00
Alexandre Bodin
4d31935716 v3.0.6 v3.0.6 2020-07-16 17:03:04 +02:00
Alexandre BODIN
9567fb43f1
Merge pull request #7036 from strapi/fix/mongooseReservedWords 
add more reserved words to the list
 2020-07-16 16:42:24 +02:00
Pierre Noël
fc69e48009 add more reserved words to the list 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 16:11:54 +02:00
cyril lopez
dd023c388e
Merge pull request #7026 from strapi/chore/fix-wysiwyg-preview 
Chore/fix wysiwyg preview
 2020-07-16 15:37:34 +02:00
soupette
990dc43035 Fix users list design 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-16 15:35:18 +02:00
Akash Patel
e2323aae24
load dotenv lib at start (#6701) 
* load dotenv lib at start
allows setting STRAPI_LOG_PRETTY_PRINT, STRAPI_LOG_LEVEL etc in env file

Signed-off-by: Akash P <aksdevac@gmail.com>

* remove extra if statement

Signed-off-by: Akash P <aksdevac@gmail.com>
 2020-07-16 15:31:53 +02:00
Alexandre Bodin
b71ffa6c6c Merge branch 'master' into features/rbac 2020-07-16 14:52:55 +02:00
Alexandre BODIN
7b070eea80
Merge pull request #7023 from strapi/rbac/deleteManyUsers 
add batch delete for users
 2020-07-16 14:43:45 +02:00
Alexandre BODIN
d62de6e60c
Merge pull request #6968 from strapi/rbac/documentation 
init migration guide to 3.1.x
 2020-07-16 14:22:02 +02:00
Emmanuel Mahuni
9a6de2a562
Update migration-guide-beta.20-to-3.0.0.md (#6750) 
I did everything but noticed that the documentation isn't clear about hooks. I literally moved contents of the hook.json file to a new file hook.js without the settings key and nothing worked until I moved into settings key as specified in the hooks section.
 2020-07-16 14:02:50 +02:00
soupette
529833cd20 Merge branch 'features/rbac' of github.com:strapi/strapi into chore/fix-wysiwyg-preview 2020-07-16 13:56:41 +02:00
Pierre Noël
2108c0c342 better explain how to generate jwt token 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:58:15 +02:00
Pierre Noël
3c5ae17d09 fix typos + add tip to generate a JWT token 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:58:15 +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
Pierre Noël
b341b2fa7a use batch-delete users instead of deleteOne in front 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:57:55 +02:00
Pierre Noël
57501bad5d count instead of find 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:57:55 +02:00
Pierre Noël
c73aadbed5 add batch delete for users 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:57:54 +02:00
Nikolaj Ivancic
b2d4fbfb12
Update configurations.md (#6731) 2020-07-16 12:48:05 +02:00
Alexandre BODIN
fb4a625f27
Merge pull request #6851 from admosity/patch-1 
fix(email): malformed json
 2020-07-16 12:34:19 +02:00
Alexandre BODIN
615dffda6f
Merge pull request #7022 from strapi/chore/clean-trads 
Clean translations files
 2020-07-16 12:29:36 +02:00
soupette
12170ff800 Change theme 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-16 12:12:56 +02:00
soupette
afae5b8964 Add syntax highlight in preview wysiwyg 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-16 11:54:11 +02:00
soupette
9347083625 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-16 11:31:26 +02:00
Gil Fewster
5145148da1
Fixes: broken link to deployment page (#6934) 
Signed-off-by: Gil Fewster <hello@gilfewster.com>
 2020-07-16 11:24:32 +02:00