yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 12:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,947 Commits 117 Branches 489 Tags
Commit Graph

8947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
soupette
7699dc446a Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-31 16:50:16 +02:00
soupette
aecf76a1a1 Clean code according to feedback 2019-07-31 16:50:05 +02:00
soupette
e30d2be60d Change ctb menu link with uid instead of destination 2019-07-31 16:31:35 +02:00
soupette
1cd77c3702 Add source to layout link 2019-07-31 16:29:04 +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
soupette
2a229141f1 Fix dropdown list label picker 2019-07-31 16:03:59 +02:00
soupette
0a3b692a87 Fixes #2866 2019-07-31 15:22:37 +02:00
soupette
07fbfecc87 Fixes #2882 2019-07-31 15:01:23 +02:00
soupette
7a4ea92199 Fixes #2893 2019-07-31 14:58:53 +02:00
soupette
887f533466 Fixes #1457 2019-07-31 14:27:17 +02:00
soupette
3eb9c7395b Fix content type deletion in content type builder 2019-07-31 14:12:04 +02:00
soupette
2da64c084f Remove useless content types 2019-07-31 14:07:20 +02:00
soupette
395ced57df Add doc about tutorial videos 2019-07-31 14:06:31 +02:00
soupette
4267841884 Fix PR feedback 2019-07-31 14:01:33 +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
soupette
5c97f4070a Change wysiwyg to richtext 2019-07-31 11:45:08 +02:00
soupette
e9d74f16d2 Clean code and fix minor bugs 2019-07-30 17:41:14 +02:00
soupette
7d0394070f Fix side effects for upload 2019-07-30 17:25:18 +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
soupette
87ddd2980b Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-30 16:18:31 +02:00
soupette
91609cd713 Handle upload and send data 2019-07-30 16:18:11 +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
davidkartuzinski
8296825817 Removed the Articles page. Most links are to outdated articles and blog posts. 2019-07-30 15:10:49 +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
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