yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 09:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,454 Commits 115 Branches 488 Tags
Commit Graph

3454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
1688e01be9 Display WYSIWYG in ctb 2018-03-09 12:10:58 +01:00
cyril lopez
828e808fa8 Add select titles 2018-03-08 18:55:49 +01:00
cyril lopez
0f6c3192fc Remove useless const 2018-03-08 15:50:28 +01:00
cyril lopez
ffbc3298c8 Add header controls 2018-03-08 14:24:26 +01:00
cyril lopez
edc9f82b34 Add controls to wysiwyg start to fix eslint for helper components 2018-03-08 12:56:44 +01:00
cyril lopez
37c31ed3f0 Handle Wysiwyg reset value 2018-03-06 21:32:48 +01:00
cyril lopez
19c5e46f69 Add controls 2018-03-06 18:20:05 +01:00
cyril lopez
abc4598aa7 Init Wysiwyg focus and value 2018-03-05 19:23:06 +01:00
cyril lopez
3e468a1b9c Wysiwyg is coming 2018-03-05 14:30:28 +01:00
Jim LAURIE
eab59ad395
Merge pull request #725 from rockmandash/Fix-some-Chinese-Translation 
add some chinese translation fix
 2018-03-03 13:10:04 +01:00
Joseph Wang
a9ba025b24 add some chinese translation fix 2018-03-02 18:43:03 +08:00
Jim Laurie
354a69c5f3 Hotfix strapi.log 2018-03-01 16:53:58 +01:00
Jim LAURIE
359c48e301
Merge pull request #719 from strapi/update-generators 
Add locales to plugin generators
 2018-03-01 16:21:04 +01:00
Jim LAURIE
952024373e
Merge branch 'master' into update-generators 2018-03-01 15:53:39 +01:00
Jim LAURIE
036c0d7584
Merge pull request #718 from strapi/improve-reactintl 
Take en default translation message if there are not present in the c…
 2018-03-01 15:52:09 +01:00
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
eb99d258ed Merge branch 'master' of github.com:strapi/strapi into upload-config-front 2018-02-28 18:01:17 +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
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
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
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