soupette
|
b7b8e368a2
|
Fixes #3942
|
2019-09-10 09:06:26 +02:00 |
|
Peter Zhao
|
b3a6ad4f23
|
Add zh-Hans translations of new feature
|
2019-09-10 14:29:03 +08:00 |
|
websocket98765
|
71b2993f33
|
Fix typo in en.json
Fixs `Make you sure you understand` to `Make sure you understand`.
|
2019-09-09 22:29:02 +00:00 |
|
sheva
|
2462958aff
|
Updating bookshelf after merge v.3.0.0-beta.16
|
2019-09-09 22:16:01 +02:00 |
|
sheva
|
23b4b91fe3
|
Merge branch 'master' into fix/3874-bookshelf-unicode-fix
# Conflicts:
# packages/strapi/lib/core-api/queries/bookshelf.js
|
2019-09-09 21:29:53 +02:00 |
|
soupette
|
b3bc4a0941
|
Remove willSecure and didGetSecured data hooks
|
2019-09-09 18:44:41 +02:00 |
|
Alexandre BODIN
|
32d3df8fbb
|
Merge branch 'master' into front/qa
|
2019-09-09 17:46:59 +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
|
1a9f4e8e59
|
Merge branch 'master' into bugfix/cli-creating-extra-model-folder
|
2019-09-09 16:45:15 +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 |
|
soupette
|
1cd7084a94
|
Move auth views to the admin
|
2019-09-09 13:58:07 +02:00 |
|
Alexandre Bodin
|
05597970fa
|
v3.0.0-beta.16
|
2019-09-09 13:35:57 +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 |
|
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 |
|
soupette
|
41c42bde49
|
Refactoo forms, created form utils
|
2019-09-06 16:22:04 +02:00 |
|
virginieky
|
74ffd1e0b7
|
Merge pull request #3906 from strapi/front/media-preview-list
Front/media preview list
|
2019-09-06 10:27:42 +02:00 |
|
Natalia Tsvetkova
|
822e4c6598
|
Revert "Adjusted version"
This reverts commit 64b70659cfee2e8fa2faf5099006531d030155c7.
|
2019-09-06 09:43:09 +02:00 |
|
Natalia Tsvetkova
|
64b70659cf
|
Adjusted version
|
2019-09-06 09:34:50 +02:00 |
|
Natalia Tsvetkova
|
6a3409891c
|
Added instagram social auth provider
|
2019-09-06 09:19:23 +02:00 |
|
Virginie Ky
|
794be1205f
|
code clean
|
2019-09-05 17:51:38 +02:00 |
|
Virginie Ky
|
b84b73d02f
|
display wide images
|
2019-09-05 17:45:52 +02:00 |
|
soupette
|
23420ffe88
|
Created PageTitle components
|
2019-09-05 17:13:17 +02:00 |
|
Virginie Ky
|
f32197d983
|
style
|
2019-09-05 17:01:58 +02:00 |
|
Alexandre Bodin
|
b33a78c998
|
Allow media to be listable
|
2019-09-05 16:59:02 +02:00 |
|
soupette
|
fb3e266d16
|
Move auth trads to the admin
|
2019-09-05 16:41:23 +02:00 |
|
soupette
|
e59527cc1d
|
Init Auth in admin package
|
2019-09-05 16:27:30 +02:00 |
|
Virginie Ky
|
d2fc652c17
|
list ui name display
|
2019-09-05 15:17:09 +02:00 |
|
soupette
|
49faee06c2
|
Migrate Logout compo to functionnal component, remove scss
|
2019-09-05 14:29:55 +02:00 |
|
Virginie Ky
|
cb9609084b
|
ListView UI
|
2019-09-05 11:58:49 +02:00 |
|
Virginie Ky
|
a771bf496d
|
merge develop
|
2019-09-04 16:35:33 +02:00 |
|
Peter Zhao
|
a3677e9837
|
Update zh-Hans translation. Remove some wrong key.
|
2019-09-04 20:45:19 +08:00 |
|
Virginie Ky
|
076db0a993
|
merge develop
|
2019-09-04 13:02:08 +02:00 |
|