yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-29 18:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 119 Branches 499 Tags
Commit Graph

1742 Commits

Author SHA1 Message Date
Jim LAURIE
a28eadf67f
Merge branch 'master' into patch-1 2020-02-18 16:35:59 +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
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
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
cyril lopez
021f88c88f
Merge pull request #5241 from strapi/front/trash-icon 
Generalize all trash icon
 2020-02-13 13:31:07 +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
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
Virginie Ky
8e1fe9cfe5 update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 10:36:09 +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
HichamELBSI
fc1541330b Fix after PR comments 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-12 17:54:16 +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
Virginie Ky
8269f71bb6 Merge branch 'front/ui-improvements' into front/font-weight 2020-02-12 13:55:46 +01:00
Virginie Ky
f152ea9af9 Merge branch 'develop' into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 13:55:13 +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
Virginie Ky
6e4dbf6394 Merge branch 'develop' of github.com:strapi/strapi into front/font-weight 2020-02-12 13:51:27 +01:00
Virginie Ky
d75247f441 trash icons ip 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 12:24:35 +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
Virginie Ky
45ecaec15c font-weight and alignment 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-11 17:12:40 +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
soupette
f955ed733d Fix link to create a new collectionType 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 16:50:47 +01:00
soupette
41d649f725 Remove saga from Onboarding container and simplified the logic a little 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 16:45:10 +01:00
soupette
825721713a Fixes #4131 2020-02-11 15:02:58 +01:00
Alexandre Bodin
de9521ce6b Merge branch 'develop' into features/single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:09:50 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 19:15:20 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
Virginie Ky
59e54fee2d update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-06 18:19:25 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
Virginie Ky
8eb12811aa Merge branch 'front/ui-improvements' into front/popupwarning 2020-02-06 14:38:59 +01:00
cyril lopez
ce8961c72f
Merge pull request #5175 from strapi/front/ctm-back-button 
CTM back button - Administrator panel
 2020-02-06 14:32:56 +01:00
soupette
e9aa6143a3 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-06 14:28:05 +01:00