yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-27 19:10:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,194 Commits 111 Branches 486 Tags
Commit Graph

138 Commits

Author SHA1 Message Date
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
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
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
soupette
1157f6ae75 Created React select one 2019-07-16 19:00:00 +02:00
Alexandre BODIN
cd634fc038
Merge branch 'master' into patch-1 2019-07-15 18:47:51 +02:00
Alexandre Bodin
1720445986 v3.0.0-beta.13 2019-07-15 17:07:07 +02:00
Abdón Rodríguez Davila
231757acb6 Update engines configuration from documentation plugin 2019-07-15 11:17:14 +02:00
Alexandre Bodin
b087cbab34 v3.0.0-beta.12 2019-07-15 10:24:28 +02:00
Louis Augry
08e2f47800
Merge branch 'master' into fix-documentation-typo 2019-07-10 15:11:52 +02:00
Alexandre Bodin
3a94c7ea90 v3.0.0-beta.11 2019-07-10 15:09:03 +02:00
Alexandre Bodin
abef483bc4 v3.0.0-beta.10 2019-07-09 09:05:35 +02:00
Louis Augry
a3fe9d5a38 Fix documention typo 2019-07-08 15:10:17 +02:00
soupette
9b5dd83117 Fix conflicts 2019-07-04 18:50:31 +02:00
soupette
61fb728986 Fix conflicts 2019-07-04 18:43:30 +02:00
virginieky
f5a3ccbe38
Merge branch 'develop' into front/repeatable-homepage 2019-07-02 15:52:18 +02:00
Alexandre Bodin
9c1a834e27 v3.0.0-beta.9 2019-07-02 15:14:44 +02:00
soupette
6d7c1b90ac Fix lint 2019-07-02 14:44:13 +02:00
Alexandre Bodin
0112a9726a v3.0.0-beta.8 2019-06-27 19:40:33 +02:00
Alexandre Bodin
eee69452ea v3.0.0-beta.7 2019-06-21 14:34:56 +02:00
Alexandre Bodin
76d9fe8060 v3.0.0-beta.6 2019-06-18 14:54:45 +02:00
Alexandre Bodin
c5dc672cc7 Only use keys from settings.json to create documentation files, fix array concat only for routes in extensions 2019-06-16 14:44:24 +02:00
soupette
28c9339ace Finish Homepage 2019-06-13 18:20:51 +02:00
Alexandre BODIN
9eafb79b35
Merge branch 'master' into fix/documentation-settings 2019-06-13 17:45:59 +02:00
Alexandre Bodin
4ec50ca3fc v3.0.0-beta.5 2019-06-13 17:19:33 +02:00
Jim LAURIE
2b092ada12 Fix load settings 2019-06-13 17:12:49 +02:00