1080 Commits

Author SHA1 Message Date
jasongitmail
d5e8b8dc50
Merge branch 'master' into step-any-fix 2019-09-18 18:27:56 +00:00
Alexandre Bodin
84adbf3bcf v3.0.0-beta.16.5 2019-09-18 14:00:21 +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
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
virginieky
5fc8600506
Merge branch 'master' into features/media-preview 2019-09-13 16:16:36 +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
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
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
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
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
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
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
d52d4f603f Upgrade react deps 2019-08-13 11:22:36 +02:00
cyril lopez
c89a898e49
Merge branch 'develop' into ctm/edit-view-update 2019-08-12 09:43:58 +02:00
Alexandre Bodin
ebf3922905 Merge branch 'master' into develop 2019-08-12 09:39:59 +02:00
Alexandre Bodin
fe2c2dccb3 v3.0.0-beta.15 2019-08-12 09:35:27 +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