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
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
umutbozdag
1d5e3947f0
#6954 Possible mistake about database file name in the docs (version … (#6957) 
* #6954 Possible mistake about database file name in the docs (version 3.x)

* Update docs/v3.x/guides/databases.md

Co-authored-by: Mattias van den Belt <mattiasvandenbelt@gmail.com>

Co-authored-by: Mattias van den Belt <mattiasvandenbelt@gmail.com>
 2020-07-16 11:23:13 +02:00
Sebastian Kondraciuk
235e330f65
fix a minor typo (#6937) 
Signed-off-by: Naylepsh <naylepsh@gmail.com>
 2020-07-16 11:22:16 +02:00
Nick Hayden
a43b14e250
FIX - Update regex error value for English translation (#6976) 
Co-authored-by: Nick Hayden <nick@192-168-1-101.tpgi.com.au>
 2020-07-16 11:18:48 +02:00
Nazır Doğan
3fbf9902d5
Update parameters.md (#6987) 2020-07-16 11:13:36 +02:00
sgauthiertremblay
a86a8d54d4
Update email.md (#6997) 2020-07-16 11:12:56 +02:00
Riley Shea
823bb6fdb1
typo fix for below text link (#7001) 2020-07-16 11:12:06 +02:00
Diego Albitres
1f55ec89e9
docs: fix 404 link on services.md (#7019) 
Signed-off-by: Diego Albitres <diego.albitres@gmail.com>
 2020-07-16 11:10:56 +02:00
Ryan Pitts
fccb396c04
typo in is-ownder.md (#7006) 
fix grammatical error in delete action tip
 2020-07-16 11:10:04 +02:00
Riley Shea
ae73fdbebe
Update Purest docs link (#7028) 
Strapi uses purest 3.1 but docs were linking to an old 2.x branch of purest.
 2020-07-16 11:08:59 +02:00
Aurélien GEORGET
baa034e1c0
Add noRun property in global scope (#7030) 
Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>
 2020-07-16 11:07:39 +02:00
Shahein Moussavi
580102f0a5
Make Strapi GraphQL an implementing service for Federation (#6146) 
* Add Strapi GraphQL to Apollo Federation as implementation

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* updated graphql plugin documentation for federation

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* Creating separate package while waiting for Strapi PR acceptance

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* v3.1.0-beta.0

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* Accidentally pushed bad changes

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* used lodash for config variable for consistency, updated comment to be more descriptive

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>
 2020-07-16 09:09:59 +02:00
Peter Baričič
36ab6144cb
Add ENV to allow hiding startup message (#6348) 
* Add ENV to allow hiding startup message

Signed-off-by: Peter Baričič <pbaricic@gmail.com>

* Rename ENV

Signed-off-by: Peter Baričič <peter.baricic@naytrolabs.com>

* Revert the logic

Signed-off-by: Peter Baričič <pbaricic@gmail.com>

* Update docs with startup ENVs

Signed-off-by: Peter Baričič <pbaricic@gmail.com>

Co-authored-by: Peter Baričič <peter.baricic@naytrolabs.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-16 09:01:08 +02:00
gp27
eb272e996c
- fix in graphql type builder (#6075) 
a required attribute that has a default value it's now not required in the input schema used for entities creation

Signed-off-by: Gadi Piperno Corcos <gadi@skyriseltd.com>

Co-authored-by: Gadi Piperno Corcos <gadi@skyriseltd.com>
 2020-07-16 08:45:44 +02:00
Vincent Dörig
c587bda522
Fix wrong flag for Swedish (#6926) 
* Fix wrong flag for Swedish language

Signed-off-by: Vincent Dörig <dvincdt@gmail.com>

* Add test case

Signed-off-by: Vincent Dörig <dvincdt@gmail.com>
 2020-07-15 18:33:07 +02:00
soupette
b3ec0c37e2 Clean files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 18:27:51 +02:00
Nusrath Khan
f496970cbf
fix: remove misleading documentation (#6927) 
removes misleading documentation around which fields on the USER model can be used in the email templates
 2020-07-15 18:04:57 +02:00
soupette
2ee8207149 Fixes #6051 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 17:53:52 +02:00
soupette
cd55915642 Rename file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 14:53:28 +02:00
soupette
ce10f61d63 Fix util 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 14:47:33 +02:00
soupette
c57108fe22 Remove old trads in strapi-admin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 12:33:03 +02:00
soupette
58bd1deb04 Remove old trads in admin/en.json 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 12:32:16 +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
soupette
90407f6b0d Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 11:42:35 +02:00
soupette
3f4f555528 Clean code 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 11:34:55 +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
Alexandre BODIN
c052268be1
Merge pull request #7008 from MattieBelt/fix/reset-password-permission 
Fix all lowercase action name
 2020-07-15 09:45:04 +02:00
MattieBelt
39284d196b Fix all lowercase action name 
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-07-14 12:40:06 +02:00