1985 Commits

Author SHA1 Message Date
Virginie Ky
24c07727da Replace carret with buffet icon
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-27 14:39:10 +01:00
Ky
f16b9c0ed6 search
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-02-20 22:49:51 +01:00
soupette
56db05845b Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-19 05:50:51 +01:00
soupette
6d384ddb6a Fixes #5260
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-18 14:31:28 +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
soupette
81578007cd Design controls
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-13 11:17:32 +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
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
f5a2ddc98d Merge branch 'chore/ctm-remove-redux-saga' of github.com:strapi/strapi into chore/ctm-remove-redux-saga 2020-02-12 10:37:19 +01:00
soupette
57d01a8031 Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-12 10:36:37 +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
virginieky
0bacc59641
Merge branch 'develop' into chore/ctm-remove-redux-saga 2020-02-11 15:16:54 +01:00
soupette
662a79d080 Remove saga from listview
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-11 14:02:03 +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
soupette
30fba6d3fe Remove saga from Main container
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-10 15:27:49 +01:00
soupette
b86b584539 Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-10 10:24:12 +01:00
soupette
d58cbdc3c4 Fixes #5091
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-07 15:55:23 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
cyril lopez
3a8e79817f
Merge branch 'develop' into fix/select-relations 2020-02-06 15:16:31 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations.
Signed-off-by: ruibaby <i@ryanc.cc>
2020-02-04 15:55:02 +08:00
soupette
6cf54385ca Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 16:43:12 +01:00
soupette
5e9af4c36c Remove styled-compo dependency from content manager
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-03 15:34:44 +01:00
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
soupette
9c53fcaccc Fix select relations
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-30 18:09:55 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
Virginie Ky
4ff189ac00 Merge branch 'master' into develop 2020-01-29 11:35:55 +01:00
Alexandre BODIN
3c59a05154
Merge pull request #5100 from strapi/fix/main-field-exclude-id
Fix main field set to id on mongo
2020-01-27 12:14:16 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-27 10:49:57 +01:00
Alexandre Bodin
d0c26fef67 Fix main field set to id on mongo
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-27 09:53:19 +01:00
soupette
96e092b300 Change the way we load plugins
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-23 16:46:50 +01:00
soupette
af4bee9b8e Fixes #5054
Signed-off-by: soupette <>
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-23 15:44:47 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Mariusz Wachowski
4e5326490e feat: updated pl translations
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
2020-01-22 21:54:08 +01:00
soupette
d0c3a0ddb7 Merge branch 'chore/eslint-config-front' of github.com:strapi/strapi into chore/eslint-config-front 2020-01-21 18:36:20 +01:00
soupette
489c7b2324 Fix lint
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 18:34:27 +01:00
cyril lopez
b5f2824f6d
Merge branch 'master' into chore/eslint-config-front 2020-01-21 18:00:52 +01:00
soupette
cd03d672c2 Fix lint
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 17:53:21 +01:00
soupette
ca1e82337c Fixes #5019
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 17:09:03 +01:00
soupette
eb00b7e0ea Add newline-before-return rule
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 16:31:05 +01:00
soupette
2a4351794b Fix lint webhooks
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 16:25:14 +01:00
soupette
b3ba8c27ef Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 16:12:46 +01:00
soupette
f50f89f0a8 Update eslint configuration
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 16:03:31 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
Alexandre BODIN
1d05cc01b2
Merge branch 'develop' into features/webhooks 2020-01-20 17:21:14 +01:00
soupette
3d5b224183 Rename prop to isNested for better understanding
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-20 16:22:43 +01:00
soupette
8147a188ed Fix icons when error state, improve drag experience
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-20 15:16:55 +01:00
cyril lopez
b76cdb10bb
Merge pull request #5014 from strapi/front/webhooks-editview
Front/webhooks editview
2020-01-20 10:25:21 +01:00