Alexandre Bodin
|
b9122edf0d
|
Rename groups to components
|
2019-11-13 18:49:02 +01:00 |
|
Alexandre Bodin
|
b2e0ec5d1f
|
v3.0.0-beta.17.5
|
2019-11-04 17:52:02 +01:00 |
|
Alexandre Bodin
|
7a61db7285
|
v3.0.0-beta.17.4
|
2019-10-23 15:11:30 +02:00 |
|
Alexandre Bodin
|
9280cf9cd7
|
Merge branch 'master' into develop
|
2019-10-22 11:15:09 +02:00 |
|
Alexandre Bodin
|
3ddd383c30
|
v3.0.0-beta.17.3
|
2019-10-22 11:05:52 +02:00 |
|
soupette
|
6a852ad6cb
|
Fix conflicts
|
2019-10-18 15:51:44 +02:00 |
|
Alexandre Bodin
|
b6feabf689
|
v3.0.0-beta.17.2
|
2019-10-18 13:42:22 +02:00 |
|
Alexandre Bodin
|
f0ad2ab52c
|
Merge branch 'master' into develop
|
2019-10-16 14:16:52 +02:00 |
|
Alexandre Bodin
|
9f0713649b
|
v3.0.0-beta.17.1
|
2019-10-16 11:42:54 +02:00 |
|
Alexandre Bodin
|
7c8eda443e
|
v3.0.0-beta.17
|
2019-10-16 10:40:18 +02:00 |
|
soupette
|
beef6e5510
|
Fix conflicts
|
2019-10-10 06:34:31 +02:00 |
|
soupette
|
75abb17f0f
|
Fix conflicts
|
2019-10-08 09:17:47 +02:00 |
|
Alexandre Bodin
|
2d04d25097
|
v3.0.0-beta.16.8
|
2019-10-04 11:57:46 +02:00 |
|
cyril lopez
|
39988b3efb
|
Merge branch 'master' into develop
|
2019-10-03 10:47:25 +02:00 |
|
Alexandre Bodin
|
dbd621e6d8
|
v3.0.0-beta.16.7
|
2019-10-01 12:15:48 +02:00 |
|
soupette
|
691f8a6318
|
Merge branch 'develop' of github.com:strapi/strapi into stm/update
|
2019-09-27 16:26:21 +02:00 |
|
soupette
|
6f8b23d254
|
Fix conflicts
|
2019-09-27 16:26:09 +02:00 |
|
cyril lopez
|
ad662544a2
|
Merge branch 'develop' into styled-components/documentation
|
2019-09-27 15:43:52 +02:00 |
|
Alexandre Bodin
|
6305bee43b
|
v3.0.0-beta.16.6
|
2019-09-26 14:35:06 +02:00 |
|
cyril lopez
|
c2a152c9b4
|
Merge branch 'master' into styled-components/documentation
|
2019-09-23 19:46:07 +02: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 |
|
Alexandre Bodin
|
548c77aebf
|
Pass group associations as second param
|
2019-09-17 10:18:34 +02:00 |
|
cyril lopez
|
8657453ea2
|
Merge branch 'master' into eslint-update
|
2019-09-17 10:11:11 +02:00 |
|
Alexandre Bodin
|
36e4e73ad3
|
v3.0.0-beta.16.3
|
2019-09-13 15:08:44 +02:00 |
|
soupette
|
5fa0973459
|
Merge branch 'master' of github.com:strapi/strapi into styled-components/documentation
|
2019-09-12 17:43:37 +02: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 |
|
Alexandre Bodin
|
32b8e4174b
|
Fix json type and add groups
|
2019-09-10 16:54:50 +02:00 |
|
Alexandre Bodin
|
e07d83a89b
|
Add richtext
|
2019-09-10 16:54:50 +02:00 |
|
Alexandre Bodin
|
7d51b8625d
|
v3.0.0-beta.16.1
|
2019-09-10 16:33:22 +02:00 |
|
soupette
|
e43db1d717
|
Migrate documentation admin to styled-components
|
2019-09-10 15:42:10 +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 |
|
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 |
|
Abdón Rodríguez Davila
|
1015540af9
|
Update koa dependencies
|
2019-09-09 14:39:57 +02:00 |
|
Alexandre Bodin
|
05597970fa
|
v3.0.0-beta.16
|
2019-09-09 13:35:57 +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 |
|
Alexandre Bodin
|
7c5f1484ba
|
Use koa-router and fix graphql-uploads
|
2019-08-22 15:04:27 +02:00 |
|
soupette
|
d52d4f603f
|
Upgrade react deps
|
2019-08-13 11:22:36 +02:00 |
|
Alexandre Bodin
|
3b47457f4f
|
make boostrap functions async only
|
2019-08-12 15:35:40 +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 |
|
Alexandre Bodin
|
7520961d27
|
Merge branch 'master' into develop
|
2019-08-06 13:49:10 +02:00 |
|
davidkartuzinski
|
dbda6dff1d
|
edited my-app to be my-project to keep it consistent with docs
|
2019-08-02 19:15:43 +02:00 |
|
soupette
|
fbf5bd851f
|
Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view
|
2019-07-25 18:07:52 +02:00 |
|
Alexandre Bodin
|
04d4b60056
|
Merge branch 'master' into develop
|
2019-07-25 15:05:07 +02:00 |
|
Alexandre Bodin
|
6a34fe519c
|
v3.0.0-beta.14
|
2019-07-25 12:00:42 +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 |
|