yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 02:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,565 Commits 121 Branches 507 Tags
Commit Graph

8565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Virginie Ky
e6589ce6c6 merge develop and regex validation 2019-08-01 17:42:20 +02:00
Virginie Ky
30985f9553 Attributes and relation Modals UI fix 2019-08-01 16:45:57 +02:00
Alexandre BODIN
5f9c5341c2
Merge pull request #3707 from strapi/chore/upgrade-koa-body 
Upgrade koa-body version to latest
 2019-08-01 12:20:04 +02:00
Alexandre Bodin
184490a07d Upgrade koa-body version to latest 2019-08-01 07:50:06 +02:00
Alexandre BODIN
a9c9fdbbec
Merge pull request #3702 from strapi/chore/content-type-builer-yup-attributes 
Groups content type builer attributes validation
 2019-08-01 07:49:29 +02:00
Virginie Ky
8342dc79a7 ListRow and ListRowCollapse UI 2019-07-31 23:25:34 +02:00
Virginie Ky
2e8dc352ad prompt test fiw 2019-07-31 19:17:32 +02:00
Virginie Ky
ef74880a6b prompt 2019-07-31 19:08:29 +02:00
Virginie Ky
80a6d62b21 ModelPage groups list 2019-07-31 17:59:14 +02:00
Alexandre Bodin
ea1cf32614 allow negative numbers 2019-07-31 16:54:39 +02:00
Alexandre Bodin
ca5629e4f7 clean Article.settings.json 2019-07-31 16:13:00 +02:00
Alexandre Bodin
c530afa8a3 Validate content-type-buildeer group schema 2019-07-31 16:10:24 +02:00
Alexandre BODIN
81ae3aab1a
Merge pull request #3700 from strapi/feature/content-manager-remove-formdata 
Add content manager upload route and remove formdata in favor of JSON only
 2019-07-31 14:00:34 +02:00
Alexandre BODIN
436347cf76
Merge branch 'develop' into feature/content-manager-remove-formdata 2019-07-31 14:00:09 +02:00
Alexandre BODIN
58a820e5b7
Merge pull request #3699 from strapi/feature/group-mainfield-no-id 
Set group default mainField not id unless no attributes
 2019-07-31 13:59:55 +02:00
Alexandre Bodin
c5e50665cd Add upload route in content-manager and remove formdata for data creation 2019-07-30 16:58:36 +02:00
Alexandre Bodin
dc869ea0b9 Set group default mainField not id unless no attributes 2019-07-30 16:58:26 +02:00
Alexandre Bodin
c8f72df4d5 Remove unnecessary default populates 2019-07-30 16:50:11 +02:00
Virginie Ky
ea77cdb587 ManyWay relation add and edit from a model 2019-07-30 16:31:40 +02:00
Alexandre BODIN
cae81baebc
Merge pull request #3697 from strapi/chore/cleanup-group-naming 
Rename slice by group in group feature
 2019-07-30 15:47:58 +02:00
Alexandre Bodin
07a603269d Rename slice by group in group feature 2019-07-30 15:17:44 +02:00
Alexandre Bodin
9f04a97bee Fix morph populate related.related 2019-07-30 15:17:03 +02:00
Alexandre BODIN
63f55d1cbf
Merge pull request #3696 from strapi/feature/populate-groups 
auto populate groups
 2019-07-30 14:59:50 +02:00
Virginie Ky
cb19e1e240 Add and edit new group attribute from ModelPage 2019-07-30 14:18:08 +02:00
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
Virginie Ky
dc8278fd1a merge develop 2019-07-30 11:15:47 +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
Virginie Ky
cc36f55abd Merge develop & redirect after group save 2019-07-29 17:30:39 +02:00
Virginie Ky
f1cdc16728 Edit attribute relation 2019-07-29 16:38:28 +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
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
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
Virginie Ky
4180313360 merge with conflicts fix 2019-07-25 16:07:28 +02:00
Virginie Ky
56af6dd558 Relations creation TU 2019-07-25 16:04:23 +02:00
Alexandre Bodin
04d4b60056 Merge branch 'master' into develop 2019-07-25 15:05:07 +02:00