yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-30 03:33:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 113 Branches 491 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
72c7203e18 Init populate cleanup 2019-07-30 13:06:28 +02:00
Virginie Ky
dc8278fd1a merge develop 2019-07-30 11:15:47 +02:00
Daniel Kvistgaard
963596e0a8 Readding trailing comma for code consistency 2019-07-30 09:18:58 +02:00
soupette
5e94cf56f7 Fix layout update from ctb 2019-07-30 09:08:10 +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
Virginie Ky
cdf40a2bc1 Groups type in attribute picker modal 2019-07-29 18:09:37 +02:00
Alexandre Bodin
8e8433662b rename wysiwyg type to richtext for future plans 2019-07-29 18:05:18 +02:00
soupette
53d0014dc2 Clean code 2019-07-29 18:02:45 +02:00
soupette
aa7a41e039 Handle mainfield for groups 2019-07-29 17:32:18 +02:00
Virginie Ky
cc36f55abd Merge develop & redirect after group save 2019-07-29 17:30:39 +02:00
soupette
fdd0b0f63d Fix UI 2019-07-29 17:11:53 +02:00
Virginie Ky
f1cdc16728 Edit attribute relation 2019-07-29 16:38:28 +02:00
Daniel Kvistgaard
04b91d9b34 Fix Cloudinary deletion of other files than images 
Fixed by adding a resource_type on the file which is required for the
detroy method. It defaults to 'image', so if it isn't defined then it
will try to remove an image with the passed public_id.
 2019-07-29 15:45:46 +02:00
soupette
61c8e3cc96 Improve field form logic 2019-07-29 14:59:53 +02:00
soupette
fdb0f86fcc Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-29 13:53:13 +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
Casper S
d2575309f5
Swedish Translation 
If this was the wrong way to contribute, please point me in the right direction.
 2019-07-29 00:11:19 +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
soupette
59638c0bf5 Fix description for selects 2019-07-26 14:34:24 +02:00
soupette
c718e15513 Fix reorder 2019-07-26 12:24:15 +02:00
Alexandre Bodin
1d09999586 Fix search in content-manager 2019-07-26 10:57:27 +02:00
soupette
bdfcdb12b2 Fix search 2019-07-26 10:39:51 +02:00
Virginie Ky
a99b241ab5 FeaturePicker UT 2019-07-25 18:50:40 +02:00
Virginie Ky
5c8b368338 Relation box UT 2019-07-25 18:13:19 +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
soupette
c7354f72e8 Fix redirect for settingsview 2019-07-25 18:00:45 +02:00
soupette
30b7b88677 Fix baseline 2019-07-25 17:23:14 +02:00
soupette
afffc8d419 Fix nav between groupfield and group layout 2019-07-25 17:06:34 +02:00
Virginie Ky
d6072e1af6 Relation nature picker TU 2019-07-25 16:51:46 +02:00
Virginie Ky
ec2c52f3c5 CRUD group with API without relations 2019-07-25 16:18:36 +02:00
soupette
69e3eeae4b Add memo where needed 2019-07-25 16:14:50 +02:00
Virginie Ky
4180313360 merge with conflicts fix 2019-07-25 16:07:28 +02:00
soupette
cf01c6b4cc Rename ItemTypes file 2019-07-25 16:06:45 +02:00
Virginie Ky
56af6dd558 Relations creation TU 2019-07-25 16:04:23 +02:00
soupette
9f4bb0cfe2 Remove useless files, fix json validations 2019-07-25 15:52:30 +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
soupette
386c5a5776 Add disabled options to selects 2019-07-25 13:44:35 +02:00
soupette
fa5096e3c5 Fix failing tests 2019-07-25 12:22:41 +02:00
soupette
a2dc4b22d1 Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-25 12:07:01 +02:00