211 Commits

Author SHA1 Message Date
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
36cf601a84 Format updatedAt date in file list 2018-03-05 17:37:48 +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
Aurelsicoko
be40cd7392 Update icon upload plugin 2018-03-05 15:51:26 +01:00
Aurelsicoko
06181c3f09 Update icon color 2018-03-05 15:25:13 +01:00
Aurelsicoko
48694067be Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-05 14:56:23 +01:00
cyril lopez
71e4009317 Fix css and add redirection when modofiying the upload provider 2018-03-05 12:28:29 +01:00
Aurelsicoko
cf08bf43e5 Update plugin menu name 2018-03-05 11:07:37 +01:00
Aurelsicoko
5f0618f94c Add icon plugin upload 2018-03-02 15:08:42 +01:00
Aurelsicoko
d7aa3eef7e Resolve conflicts 2018-03-02 14:21:51 +01:00
cyril lopez
2f90e52e6a Fix translation typo 2018-03-02 09:28:53 +01: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
Jim LAURIE
952024373e
Merge branch 'master' into update-generators 2018-03-01 15:53:39 +01:00
Jim LAURIE
520373d047
Merge branch 'master' into upload-config-front 2018-03-01 15:06:10 +01:00
Jim LAURIE
a1ab33660b
Merge branch 'master' into add-media-ctb 2018-03-01 14:45:14 +01:00
cyril lopez
3d824bf6c5 Add locales to plugin generators 2018-03-01 13:51:10 +01:00
cyril lopez
dd3e83596c Fix PR review 2018-03-01 11:34:55 +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
e1e7f68f4b Enable upload providers configuration 2018-02-28 17:11:44 +01:00
cyril lopez
696cf002d5 Display dynamic form for upload providers 2018-02-28 16:20:23 +01:00
Aurelsicoko
cde39a8609 Add/remove file from Content-Manager & move logic into the Upload plugin 2018-02-28 15:49:28 +01:00
cyril lopez
439e9723b6 Fix conflict 2018-02-28 15:06:55 +01:00
cyril lopez
911bbce5f0 Default view for EditForm component 2018-02-28 14:57:45 +01:00
cyril lopez
7e647e002c Created EditForm component
Init ConfigPage get data and reset form logic
2018-02-28 12:46:12 +01:00
Aurelsicoko
19b1574f00 Start to handle polymorphic association update in Content Manager (mongoose only) 2018-02-28 12:33:32 +01:00
cyril lopez
9c1b1e661c Created shared HeaderNav component
Init design upload ConfigPage
Add shared translations for buttons
2018-02-28 11:38:50 +01:00
cyril lopez
03ee9f10fb Add configurations to list-plugins page 2018-02-28 10:50:07 +01:00
cyril lopez
4c6343bed6 Get app env from the context 2018-02-27 18:43:33 +01:00
cyril lopez
da7382292c Add redux to admin page so we can get the app environments required for the upload config settings 2018-02-27 17:45:12 +01:00
Aurelsicoko
0434ff5be0 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-02-27 16:53:47 +01:00
Aurelsicoko
dac8931676 Handle association on upload route 2018-02-27 16:53:06 +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
Özgür ERSOY
f8605e5037
new texts translated 2018-02-26 21:47:16 +03:00
cyril lopez
6bc6862b14 Add ordering to displayed fields in ctm 2018-02-26 18:33:19 +01:00
Jim Laurie
7af7922f2b Backend content type builder media type
Co-authored-by: soupette <cyril.lpz@gmail.com>
2018-02-26 16:33:27 +01:00
Jim Laurie
0d7a66b19f Merge branch 'feature/upload' of github.com:strapi/strapi into add-media-ctb 2018-02-26 14:53:19 +01:00
cyril lopez
77800ced88 Create ConfigPage container 2018-02-26 12:16:15 +01:00
cyril lopez
2f84afc0c7 Fix upload plugin build
The issue was due to the ref I was using
2018-02-26 11:39:50 +01:00
Aurelsicoko
7e6b762c58 Merge branch 'master' of github.com:strapi/strapi into feature/upload 2018-02-26 11:14:24 +01:00
Aurelsicoko
e63a1f19fc Handle empty relationships on morph side 2018-02-26 11:12:49 +01:00
cyril lopez
56466a4bc0 Fix typos 2018-02-26 10:55:41 +01:00
cyril lopez
b2b5ff5fb0 Merge branch 'master' of github.com:strapi/strapi into file-upload-front 2018-02-26 10:55:11 +01:00
Jim Laurie
6c4e837c7c Hotfix users models relations 2018-02-24 14:35:12 +01:00
cyril lopez
e2bc04b66f Merge branch 'master' of github.com:strapi/strapi into file-upload-front 2018-02-23 17:01:49 +01:00
cyril lopez
23f4dc27cd Fix turkish translation conflict 2018-02-23 15:47:46 +01:00