910 Commits

Author SHA1 Message Date
soupette
2dc5df9595 Fix #4127 2019-10-01 16:25:08 +02:00
Alexandre BODIN
b3648ba4d9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-24 10:04:19 +02:00
Alexandre BODIN
e6e1a70c2b
Merge branch 'master' into fix/media-preview 2019-09-23 09:44:45 +02:00
Virginie Ky
92f71d777d reviews feedback 2019-09-19 10:17:20 +02:00
HuyNQ
712848b378
Fix filterOption of SelectMany to enable searching in multiple select 2019-09-19 11:02:47 +07:00
Virginie Ky
1a82ba625e constant naming 2019-09-18 18:56:04 +02:00
Virginie Ky
dfe3922ca7 add const 2019-09-18 18:25:50 +02:00
Virginie Ky
0c6508af52 count fix 2019-09-18 18:11:31 +02:00
Alexandre BODIN
7a94d9dad9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-18 13:27:39 +02:00
Alexandre BODIN
f8bfb636cd
Merge branch 'master' into fix/group-navigation 2019-09-17 10:46:13 +02:00
Alexandre BODIN
67ed10a56f
Merge branch 'master' into fix/#4026 2019-09-17 10:42:24 +02:00
soupette
8ad1256fab Fixes #4026 2019-09-17 10:22:20 +02:00
cyril lopez
8657453ea2
Merge branch 'master' into eslint-update 2019-09-17 10:11:11 +02:00
Alexandre BODIN
8a6c162095
Merge branch 'master' into chore/routing-x-forwarded 2019-09-16 23:07:54 +02:00
soupette
d2c8d5e419 Fixes #4013 2019-09-16 17:47:43 +02:00
Alexandre BODIN
c66eb5d2cf
Merge branch 'master' into chore/routing-x-forwarded 2019-09-13 17:40:50 +02:00
virginieky
5fc8600506
Merge branch 'master' into features/media-preview 2019-09-13 16:16:36 +02:00
Virginie Ky
1b53286c71 merge 2019-09-13 16:05:10 +02:00
Virginie Ky
4f9065f19e last review apply 2019-09-13 16:04:15 +02:00
soupette
9ad9fafd6b Fixes #3987 #3954 2019-09-13 14:46:31 +02:00
Alexandre BODIN
b11e9375c9
Merge branch 'master' into features/media-preview 2019-09-13 10:19:55 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
Alexandre Bodin
e20d781383 Merge branch 'master' into chore/routing-x-forwarded 2019-09-12 09:59:11 +02:00
Virginie Ky
c21f9272f6 media border 2019-09-11 10:36:27 +02:00
Virginie Ky
395f82a128 PR feedbacks 2019-09-11 10:07:25 +02:00
soupette
a8dae57806 Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-10 17:52:20 +02:00
Alexandre BODIN
7e9adb789f
Merge branch 'master' into eslint-update 2019-09-10 16:29:46 +02:00
soupette
55ea54608d Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-10 12:19:54 +02:00
soupette
869cde8f19 Fix rerender issue in the admin 2019-09-10 12:14:07 +02:00
soupette
c5fd30e314 Fix WYSIWYG preview 2019-09-10 10:39:57 +02:00
赵兵
a462fab945 Merge remote-tracking branch 'upstream/master' into patch-1 2019-09-10 16:14:38 +08:00
Peter Zhao
b3a6ad4f23
Add zh-Hans translations of new feature 2019-09-10 14:29:03 +08:00
soupette
b3bc4a0941 Remove willSecure and didGetSecured data hooks 2019-09-09 18:44:41 +02:00
Virginie Ky
01045a5a1b content manager update field infos on editview UI fix 2019-09-09 17:23:56 +02:00
soupette
8485657342 Move global data to the app container and update plugins 2019-09-09 17:12:01 +02:00
Virginie Ky
a60f1d1ba0 qa fixes 2019-09-09 16:56:46 +02:00
Abdón Rodríguez Davila
187a669d1e Merge branch 'master' into eslint-update
# Conflicts:
#	.eslintrc.js
#	package.json
#	packages/strapi-admin/admin/src/containers/HomePage/CommunityContent.js
#	packages/strapi-admin/admin/src/containers/HomePage/WelcomeContent.js
#	packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
#	packages/strapi-hook-bookshelf/lib/index.js
#	packages/strapi-hook-bookshelf/lib/utils/graphql.js
#	packages/strapi-hook-bookshelf/lib/utils/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/TableHeader/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/SettingPage/index.js
#	packages/strapi-plugin-content-manager/config/policies/routing.js
#	packages/strapi-plugin-content-manager/services/ContentManager.js
#	packages/strapi-plugin-content-type-builder/admin/src/components/TableListRow/index.js
#	packages/strapi-plugin-content-type-builder/admin/src/containers/AttributesPickerModal/index.js
#	packages/strapi-utils/lib/models.js
#	yarn.lock
2019-09-09 15:26:35 +02:00
soupette
41c42bde49 Refactoo forms, created form utils 2019-09-06 16:22:04 +02:00
Alexandre Bodin
a22f2cefef Remove x-forwarded-host.
- set security defaults for development mode that are standard
- refactor error messages to work without ctx.request.admin
- remove mask middleware and add a sanitization layer to the core-api to
hide private fileds
2019-09-06 14:33:24 +02:00
Virginie Ky
794be1205f code clean 2019-09-05 17:51:38 +02:00
Virginie Ky
b84b73d02f display wide images 2019-09-05 17:45:52 +02:00
Virginie Ky
f32197d983 style 2019-09-05 17:01:58 +02:00
Virginie Ky
d2fc652c17 list ui name display 2019-09-05 15:17:09 +02:00
Virginie Ky
cb9609084b ListView UI 2019-09-05 11:58:49 +02:00
Virginie Ky
a771bf496d merge develop 2019-09-04 16:35:33 +02:00
Peter Zhao
a3677e9837
Update zh-Hans translation. Remove some wrong key. 2019-09-04 20:45:19 +08:00
Peter Zhao
30d63681cd
Add missing translations 2019-09-04 11:57:10 +08:00
Virginie Ky
5453a311fc some UI fixes 2019-09-03 21:15:32 +02:00
Virginie Ky
746d7e0ca5 some UI fixes 2019-09-02 17:25:30 +02:00
Virginie Ky
70303d3420 Media Preview List display ip 2019-09-02 11:52:57 +02:00