yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 04:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 116 Branches 489 Tags
Commit Graph

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Convly
f10f51f372 Add unique constraint for admin::role::name 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:22 +02:00
Convly
005df139c8 Remove minLength from firstname, lastname & username on admin::User 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:20 +02:00
Convly
364de7d2e8 Update admin::administrator queries to match its new name 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:18 +02:00
Convly
1f3506710d Handle special scenarios where pluginName === 'admin' when retrieving models 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:16 +02:00
Convly
45638dd97b Rename admin::administrator model to admin::user & add strapi_role model 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:14 +02:00
soupette
01192500c6 Created select roles component. Add error logic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:21:12 +02:00
soupette
4057c6622b Add validations and fix focus 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:21:06 +02:00
soupette
0d4746219a Add immer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:47:08 +02:00
soupette
66132f30f1 Use compos from buffet 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:45:41 +02:00
soupette
8015e17b0b Created form layout 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:45:39 +02:00
soupette
3e33790125 Created ModalHeader component in helper and use it in upload plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:45:37 +02:00
soupette
94008d0bb4 Created user list view layout 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:45:35 +02:00
soupette
62a79a5fc0 Created basic routing for the settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:45:28 +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
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