910 Commits

Author SHA1 Message Date
Jan Brachhold
d986055fb8 Update german translations 2018-04-11 21:19:31 +02:00
Jim Laurie
bdd1583543 Handle polymorphic in admin
Only for collection: * poly side
2018-04-10 14:46:36 +02:00
soupette
9e9353cba4 Fix count number on delete 2018-04-09 15:58:22 +02:00
soupette
c562c79430 Fix lag in preview 2018-04-09 15:52:58 +02:00
soupette
ff4253aeea Fix conflict and fix focus bug in WYSIWYG 2018-04-04 17:51:41 +02:00
Jim LAURIE
b9eea87885
Merge branch 'master' into ctb-default-value 2018-04-02 11:27:56 +02:00
soupette
7d718c9627 Add react-loadable and fix wysiwyg css 2018-04-02 11:18:05 +02:00
soupette
86bc73e9d1 Fix conflict 2018-04-02 09:50:58 +02:00
Inder Redni
1e914be7b7 polish language | update 2018-03-30 19:00:06 +02:00
soupette
0c8769138c Fix conflict 2018-03-30 13:00:03 +02:00
cyril lopez
37eedd5747 Fix pagination 2018-03-27 10:27:50 +02:00
cyril lopez
b1e39929de Fixes #850 2018-03-27 10:13:13 +02:00
cyril lopez
f6c0061334 Allow default values for attributes 2018-03-26 15:25:32 +02:00
cyril lopez
4704d0c004 Add default value when creating a record in ctm 2018-03-26 12:31:48 +02:00
cyril lopez
8be6df24b3 Fix PR feedback 2018-03-23 17:11:10 +01:00
cyril lopez
0952c9aaa9 Add new layout dynamic 2018-03-19 12:30:04 +01:00
cyril lopez
67cb54ae12 Add request to fetch layout in ctm 2018-03-19 11:57:47 +01:00
cyril lopez
03195550aa Fix edit user 2018-03-13 09:28:17 +01:00
cyril lopez
1187605c2a
Remove comments 2018-03-12 13:30:41 +01:00
cyril lopez
a474d8d389 Fix ctm layout bug 2018-03-12 12:45:00 +01:00
Jim Laurie
117d9534c9 Remove logs 2018-03-08 10:11:06 +01:00
Aurelsicoko
800945eb32 Resolve conflicts 2018-03-06 15:50:41 +01:00
cyril lopez
e4e65658e6 Add animation when uploading files 2018-03-06 14:02:56 +01:00
cyril lopez
627e241c94 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-06 09:33:12 +01:00
cyril lopez
3e32741114 Add loading button to ctm and to upload && modify design 2018-03-06 09:31:44 +01:00
Aurelsicoko
670f1d8434 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-05 18:40:57 +01:00
Jim Laurie
be7e95b48c Add createdAt updatedAt for mongoose 2018-03-05 17:26:55 +01:00
Aurelsicoko
2f69111506 Merge branch 'master' of github.com:strapi/strapi into feature/upload 2018-03-05 16:23:17 +01:00
Jim LAURIE
03a540631c
Merge branch 'master' into fix-upload-front 2018-03-05 14:52:18 +01:00
Aurelsicoko
d7aa3eef7e Resolve conflicts 2018-03-02 14:21:51 +01:00
Aurelsicoko
b896d96061 Fix one file upload input 2018-03-02 11:49:23 +01:00
Joseph Wang
a9ba025b24 add some chinese translation fix 2018-03-02 18:43:03 +08:00
cyril lopez
247d308e26 Fix ctm formvalidations
This logic needs to be redone
Fix overflow on upload list
2018-03-01 22:51:48 +01:00
cyril lopez
c22a1cc39c Check if the relation is manyToManyMorph in order to send the correct object when deleting a file 2018-03-01 22:03:23 +01:00
cyril lopez
51058d6e9b Send empty array when removing file 2018-03-01 18:34:29 +01:00
Joseph Wang
f35b2519ba language hot fix 2018-03-01 16:30:44 +08:00
Joseph Wang
a6bf74c622 finish adding traditional chinese translations 2018-03-01 11:50:33 +08:00
cyril lopez
338385bea3 Handle upload with object 2018-02-28 18:49:19 +01:00
Aurelsicoko
03668670dc Handle upload from the Content Manager side 2018-02-27 17:38:59 +01:00
Aurelsicoko
2838b09aad Reuse already declared variable 2018-02-27 16:54:54 +01:00
cyril lopez
a6502d15c5 Change the type of sent data in the EditPage saga 2018-02-27 16:24:46 +01:00
cyril lopez
d454530800 Rebase saga EditPage 2018-02-27 15:46:36 +01:00
cyril lopez
b2a2afa3e3 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-02-27 14:33:14 +01:00
Aurelsicoko
ab108a6f93 Create & handle association between File upload and others models 2018-02-27 11:52:18 +01:00
cyril lopez
6bc6862b14 Add ordering to displayed fields in ctm 2018-02-26 18:33:19 +01:00
cyril lopez
8d176dee31 Fix bug when adding a file 2018-02-26 16:24:55 +01:00
cyril lopez
880cb6a896 Display input file in content manager 2018-02-26 16:04:59 +01:00
cyril lopez
4ac9d52f7a Break ctm to remove picture relation from the right sided component 2018-02-26 14:53:13 +01:00
cyril lopez
c95d413716 Delete useless components in ctm and remove redux from app container in upload 2018-02-23 11:06:30 +01:00
cyril lopez
91f9482480 Fix css GlobalPagination 2018-02-22 18:54:24 +01:00