yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 127 Branches 497 Tags
Commit Graph

1859 Commits

Author SHA1 Message Date
Virginie Ky
9f354b05bb apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 21:15:26 +01:00
Virginie Ky
7bc9b987f7 Filter button with translation 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 14:40:52 +01:00
soupette
9abb0e6d7f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-crop-new-asset 2020-02-24 16:25:29 +01:00
soupette
6ee156f3cc Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 10:58:46 +01:00
soupette
3b99cfa381 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-crop-new-asset 2020-02-24 10:41:27 +01:00
soupette
2838d145b0 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings 2020-02-24 10:40:56 +01:00
soupette
0ee70bcc35 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-24 10:39:43 +01:00
Ky
65c8968b84 clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-22 12:01:07 +01:00
Ky
783b3f1a36 theme 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-22 11:46:54 +01:00
Alexandre Bodin
9c39efecdc Merge branch 'develop' into features/single-types 2020-02-21 11:57:11 +01:00
Alexandre Bodin
bd53103e06 Merge branch 'master' into develop 2020-02-21 11:56:59 +01:00
soupette
11a2b3bbfc Design edit modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-21 07:58:14 +01:00
soupette
074d30ccfb Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 13:49:19 +01:00
soupette
1a4ca1fcec Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-20 13:44:21 +01:00
HichamELBSI
cc6a35551b Add single type navigation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-20 11:53:57 +01:00
soupette
f0231154f3 improve design upload list 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 09:52:29 +01:00
soupette
51b7d75cdd Improve Modal components 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 09:02:51 +01:00
soupette
de10305b32 Created new modal header component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 07:58:59 +01:00
soupette
f128edc73a Add font-sizes and font-weight to the theme 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 07:11:20 +01:00
soupette
bf6a2464ab Add setting link 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 16:52:58 +01:00
soupette
09d1a6af3a Add option to add a link into the global setting section 2020-02-19 16:30:53 +01:00
Alexandre Bodin
032b741751 Merge branch 'develop' into features/single-types 2020-02-19 15:05:22 +01:00
Alexandre Bodin
614d550742 Merge branch 'master' into develop 2020-02-19 15:04:09 +01:00
Toms Burgmanis
26d6687940
Merge branch 'master' into patch-1 2020-02-19 01:41:06 +02:00
Jim LAURIE
a28eadf67f
Merge branch 'master' into patch-1 2020-02-18 16:35:59 +01:00
Toms Burgmanis
430505b032
Merge branch 'master' into patch-1 2020-02-18 17:22:23 +02:00
Alexandre BODIN
92de9e56dd
Merge branch 'master' into admin-watcher-improvement 2020-02-18 11:01:10 +01:00
virginieky
f25caacb1e
Merge branch 'master' into patch-1 2020-02-17 10:20:04 +01:00
soupette
f6ec6a3b2f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-listview 2020-02-17 08:05:58 +01:00
soupette
e4c485da81 Merge branch 'master' of github.com:strapi/strapi into develop 2020-02-17 08:04:08 +01:00
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
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
Alexandre Bodin
8a6c48eb14 Merge branch 'develop' into features/single-types 2020-02-13 11:36:07 +01:00
soupette
81578007cd Design controls 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 11:17:32 +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
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
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
virginieky
da82757c95
Merge branch 'develop' into chore/remove-saga 2020-02-12 13:58:51 +01:00
Virginie Ky
540830a7a6 Merge branch 'develop' of github.com:strapi/strapi into develop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 13:53:51 +01:00
soupette
081bdb613f Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-12 10:46:44 +01:00
soupette
1a5a3fad67 Add comments 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-12 10:14:10 +01:00
soupette
597cf9709d Add marketplace plugins to the admin reducer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:52:01 +01:00
soupette
f924a53a8a Add pluginLogo to the plugin object in order to prevent fetching the logo from github 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:15:53 +01:00
HichamELBSI
4f5cd5a209 Reskin and refacto the left admin menu and add Single type section 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-11 17:13:31 +01:00
soupette
945e1047d3 Update link with next single type feature 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 16:53:34 +01:00