Daniel Kvistgaard
96345d9f38
Merge remote-tracking branch 'upstream/master' into bugfix/cloudinary-delete-resource-type
2019-09-10 16:04:02 +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
a9ad27f351
Merge branch 'develop' into chore/routing-x-forwarded
2019-09-09 14:25:48 +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
9cba18e6dc
Groups qa fixes
2019-08-27 15:38:53 +02:00
Andre Noberto
857cbbc848
Fix for infinite pagination when count is zero
2019-08-26 09:58:46 -03:00
Alexandre Bodin
7c5f1484ba
Use koa-router and fix graphql-uploads
2019-08-22 15:04:27 +02:00
soupette
7f067c8f6a
Fix ctm qa
2019-08-20 11:00:48 +02:00
soupette
857ec1ca70
Rename lifecycle hooks
2019-08-13 11:31:10 +02:00
soupette
b36079124b
Fix baseline with current inputs
2019-08-08 15:29:45 +02:00
Virginie Ky
0449d9dc3f
all modals title and subtitle fixes
2019-08-02 18:12:51 +02:00
Virginie Ky
336902384e
Merge branch 'develop' into front/repeatable-field-create
2019-08-01 17:51:47 +02:00
Virginie Ky
8342dc79a7
ListRow and ListRowCollapse UI
2019-07-31 23:25:34 +02:00
soupette
0a3b692a87
Fixes #2866
2019-07-31 15:22:37 +02:00
soupette
53d0014dc2
Clean code
2019-07-29 18:02:45 +02:00
soupette
fdd0b0f63d
Fix UI
2019-07-29 17:11:53 +02:00
soupette
73a8790b4e
Fix migrztions bugs
2019-07-24 11:10:29 +02:00
Virginie Ky
dff69ece4a
merge develop
2019-07-24 10:17:28 +02:00
Virginie Ky
27c38cd959
Group relation creation without UT
2019-07-23 18:40:47 +02:00
Virginie Ky
a312d6da15
Relation modal ip
2019-07-22 18:32:25 +02:00
soupette
af84bb5116
Fix conflicts
2019-07-22 17:10:23 +02:00
virginieky
411aa211d5
Merge branch 'develop' into front/repeatable-field-create
2019-07-19 13:39:52 +02:00
soupette
cef035a3ca
Add trads
2019-07-19 09:40:14 +02:00
Alexandre Bodin
da5d02fb7c
Merge branch 'master' into develop
2019-07-18 19:28:52 +02:00
Virginie Ky
9fc54cd8f9
Edit attributes Unit tests
2019-07-18 16:34:27 +02:00
soupette
c74cbd9126
Fix request tasks for selects
2019-07-18 14:07:22 +02:00
Virginie Ky
ae1c622eda
UI fixes
2019-07-16 15:06:42 +02:00
Virginie Ky
4701ea2681
Attributes creation
2019-07-15 17:32:50 +02:00
Virginie Ky
3b1a7c5789
Attributes
2019-07-15 15:00:05 +02:00
Virginie Ky
e432a2d639
Add attributes
2019-07-12 18:34:12 +02:00
soupette
7b7fe93875
Fix helper plugin
2019-07-11 18:13:09 +02:00
soupette
5acb46c54a
Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-list-view
2019-07-11 17:20:12 +02:00
soupette
950168b8bf
Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view
2019-07-11 17:13:35 +02:00
soupette
3ebf82c5a1
Display filters
2019-07-10 17:07:19 +02:00
soupette
ea32c05976
Created filterpicker
2019-07-09 12:31:18 +02:00
virginieky
a5a9319ba9
Merge branch 'develop' into front/repeatable-fieldslist
2019-07-09 09:56:11 +02:00
Virginie Ky
b6a5ae5644
Review apply
2019-07-08 18:58:29 +02:00
Louis Augry
a3fe9d5a38
Fix documention typo
2019-07-08 15:10:17 +02:00
