yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-28 10:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 117 Branches 491 Tags
Commit Graph

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toms Burgmanis
b55ce1949e Fixed incorrect variable being used for left-hand side menu 
Signed-off-by: Toms Burgmanis <toms.burgmanis@gmail.com>
 2020-02-16 23:02:29 +02:00
Toms Burgmanis
809432255c Fix hardcoded styles 
Fixed LeftMenuLinkContainer/Wrapper.js using hardcoded values, instead of the ones defined in Themes/Sizes.js.

Signed-off-by: Toms Burgmanis <toms.burgmanis@gmail.com>
 2020-02-16 16:49:14 +02:00
Vitalii Tverdokhlib
d4d83fcd56 update ru.json 
sync with last en ( jq -s '.[0] * .[1]' en.json ru.json)

Signed-off-by: vitaliytv <vitaliytv@nitralabs.com>
 2020-02-16 16:31:42 +02:00
okandas
6c0568909b enhancement(Row\Content.js): align plugin icons to the center 
Signed-off-by: okandas <okandasjr@gmail.com>
 2020-02-14 23:07:42 +02:00
Virginie Ky
463d3b1f2c card component with ui 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-14 17:44:54 +01:00
Virginie Ky
eb5c303564 Merge branch 'front/checkbox-description' of github.com:strapi/strapi into front/checkbox-description 2020-02-13 19:03:57 +01:00
Virginie Ky
904f013672 update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 19:03:41 +01:00
virginieky
10ba8df9db
Merge branch 'front/ui-improvements' into front/checkbox-description 2020-02-13 18:21:10 +01:00
Virginie Ky
054afad9e4 align the entire DOM 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 17:20:57 +01:00
Alexandre Bodin
77b1a2944b Add mongoose uid type 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-13 16:46:37 +01:00
virginieky
b56d255b8c
Merge pull request #5228 from strapi/front/font-weight 
Generalize font-weight
 2020-02-13 15:54:54 +01:00
soupette
39c8df3ce8 Init Modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 15:51:13 +01:00
Virginie Ky
453171d842 Merge branch 'front/font-weight' of github.com:strapi/strapi into front/font-weight 2020-02-13 14:27:13 +01:00
Virginie Ky
22e797ad27 update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 14:26:37 +01:00
virginieky
8d36b69507
Merge branch 'front/ui-improvements' into front/font-weight 2020-02-13 13:46:49 +01:00
soupette
598eaeadf2 Fix empty list number of items 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 13:41:47 +01:00
cyril lopez
021f88c88f
Merge pull request #5241 from strapi/front/trash-icon 
Generalize all trash icon
 2020-02-13 13:31:07 +01:00
cyril lopez
f9a788de61
Merge pull request #5236 from strapi/single-types/fix-edition 
Single types/fix edition
 2020-02-13 13:28:58 +01:00
soupette
6ff1ef77e8 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-listview 2020-02-13 13:03:40 +01:00
cyril lopez
eace3275e4
Merge pull request #5218 from strapi/chore/ctm-remove-redux-saga 
Remove saga from the content manager
 2020-02-13 13:02:30 +01:00
soupette
1c247e43ba Remove upload settings link from marketplace and plugins page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 13:01:54 +01:00
soupette
f8dc029949 Fix sticky header 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 12:53:05 +01:00
soupette
6ec753ee65 Design EmptyList 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 12:48:13 +01:00
Edaly Ahmed
67f4712fa7 Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr> 
signing off
 2020-02-13 12:38:55 +01:00
Alexandre Bodin
3b41eb6230 Add uid type to bookshelf column generator and init tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-13 11:36:26 +01:00
Virginie Ky
fb55ce3426 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 11:36:19 +01:00
Alexandre Bodin
8a6c48eb14 Merge branch 'develop' into features/single-types 2020-02-13 11:36:07 +01:00
Virginie Ky
138bbae981 generalize all trash icons 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 11:29:01 +01:00
soupette
81578007cd Design controls 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 11:17:32 +01:00
soupette
38a6ecbfc7 Created CardImgWrapper 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 10:41:47 +01:00
Virginie Ky
8e1fe9cfe5 update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 10:36:09 +01:00
HichamELBSI
7616edf8e3 Fix PR comments 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-13 10:35:52 +01:00
cyril lopez
035265b3fd
Merge pull request #5226 from strapi/single-types/left-menu 
Reskin and refacto the left admin menu and add Single type section
 2020-02-13 10:27:37 +01:00
cyril lopez
56ab6442dc
Merge branch 'develop' into chore/ctm-remove-redux-saga 2020-02-13 10:17:40 +01:00
soupette
f5f84afd70 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-listview 2020-02-13 10:17:05 +01:00
cyril lopez
fa4b57e0b8
Merge pull request #5225 from strapi/chore/remove-saga 
Update Onboarding (blue box)
 2020-02-13 10:16:04 +01:00
soupette
4663ee8c16 Add search 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 10:13:47 +01:00
soupette
4a344d1212 Created HeaderSearch component and add it to the ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 10:02:45 +01:00
soupette
be4954a7e8 Move Filter icon in helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 09:39:20 +01:00
soupette
e023aaf5b2 Init HomePage 2020-02-13 09:01:32 +01:00
soupette
f6c03893aa Init new architecture and change plugin display name 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 07:56:08 +01:00
soupette
11bd6cc0ed Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 07:50:20 +01:00
soupette
7313cbdb41 Init media library. 
Created OLD folder.
Fix load plugin when no Initializer is provided.

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-12 21:55:56 +01:00
HichamELBSI
88f8b94fee Add notification to kind edition 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-12 20:12:28 +01:00
Jeremy Hermelin
db2fdbe102 admin watcher improvement 
Signed-off-by: Jeremy Hermelin <jerem@pukka.io>
 2020-02-12 13:39:28 -05:00
HichamELBSI
fc1541330b Fix after PR comments 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-12 17:54:16 +01:00
Alexandre BODIN
b881506829
Merge pull request #5231 from strapi/single-types/uid-field 
Single types/uid field
 2020-02-12 17:37:23 +01:00
Virginie Ky
25f83878da upload list trash icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 16:22:25 +01:00
Virginie Ky
7e5a0fb665 update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 15:55:27 +01:00
virginieky
da82757c95
Merge branch 'develop' into chore/remove-saga 2020-02-12 13:58:51 +01:00