Alexandre Bodin
9280cf9cd7
Merge branch 'master' into develop
2019-10-22 11:15:09 +02:00
Alexandre Bodin
3ddd383c30
v3.0.0-beta.17.3
2019-10-22 11:05:52 +02:00
soupette
6a852ad6cb
Fix conflicts
2019-10-18 15:51:44 +02:00
Alexandre Bodin
b6feabf689
v3.0.0-beta.17.2
2019-10-18 13:42:22 +02:00
Alexandre Bodin
f0ad2ab52c
Merge branch 'master' into develop
2019-10-16 14:16:52 +02:00
Alexandre Bodin
9f0713649b
v3.0.0-beta.17.1
2019-10-16 11:42:54 +02:00
Alexandre Bodin
7c8eda443e
v3.0.0-beta.17
2019-10-16 10:40:18 +02:00
soupette
beef6e5510
Fix conflicts
2019-10-10 06:34:31 +02:00
soupette
75abb17f0f
Fix conflicts
2019-10-08 09:17:47 +02:00
Alexandre Bodin
2d04d25097
v3.0.0-beta.16.8
2019-10-04 11:57:46 +02:00
cyril lopez
39988b3efb
Merge branch 'master' into develop
2019-10-03 10:47:25 +02:00
soupette
6b0acc7b8e
Remove settings-manager
2019-10-02 17:27:22 +02:00
Alexandre Bodin
dbd621e6d8
v3.0.0-beta.16.7
2019-10-01 12:15:48 +02:00
soupette
616c2def34
Apply PR feedback
2019-09-27 16:29:05 +02:00
soupette
6f8b23d254
Fix conflicts
2019-09-27 16:26:09 +02:00
cyril lopez
3a4bb7fda5
Merge branch 'develop' into front/context-api
2019-09-27 15:44:15 +02:00
Alexandre Bodin
6305bee43b
v3.0.0-beta.16.6
2019-09-26 14:35:06 +02:00
cyril lopez
83a6fe44e4
Merge branch 'master' into front/context-api
2019-09-23 09:38:26 +02: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
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
soupette
6494a3dd07
Merge branch 'master' of github.com:strapi/strapi into front/context-api
2019-09-16 13:52:59 +02:00
Alexandre BODIN
c66eb5d2cf
Merge branch 'master' into chore/routing-x-forwarded
2019-09-13 17:40:50 +02:00
soupette
c971ab5ada
Remove all context api in all plugins except users
2019-09-13 17:05:21 +02:00
Alexandre Bodin
36e4e73ad3
v3.0.0-beta.16.3
2019-09-13 15:08:44 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update
2019-09-12 15:05:53 +02:00
soupette
45872325f4
Merge branch 'master' of github.com:strapi/strapi into stm/update
2019-09-12 14:31:32 +02:00
soupette
f43006db69
Update stm
2019-09-12 14:22:19 +02:00
soupette
4fbcda817c
Finish config page
2019-09-12 13:50:13 +02:00
soupette
889301f531
Remove useless files...
2019-09-12 12:26:52 +02:00
Alexandre Bodin
e20d781383
Merge branch 'master' into chore/routing-x-forwarded
2019-09-12 09:59:11 +02:00
soupette
0dd65a261b
Remove env configurations
2019-09-12 09:44:36 +02:00
soupette
a564e4c12a
Fix useFetch hook
2019-09-11 19:39:21 +02:00
Alexandre Bodin
7207184648
v3.0.0-beta.16.2
2019-09-11 19:22:05 +02:00
soupette
88827c6f0f
Init configpage
2019-09-11 19:07:03 +02:00
soupette
4efdba6c39
Simplify code and set routing
2019-09-11 18:49:07 +02:00
soupette
2c6269f074
Design languagepage
2019-09-11 18:13:31 +02:00
soupette
4f1b2973fc
Design lang page
2019-09-11 16:06:24 +02:00
soupette
9614a7afe7
Common left menu styled for stm and ctb
2019-09-11 11:32:28 +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
7d51b8625d
v3.0.0-beta.16.1
2019-09-10 16:33:22 +02:00
soupette
76560a1c9c
Merge branch 'master' of github.com:strapi/strapi into front/auth-views
2019-09-09 17:29:47 +02:00
soupette
8485657342
Move global data to the app container and update plugins
2019-09-09 17:12:01 +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
05597970fa
v3.0.0-beta.16
2019-09-09 13:35:57 +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
