yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-03 05:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 115 Branches 491 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joris W
3ced95b611
Update models.md 2020-07-07 10:41:30 +02:00
Joris W
77cf549c07
Update models.md 2020-07-07 10:40:33 +02:00
Joris W
2d0ebc99c4
Update models.md 
Clarified intro paragraph to better describe what Dynamic Zones do
 2020-07-07 10:38:04 +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
Scott Agirs
fef24faf63
[typofix] Client ID > Client Secret (#6786) 
* [typofix] Client ID > Client Secret

Signed-off-by: ScottAgirs <scott@ijs.to>

* [revert] avoid arrowParens

Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-06-24 17:38:35 +02:00
Aurélien GEORGET
245d54c08c
Stringify boolean to detect Yarn or npm (#6795) 
Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>
 2020-06-24 16:12:34 +02:00
Sudhir Shrestha
0a38ec7bf0
Fix cloudinary upload error message (#6525) 
Signed-off-by: Sudhir Shrestha <sudhirshrestha@live.com>
 2020-06-24 10:26:02 +02:00
Alexandre BODIN
a79e90004c
Merge pull request #6753 from tudorilisoi/scoped_providers 
scoped packages doc
 2020-06-24 10:22:30 +02:00
Alexandre BODIN
b2aa657964
Merge pull request #6764 from strapi/fix/imagesMissing 
fix missing images on index.html
 2020-06-24 09:58:32 +02:00
Alexandre BODIN
32405899b4
Merge pull request #6781 from strapi/docs-fix-6776 
Fix links wrong documentation version
 2020-06-24 09:39:53 +02:00
Jim LAURIE
52f493a798 docs: fix #6776 link version docs 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-06-23 13:51:48 +02:00
Alexandre Bodin
eaf40e1ada v3.0.5 v3.0.5 2020-06-23 12:18:00 +02:00
Alexandre BODIN
0450629869
Merge pull request #6779 from strapi/chore/fix-6775 
Fixes #6775
 2020-06-23 12:14:28 +02:00
soupette
6dffb1a8d2 Fixes #6775 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-06-23 12:09:23 +02:00
Pierre Noël
1a097abcf5 fix missing images on index.html 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-06-23 10:28:36 +02:00
Tudor Ilisoi
14212d9e79
scoped packages doc 
Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
 2020-06-21 16:56:22 +03:00
Alexandre Bodin
9ed11a6682 v3.0.4 v3.0.4 2020-06-19 09:19:52 +02:00
Alexandre BODIN
c28b7032d1
Merge pull request #6738 from strapi/fix/#6733 
Fixes #6733
 2020-06-19 09:17:39 +02:00
soupette
08ad19babe Fixes #6733 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-06-19 08:29:53 +02:00
Alexandre Bodin
081b893b48 Merge branch 'master' into documentation 2020-06-18 19:19:25 +02:00
Alexandre Bodin
c909d7162d v3.0.3 v3.0.3 2020-06-18 19:17:15 +02:00
Alexandre BODIN
02189454b6
Only pick required fields to register for newsletter updates (#6732) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-06-18 19:16:02 +02:00
alxnkt
f10b4db609
Russian translation for Media Library (#6167) 
* Signoff (Russian translation)

Signed-off-by: alxnkt <alxnkt@mail.ru>

* New line at the end of index.js file

* Minor changes for plurals

Signed-off-by: alxnkt <alxnkt@mail.ru>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-06-18 19:09:30 +02:00
Jian-Chen Chen (jesse)
ac5b4fdf86
createPluginsJs after copyCustomAdmin (#6626) 
Signed-off-by: ddhp <jessechen.jcc@gmail.com>
 2020-06-18 19:07:09 +02:00
Jim LAURIE
6b23cedc46 docs: fix 404 links 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-06-18 12:33:18 +02:00
DMehaffy
d864c2c574
Update upload providers README to reflect stable changes (#6709) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-06-18 09:40:49 +02:00
cyril lopez
976ca66b9f
Merge pull request #6663 from malliaridis/fix/input-checkbox-behavior 
Fixed input checkbox behavior
 2020-06-17 15:00:01 +02:00
Christos Malliaridis
d77ab73d75 Remove unnecessary import of useState 
Signed-off-by: Christos Malliaridis <c.malliaridis@gmail.com>
 2020-06-17 11:09:18 +02:00
Christos Malliaridis
00b1c7571a
Merge branch 'master' into fix/input-checkbox-behavior 2020-06-17 10:53:33 +02:00
ghoshSomoto
6774667c65
Security middlewares csp option added (#6694) 
Added missing explanation on how to set the "Content-Security-Policy"(csp) header value

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-06-16 14:02:06 +02:00
Kim, Harim
465c19d2df
Add info to custom resolvers and add formatError to GraphQL service (#6524) 
* Add info to custom resolvers, add formatError to GraphQL service

Signed-off-by: harimkims <harimkims@gmail.com>

* remove format-error service and use config instead

Signed-off-by: harimkims <harimkims@gmail.com>
 2020-06-16 13:57:05 +02:00
Jim LAURIE
4582c55bc3
fix: init reset password permission close #6440 (#6696) 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-06-16 11:51:27 +02:00