Virginie Ky
230ba6b41f
merge master
2019-09-19 17:09:29 +02:00
jasongitmail
d5e8b8dc50
Merge branch 'master' into step-any-fix
2019-09-18 18:27:56 +00:00
Alexandre Bodin
bf7870de3b
Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded
2019-09-18 17:29:09 +02:00
Alexandre Bodin
84adbf3bcf
v3.0.0-beta.16.5
2019-09-18 14:00:21 +02:00
Alexandre BODIN
7a94d9dad9
Merge branch 'master' into chore/routing-x-forwarded
2019-09-18 13:27:39 +02:00
soupette
6e425923ba
Fix PR feedback
2019-09-17 16:04:38 +02:00
cyril lopez
6c8a446e0c
Merge branch 'master' into front/context-api
2019-09-17 13:36:59 +02:00
Alexandre Bodin
df236d0642
v3.0.0-beta.16.4
2019-09-17 12:14:39 +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
jasongitmail
2f2ecb587c
Merge branch 'master' into step-any-fix
2019-09-16 18:32:51 +00:00
jasongitmail
603d3ed757
Change to step={props.step}
2019-09-16 18:30:35 +00:00
soupette
6494a3dd07
Merge branch 'master' of github.com:strapi/strapi into front/context-api
2019-09-16 13:52:59 +02:00
soupette
b4bf897016
Update ctb tests so it uses the new context api
2019-09-16 11:57:18 +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
soupette
823cd24771
Created GlobalContext and update remove the old context api in strapi-admin
2019-09-13 15:28:10 +02:00
Alexandre Bodin
36e4e73ad3
v3.0.0-beta.16.3
2019-09-13 15:08:44 +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
jasongitmail
eb8be740a2
Merge branch 'master' into step-any-fix
2019-09-13 01:06:43 +00:00
jasongitmail
83173d8882
Change InputNumber.js defaultProps to step: 'any'
2019-09-12 18:03:16 +00: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
Alexandre Bodin
7207184648
v3.0.0-beta.16.2
2019-09-11 19:22:05 +02:00
jasongitmail
1b247554fe
Update InputNumberWithErrors to default to step="any"
2019-09-10 21:19:59 +00:00
jasongitmail
861d5d111a
Update InputNumber to default to step="any"
2019-09-10 21:17:03 +00:00
soupette
a8dae57806
Merge branch 'master' of github.com:strapi/strapi into front/auth-views
2019-09-10 17:52:20 +02:00
Daniel Kvistgaard
e6e96dcc3a
Merge branch 'master' into bugfix/cloudinary-delete-resource-type
2019-09-10 16:52:44 +02:00
Alexandre Bodin
7d51b8625d
v3.0.0-beta.16.1
2019-09-10 16:33:22 +02:00
Daniel Kvistgaard
96345d9f38
Merge remote-tracking branch 'upstream/master' into bugfix/cloudinary-delete-resource-type
2019-09-10 16:04:02 +02:00
soupette
76560a1c9c
Merge branch 'master' of github.com:strapi/strapi into front/auth-views
2019-09-09 17:29:47 +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
Alexandre Bodin
2530606e47
Merge branch 'master' into chore/routing-x-forwarded
2019-09-09 14:29:07 +02:00
Alexandre BODIN
a9ad27f351
Merge branch 'develop' into chore/routing-x-forwarded
2019-09-09 14:25:48 +02:00
Alexandre Bodin
05597970fa
v3.0.0-beta.16
2019-09-09 13:35:57 +02:00
soupette
b7bbca6bfc
Merge branch 'develop' of github.com:strapi/strapi into front/auth-views
2019-09-06 16:58:52 +02:00
Alexandre Bodin
f7d3734d9d
Merge branch 'develop' into features/media-preview
2019-09-06 16:51:44 +02:00
Alexandre BODIN
5abcfc7865
Merge branch 'master' into develop
2019-09-06 16:51:23 +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
a771bf496d
merge develop
2019-09-04 16:35:33 +02:00
Virginie Ky
1e450da9cc
gst
2019-09-04 12:51:27 +02:00
Virginie Ky
43ae44b480
CTB back button
2019-09-04 12:31:18 +02: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
5f7a0a54b7
Media UI in progress
2019-08-29 18:13:47 +02:00
Virginie Ky
5e0bec57d9
Content manager multiple select li ui
2019-08-28 16:57:44 +02:00
Abdón Rodríguez Davila
21a14ee737
Remove definitions for rules were not found
2019-08-28 12:20:27 +02:00
Virginie Ky
2f89c8b244
groups tests
2019-08-28 09:56:12 +02:00
