yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,435 Commits 138 Branches 514 Tags
Commit Graph

13435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alxnkt
65293fd21c Auto rotate JPEG images 
Signed-off-by: alxnkt <alxnkt@mail.ru>
 2020-07-18 10:07:37 +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
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
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
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
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
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
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
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
cyril lopez
b03cb74832
Merge pull request #6906 from strapi/fix/media-lib-modal-selected 
Fix selected files for the media lib modal
 2020-07-07 15:48:48 +02:00
cyril lopez
afde2f224f
Merge branch 'master' into fix/media-lib-modal-selected 2020-07-06 09:49:27 +02:00
Juan David Landazabal
f4959d9560
Allow custom populate in ctx.state.user (#6770) 
* Allow custom populate in user model

Signed-off-by: Juan David <juand.business@gmail.com>

* use merge from lodash to join a custom populate

Signed-off-by: Juan David <juand.business@gmail.com>

* refactor fech
 2020-07-06 09:43:30 +02:00
atlmtw
66637e0101
Update mount-models.js (#6916) 
This is to ensure custom mongoose queries that exclude dynamic zone fields don't fail.

Referring to this issue:
https://github.com/strapi/strapi/issues/6016
 2020-07-06 09:35:55 +02:00
HichamELBSI
2495d94da5 Fix selected files for the media lib modal 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-03 18:34:45 +02:00
Alexandre BODIN
fd3c7699b5
Merge pull request #6223 from richardgrey/locale_uk 
Add Ukrainian translations for the whole project
 2020-07-02 18:41:35 +02:00
Richard Grey
a014368467
Merge branch 'master' into locale_uk 2020-07-02 20:15:15 +04:00
Alexandre BODIN
8edb6cd8c6
Merge pull request #6865 from strapi/feature/addFiltersToSearch 
add filtering to search route
 2020-07-01 12:37:31 +02:00
Pierre Noël
10092f5a57 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-01 11:59:33 +02:00
Pierre Noël
25bfb7204f fix search for numbers for mongoDB < 4.2.0 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-06-30 16:51:31 +02:00
Pierre Noël
950a21469f add filtering to search route 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-06-30 15:50:52 +02:00
richardgrey
47197419e1 Add Ukrainian translations for the whole project 
Signed-off-by: richardgrey <richie.grey@gmail.com>
 2020-06-30 17:23:01 +04:00
Adam
67e2104ba5
fix(email): malformed json 2020-06-29 13:04:26 -04:00
Alexandre BODIN
535fa25311
Merge pull request #6778 from strapi/fix/deployDoc 
update doc + remove broken button in index.html
 2020-06-29 11:14:07 +02:00
Pierre Noël
ef8f918937 update doc + remove broken button in index.html 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-06-29 09:44:06 +02:00
Alexandre BODIN
d707794cde
Merge pull request #6802 from strapi/docs-fix-404 
Fix 404 link in the DO deployment guide
 2020-06-26 09:52:04 +02:00
Andrey Hohutkin
94e031eba5
Fixes for Media Library upload (#5971) 
* Fix formatFileInfo

Keep original file name including extension

* Fix file name for generated media

File name was not set for all generated media: thumbnail and resized pictures.

* Generate hash based on file name without extension

* cleanup PR

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Fix unit tests
Exclude temporarily unit test 'Replaces reserved and unsafe characters for URLs and files in hash' because it did not work properly ever.

* Remove path delimiter from filename because it is correct character for file path

* Fix e2e

* Continue fixes for e2e

* Fix createRequest content type

* Correct thumbnail name in e2e test

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
Co-authored-by: Andrey Hohutkin <none@none>
 2020-06-25 10:13:42 +02:00
Jim LAURIE
8fe827c484 docs: fix 404 link DO 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-06-25 08:22:29 +02:00
Jim LAURIE
cfa8719eac
Merge pull request #6724 from strapi/fix-docs-links 
Fix docs links 404
 2020-06-25 08:17:51 +02:00
Aurélien GEORGET
aad7f486d2
Support STRAPI_UUID_PREFIX env var (#6797) 
Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>
 2020-06-24 18:27:49 +02:00