chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
|
chris
|
b40d4702d5
|
Merge branch 'master' into various_bugs
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
|
2012-11-06 11:44:00 +08:00 |
|
chris
|
fe0e49c3e9
|
Remove a folder in wich Chinese characters
|
2012-11-04 20:32:54 +08:00 |
unknown
|
bd17641d18
|
member plugin list add new
|
2012-11-04 20:24:36 +08:00 |
|
chris
|
63a57682e6
|
Fix bugs:
TinyMCE: the size of the textarea change depending on the language
Page content edit: no tab selected on first load
|
2012-10-30 17:09:00 +08:00 |
|
chris
|
cbfa659928
|
Changes for side_bar
|
2012-10-26 11:19:56 +08:00 |
Harry Bomrah
|
c29955d9e3
|
external commit
|
2012-10-26 11:15:37 +08:00 |
|
chris
|
6b8255f8f8
|
Remove a folder in wich Chinese characters
|
2012-10-26 11:14:13 +08:00 |
|
unknown
|
a4c94c4404
|
demo site plugin
|
2012-10-08 16:20:21 +08:00 |
|
unknown
|
975523c8b2
|
demo site plugin
|
2012-09-24 14:10:44 +08:00 |