Jim LAURIE
0988841ee0
Merge branch 'master' into improve-reactintl
2018-03-01 15:24:38 +01:00
Jim LAURIE
d5ea6a5b64
Merge pull request #716 from strapi/upload-config-front
...
Upload config front
2018-03-01 15:24:23 +01:00
Jim LAURIE
520373d047
Merge branch 'master' into upload-config-front
2018-03-01 15:06:10 +01:00
Jim LAURIE
4ebcbcf409
Merge pull request #715 from strapi/add-media-ctb
...
Add media ctb
2018-03-01 15:05:48 +01:00
Jim LAURIE
a1ab33660b
Merge branch 'master' into add-media-ctb
2018-03-01 14:45:14 +01:00
Jim LAURIE
9b67868c8d
Merge pull request #708 from Froelund/patch-1
...
Update logger.js
2018-03-01 14:45:01 +01:00
Jim LAURIE
7e4effdb94
Merge branch 'master' into patch-1
2018-03-01 13:59:11 +01:00
cyril lopez
3d824bf6c5
Add locales to plugin generators
2018-03-01 13:51:10 +01:00
Jørgensen
2301f2c5e5
Update logging.md
2018-03-01 13:44:25 +01:00
Jim LAURIE
e0274cea50
Merge pull request #713 from rockmandash/Chinese-Translation
...
Add Traditional Chinese Translation
2018-03-01 13:44:07 +01:00
Kristian Frølund
d4e7a02e58
Merge branch 'master' into patch-1
2018-03-01 13:39:45 +01:00
Kristian Frølund
dc30ed4d90
Merge branch 'master' into patch-1
2018-03-01 13:38:57 +01:00
Kristian Frølund
72c830e24e
Added logging documentation
2018-03-01 13:36:54 +01:00
cyril lopez
b7d2af3ba2
Take en default translation message if there are not present in the current locale
...
This fix aims to improve and facilitate the upcoming new language pull requests.
It also remove the missing id error message in the console when developing on port 4000
2018-03-01 13:12:22 +01:00
Jim LAURIE
9852794ee4
Merge branch 'master' into Chinese-Translation
2018-03-01 13:03:18 +01:00
Jim Laurie
bed6d144f9
Fix PR feedback
...
More dynamic code
Fix typo
2018-03-01 12:55:31 +01:00
Jim LAURIE
cf0b7dba22
Merge pull request #703 from strapi/alpha.10.3
...
Alpha.10.3
2018-03-01 11:54:47 +01:00
Jim LAURIE
d67d09ef90
Merge branch 'master' into alpha.10.3
2018-03-01 11:37:05 +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
8878b13e43
Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload
2018-02-28 18:50:48 +01:00
cyril lopez
338385bea3
Handle upload with object
2018-02-28 18:49:19 +01:00
Aurelsicoko
85fb0f5919
Fix non-polymorphic relations in strapi-bookshelf
2018-02-28 18:10:30 +01:00
cyril lopez
eb99d258ed
Merge branch 'master' of github.com:strapi/strapi into upload-config-front
2018-02-28 18:01:17 +01:00
cyril lopez
4d21ade9b5
Prevent from displaying the media field if the upload pliugin is not installed
2018-02-28 17:58:58 +01:00
cyril lopez
1d85c459fa
Merge branch 'add-media-ctb' of github.com:strapi/strapi into fix-ctb
2018-02-28 17:44:12 +01:00
cyril lopez
a9d794c601
Prevent inputText breaking if placeholder empty
2018-02-28 17:43:59 +01:00
Jim LAURIE
a07d1a1205
Merge pull request #714 from TheWebsDoor/ISSUE-689
...
ISSUE 689 - Fix /user/me and ctx.state.user doesn't return OneToMany …
2018-02-28 17:36:08 +01:00
cyril lopez
e1e7f68f4b
Enable upload providers configuration
2018-02-28 17:11:44 +01:00
Adrien Lepoutre
1110fe7df2
ISSUE 689 - Fix /user/me and ctx.state.user doesn't return OneToMany relations properly
2018-02-28 10:35:28 -05:00
cyril lopez
696cf002d5
Display dynamic form for upload providers
2018-02-28 16:20:23 +01:00
Joseph Wang
036b904472
Add Tranditional Chinese Translation
2018-02-28 22:59:20 +08: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
Jim LAURIE
123a498920
Merge pull request #699 from abdonrd/patch-1
...
Avoid username capitalize
2018-02-28 11:08:50 +01:00
cyril lopez
03ee9f10fb
Add configurations to list-plugins page
2018-02-28 10:50:07 +01:00
Aurelsicoko
87372c516a
Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload
2018-02-27 18:58:17 +01:00
Aurelsicoko
cfef18ea6b
Remove relationship where a file is removed
2018-02-27 18:57:28 +01:00
cyril lopez
4c6343bed6
Get app env from the context
2018-02-27 18:43:33 +01:00
cyril lopez
8a33b6cea2
Fix bug delete picture and fix ImgPreview slider
2018-02-27 18:26:16 +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
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
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
