Virginie Ky
|
edc61d3522
|
Fix conflicts
|
2019-10-08 12:27:04 +02:00 |
|
Virginie Ky
|
0c23fe8bae
|
Content manager UI
|
2019-10-08 11:51:10 +02:00 |
|
Virginie Ky
|
b60ae59170
|
Content type builder Models List UI
|
2019-10-08 11:09:49 +02:00 |
|
soupette
|
5c42e43d4f
|
Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb
|
2019-10-03 11:09:48 +02:00 |
|
cyril lopez
|
39988b3efb
|
Merge branch 'master' into develop
|
2019-10-03 10:47:25 +02:00 |
|
soupette
|
cf8bcf627b
|
Fix manyWay with self ct
|
2019-10-01 12:42:42 +02:00 |
|
Virginie Ky
|
11f3871af1
|
Bootstrap and fonts without sass
|
2019-09-24 18:42:08 +02:00 |
|
Virginie Ky
|
88a11cef3c
|
node-sass removed
|
2019-09-17 16:20:45 +02:00 |
|
soupette
|
6e425923ba
|
Fix PR feedback
|
2019-09-17 16:04:38 +02:00 |
|
cyril lopez
|
6c8a446e0c
|
Merge branch 'master' into front/context-api
|
2019-09-17 13:36:59 +02:00 |
|
soupette
|
b4bf897016
|
Update ctb tests so it uses the new context api
|
2019-09-16 11:57:18 +02:00 |
|
soupette
|
c971ab5ada
|
Remove all context api in all plugins except users
|
2019-09-13 17:05:21 +02:00 |
|
Virginie Ky
|
39230ed2ac
|
Remove node-sass ip
|
2019-09-13 15:17:24 +02:00 |
|
Abdón Rodríguez Davila
|
54c383fd44
|
Merge branch 'master' into eslint-update
|
2019-09-12 15:05:53 +02:00 |
|
Alexandre BODIN
|
7e9adb789f
|
Merge branch 'master' into eslint-update
|
2019-09-10 16:29:46 +02:00 |
|
soupette
|
55ea54608d
|
Merge branch 'master' of github.com:strapi/strapi into front/auth-views
|
2019-09-10 12:19:54 +02: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 |
|
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 |
|
Virginie Ky
|
d13bba6f0d
|
redirect fix on group main infos update
|
2019-09-09 11:59:25 +02:00 |
|
Virginie Ky
|
076db0a993
|
merge develop
|
2019-09-04 13:02:08 +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
|
44759c57d9
|
unit test fix
|
2019-08-28 18:05:39 +02:00 |
|
Virginie Ky
|
e57bed91a6
|
refetch data after delete content type
|
2019-08-28 17:53:40 +02:00 |
|
Virginie Ky
|
32236032b3
|
refetch data after delete feature
|
2019-08-28 17:14:00 +02:00 |
|
Virginie Ky
|
4b8e4566ae
|
display feature delete button
|
2019-08-28 17:10:13 +02:00 |
|
Virginie Ky
|
e45815d1a7
|
Wysiwyg responsive ui
|
2019-08-28 14:37:19 +02:00 |
|
Abdón Rodríguez Davila
|
f04f372442
|
Update Object.prototype.hasOwnProperty.call to lodash.has
|
2019-08-28 12:20:27 +02:00 |
|
Abdón Rodríguez Davila
|
61c41d821c
|
Fix no-prototype-builtins rule
|
2019-08-28 12:20:27 +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
|
5013749ac2
|
redirect after group delete
|
2019-08-28 11:39:36 +02:00 |
|
Virginie Ky
|
2f89c8b244
|
groups tests
|
2019-08-28 09:56:12 +02:00 |
|
Virginie Ky
|
bfefb515c3
|
Unit tests fixes
|
2019-08-27 17:46:03 +02:00 |
|
Virginie Ky
|
c990ccb3f1
|
ListRow border and hover fix
|
2019-08-27 16:29:44 +02:00 |
|
Virginie Ky
|
9cba18e6dc
|
Groups qa fixes
|
2019-08-27 15:38:53 +02:00 |
|
Virginie Ky
|
031220aa1a
|
UI fixes and edit ct group fix
|
2019-08-26 17:29:46 +02:00 |
|
Virginie Ky
|
8b04e52752
|
enum default value and supportedAttributes func bug fix
|
2019-08-26 15:55:08 +02:00 |
|
Virginie Ky
|
3abcb4353f
|
merge develop
|
2019-08-26 13:45:13 +02:00 |
|
Virginie Ky
|
56b93581d8
|
Some UI fixes
|
2019-08-26 13:44:04 +02:00 |
|
soupette
|
39c0005020
|
Change the supportedAttributes so we can run function
|
2019-08-26 11:46:42 +02:00 |
|
soupette
|
56bb371313
|
Fix ctb lists
|
2019-08-23 11:21:35 +02:00 |
|
Alexandre BODIN
|
21b00053e8
|
Merge branch 'develop' into front/ctb-qa
|
2019-08-22 16:24:23 +02:00 |
|
Alexandre BODIN
|
ad1cee6469
|
Merge branch 'master' into develop
|
2019-08-22 16:06:05 +02:00 |
|
soupette
|
70117b4aa7
|
Fix edit name content types
|
2019-08-22 14:38:45 +02:00 |
|
soupette
|
fd7f004da9
|
Fix ctb design QA
|
2019-08-20 16:06:52 +02:00 |
|
Vladislav Umrikhin
|
58ae4dd340
|
Update RU translation in strapi-plugin-content-type-builder
Removed unnecessary capital letters
|
2019-08-19 04:53:28 +10:00 |
|