yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,524 Commits 129 Branches 498 Tags
Commit Graph

8524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
f722348749 clean up 2019-07-30 13:06:43 +02:00
Alexandre Bodin
fd54e71baf bookshelf clean populate 2019-07-30 13:06:43 +02:00
Alexandre Bodin
72c7203e18 Init populate cleanup 2019-07-30 13:06:28 +02:00
Jim LAURIE
abf3954b7b
Merge pull request #3669 from ferretdayo/fix/translate_ja_docs 
Update JA translation
 2019-07-29 20:41:42 +02:00
Jim LAURIE
ecc6e66083
Merge branch 'develop' into fix/translate_ja_docs 2019-07-29 20:41:24 +02:00
Alexandre Bodin
8e8433662b rename wysiwyg type to richtext for future plans 2019-07-29 18:05:18 +02:00
Alexandre BODIN
e4a88a00d9
Merge pull request #3681 from strapi/group/handle-relations 
Handle relations in groups
 2019-07-29 08:44:44 +02:00
Alexandre Bodin
8835beb67a Cleanup unwanted log 2019-07-29 08:15:19 +02:00
Alexandre Bodin
f484b4d66e Make groups non repeatable by default 2019-07-29 08:15:18 +02:00
Alexandre Bodin
f757d4d952 Support relations inside of group creation 2019-07-29 08:15:18 +02:00
Alexandre Bodin
9245c32c70 Create relations in groups bookshelf 2019-07-29 08:15:17 +02:00
Alexandre BODIN
56e56f8ce4
Merge pull request #3685 from strapi/content-type-builder/rename-store-key 
Rename content manager configuration key on model uid changes
 2019-07-29 08:14:15 +02:00
Alexandre Bodin
855a923ca0 Fix tests 2019-07-28 19:27:53 +02:00
Alexandre Bodin
59523d47e7 Rename content manager configuration key an model uid changes 2019-07-26 17:53:03 +02:00
Alexandre Bodin
1d09999586 Fix search in content-manager 2019-07-26 10:57:27 +02:00
Alexandre Bodin
04d4b60056 Merge branch 'master' into develop 2019-07-25 15:05:07 +02:00
Alexandre BODIN
799964d629
Merge pull request #3680 from strapi/feature/groups-content-type-builder-updates 
Feature/groups content type builder updates
 2019-07-25 15:02:56 +02:00
Alexandre Bodin
f6f201286e Remove unnecessary comment 2019-07-25 14:08:54 +02:00
Alexandre Bodin
82ab2a98e9 remove unused parameter 2019-07-25 14:07:58 +02:00
Alexandre Bodin
89f07bf37a Update content types when groups are updated 2019-07-25 14:05:06 +02:00
Alexandre Bodin
6a34fe519c v3.0.0-beta.14 v3.0.0-beta.14 2019-07-25 12:00:42 +02:00
Alexandre Bodin
76daff3284 Update groups when content types change 2019-07-25 11:55:58 +02:00
Alexandre Bodin
e7b7cf5198 remove capitalize group file 2019-07-25 11:52:40 +02:00
Alexandre Bodin
73e1a94b7e Fix broken onWays and manyWays on content type rename 2019-07-25 11:29:05 +02:00
Alexandre Bodin
06c2a9e79d Update schemaValidation in Content manager 2019-07-25 08:02:10 +02:00
Jim LAURIE
6a3388267b
Merge pull request #3674 from strapi/docs/remote-i18n-example 
Remove i18n example
 2019-07-24 16:34:42 +02:00
Jim LAURIE
4540905d84 Remove i18n example 2019-07-24 16:28:38 +02:00
Alexandre Bodin
2efaa08394 Use wysiwyg in example article type 2019-07-24 14:37:50 +02:00
Alexandre Bodin
9876c339ce Recompute layout sizes 2019-07-24 14:35:21 +02:00
Alexandre BODIN
175fba4441
Merge pull request #3672 from strapi/content-manager/group-layout-updates 
Update content-manager schemas
 2019-07-24 13:59:11 +02:00
Alexandre Bodin
70bf99a65b Update content-manager schemas 2019-07-24 11:51:35 +02:00
Alexandre BODIN
59b3bca644
Merge pull request #3670 from strapi/groups/groups-ctb-relations 
Refactor groups CTB and clean code. Support relations
 2019-07-23 19:58:27 +02:00
Alexandre Bodin
4093fe46b1 Fix tests 2019-07-23 19:43:47 +02:00
Alexandre Bodin
fba38d2c6d Fix typos 2019-07-23 19:30:15 +02:00
Alexandre Bodin
5c63405091 Refactor groups CTB and clean code. Support relations 2019-07-23 19:28:37 +02:00
Alexandre BODIN
084a91300f
Merge pull request #3668 from strapi/chore/new-content-manager-schemas 
New content manager schemas + wysiwyg type
 2019-07-23 19:26:09 +02:00
Alexandre Bodin
d6255be74e Clear unnecessary comment 2019-07-23 18:58:46 +02:00
Tsuruda
8cf2179dfc
Merge branch 'develop' into fix/translate_ja_docs 2019-07-24 00:16:19 +09:00
ferretdayo
1f1fbbf34d fix: typo of ja translation 2019-07-24 00:09:44 +09:00
Alexandre Bodin
263ebb4480 Add missing check 2019-07-23 14:26:55 +02:00
Alexandre Bodin
48e45c5e01 Cleanup layout.js files 2019-07-23 13:45:08 +02:00
Alexandre Bodin
1dea89ca8f Support type wysiwyg instead of appearance param 2019-07-23 13:36:06 +02:00
Alexandre Bodin
3fdc149767 Fix count route order 2019-07-23 13:08:43 +02:00
Alexandre Bodin
1fa399cfd2 Add attributes tests 2019-07-23 12:45:54 +02:00
Jim LAURIE
9ba1c87e5a
Merge pull request #3624 from strapi/mongo-docs-upgrade 
MongoDB Atlas documentation update in database and deployment
 2019-07-23 12:29:44 +02:00
Jim LAURIE
a894acd004
Merge branch 'master' into mongo-docs-upgrade 2019-07-23 12:28:35 +02:00
Alexandre BODIN
e607ee067e
Merge pull request #3646 from strapi/fix/2867 
Fix graphql me query on sql databases
 2019-07-23 11:59:17 +02:00
Alexandre BODIN
2e9a604a34
Merge branch 'master' into fix/2867 2019-07-23 11:36:53 +02:00
Jim LAURIE
90f4865646
Merge branch 'master' into mongo-docs-upgrade 2019-07-23 11:24:07 +02:00
Alexandre Bodin
5f36278ec1 Clean up content manager configuration code and init tests 2019-07-23 11:21:17 +02:00