9892 Commits

Author SHA1 Message Date
Virginie Ky
87ff244991 vertical scrollbar shown for accessibility 2019-09-09 18:24:03 +02:00
Alexandre BODIN
eec3acfa63
Merge pull request #3923 from strapi/front/qa
Content manager update field infos display on editview
2019-09-09 17:47:43 +02:00
Alexandre BODIN
32d3df8fbb
Merge branch 'master' into front/qa 2019-09-09 17:46:59 +02:00
davidkartuzinski
4a87d83887 Fix conflict 2019-09-09 17:42:39 +02:00
soupette
76560a1c9c Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-09 17:29:47 +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
Alexandre BODIN
67478ffdd7
Merge branch 'master' into eslint-update 2019-09-09 16:51:51 +02:00
Abdón Rodríguez Davila
d4b72a958c Merge branch 'master' into eslint-update
# Conflicts:
#	yarn.lock
2019-09-09 16:45:56 +02:00
soupette
22bf28431f Use global props instead of admin s ones 2019-09-09 16:45:25 +02:00
Alexandre BODIN
7fe97b3e54
Merge pull request #3892 from shabab477/bugfix/cli-creating-extra-model-folder
Fix issue with duplicate model folder getting created when generating model with api option
2019-09-09 16:45:22 +02:00
Alexandre BODIN
1a9f4e8e59
Merge branch 'master' into bugfix/cli-creating-extra-model-folder 2019-09-09 16:45:15 +02:00
Alexandre BODIN
d3cf6fd613
Merge pull request #3855 from abdonrd/koa-update
Update koa dependencies
2019-09-09 16:41:45 +02:00
davidkartuzinski
ace4c2439a Returns on PR fixed 2019-09-09 16:27:42 +02:00
soupette
e1b0f07655 Global single request 2019-09-09 16:06:54 +02:00
Abdón Rodríguez Davila
315399527a Fix missed lint error 2019-09-09 15:32:02 +02:00
Abdón Rodríguez Davila
118691808b Update ESLint to v6.3 2019-09-09 15:28:59 +02:00
soupette
6e559170f7 Update tests 2019-09-09 15:27:54 +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
Natalia Tsvetkova
92f00de254 Merge branch 'master' into feature/instagram_provider 2019-09-09 14:59:21 +02:00
Abdón Rodríguez Davila
1015540af9 Update koa dependencies 2019-09-09 14:39:57 +02:00
Alexandre BODIN
1593c122c6
Merge branch 'master' into bugfix/cli-creating-extra-model-folder 2019-09-09 14:38:48 +02:00
soupette
99cb1f8f5e Add all views 2019-09-09 14:32:06 +02:00
Alexandre BODIN
d65e60e94d
Merge pull request #3852 from strapi/fix/fr_template
Revert and fix the feature request template
2019-09-09 14:31:35 +02:00
Alexandre BODIN
b0433e03f5
Merge branch 'master' into fix/fr_template 2019-09-09 14:31:14 +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
47cd741705
Merge branch 'master' into patch-1 2019-09-09 14:22:57 +02:00
soupette
1cd7084a94 Move auth views to the admin 2019-09-09 13:58:07 +02:00
Jim LAURIE
f00be91230
Merge pull request #3915 from strapi/readme
Readme to change image, and fix installation commands
2019-09-09 13:42:16 +02:00
Jim LAURIE
f90ab75c54
Merge branch 'master' into readme 2019-09-09 13:41:53 +02:00
Alexandre Bodin
05597970fa v3.0.0-beta.16 v3.0.0-beta.16 2019-09-09 13:35:57 +02:00
Alexandre BODIN
6309af25c9
Merge pull request #3664 from strapi/develop
Group and Repeatable Fields
2019-09-09 13:32:28 +02:00
Alexandre Bodin
3186da5f25 Add section on the richtext type 2019-09-09 12:24:24 +02:00
cyril lopez
d58532078b
Merge pull request #3920 from strapi/front/qa
Groups & repeatable QA
2019-09-09 12:11:55 +02:00
virginieky
dcf1253622
Merge branch 'develop' into front/qa 2019-09-09 12:04:18 +02:00
Virginie Ky
d13bba6f0d redirect fix on group main infos update 2019-09-09 11:59:25 +02:00
Jim LAURIE
9849e1e864
Merge branch 'develop' into docs/tutorial 2019-09-09 11:15:57 +02:00
Alexandre BODIN
29579f90c1
Merge pull request #3912 from strapi/docs/migration-guide-beta.16
Add migration guide to beta.16
2019-09-09 11:10:37 +02:00
davidkartuzinski
211f8d1846 clarified a sentence regarding the quickstart 2019-09-06 17:45:04 +02:00
Alexandre BODIN
6a127b3d20
Merge branch 'develop' into docs/migration-guide-beta.16 2019-09-06 17:28:45 +02:00
davidkartuzinski
64f342234f removed an unnecessary reference to the roadmap- the roadmap was referenced twice, a tiny restructure regarding the Community Support section and add an explanation about SQLite being using in the Quickstart 2019-09-06 17:16:43 +02:00
davidkartuzinski
8fefb18edf Remove sponsors per @pierreburgy request September 2 2019-09-06 17:10:35 +02:00
davidkartuzinski
34d1e11dec Readme to change image, and fix installation commands 2019-09-06 17:00:23 +02:00
soupette
b7bbca6bfc Merge branch 'develop' of github.com:strapi/strapi into front/auth-views 2019-09-06 16:58:52 +02:00
soupette
fbf301c5f6 Fix design 2019-09-06 16:58:44 +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
Alexandre Bodin
58063cf898 Add admin panel rebuild and before/after examples 2019-09-06 16:45:27 +02:00