yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 10:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,421 Commits 114 Branches 488 Tags
Commit Graph

13421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
9dd5ecf78d Add renew token and fix design 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:32:30 +02:00
soupette
cc7db47a58 Enable login 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:32:23 +02:00
soupette
306997c36c Fix trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:28:21 +02:00
soupette
b297c0a16e Update trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:26:54 +02:00
soupette
d62b00354b Improve HeaderSearch component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:25:18 +02:00
Alexandre Bodin
e79127152f Fix missing stuff in login pr 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:25:16 +02:00
Alexandre Bodin
8ce56f3517 Fix typos 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:25:11 +02:00
Alexandre Bodin
07f716cee8 Cleanup code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:48 +02:00
Alexandre Bodin
e597bddc59 Add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:47 +02:00
Alexandre Bodin
58b56d3c97 Add uni test 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:45 +02:00
Alexandre Bodin
ddfb306b44 Add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:43 +02:00
Alexandre Bodin
a4f294f1c4 Use passport standard error handling 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:38 +02:00
Alexandre Bodin
298dcac271 Add renew token 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:23:54 +02:00
Alexandre Bodin
ceb11379fc Add passportjs and refactor login 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:23:50 +02:00
soupette
7c305e3e8c Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:23:16 +02:00
soupette
dc50c8c9b9 Fix select alignment 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:23:14 +02:00
soupette
98e41c635c Fix select error style 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:23:12 +02:00
soupette
2577eeedd3 Created MagicLink component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:23:09 +02:00
HichamELBSI
726b8d23ef Upgrade buffet to 3.1.1-next.1 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 10:23:04 +02:00
Alexandre Bodin
919aae2211 Fix unit tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:21:28 +02:00
Convly
87a50a0231 Use directly getModel instead of fetching all the models 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:26 +02:00
Convly
8a69d187d0 Update models attributes & get models from the database manager 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:24 +02:00
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
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
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
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