Commit Graph

18 Commits

Author SHA1 Message Date
Spen 6c514770bc solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
Harry Bomrah 9c7558847a bilingual fixed for all the plugins in desktop 2013-08-12 12:28:58 +08:00
Harry Bomrah d0ef862f85 language changes and conferences add/edit bug fixed 2013-08-12 12:28:46 +08:00
Harry Bomrah e3d9966f76 bugs fixed for plugins. .. and also css fixed 2013-08-06 17:53:04 +08:00
Harry Bomrah 7d288b4160 some changes in file selection 2013-08-06 17:52:50 +08:00
Harry Bomrah c2f223b82c new plugins added for desktop 2013-08-06 17:52:39 +08:00
Matthew K. Fu JuYuan d047a3d62a chris tags update 2013-04-26 11:26:10 +08:00
chris b864cc0268 Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
Spen d7d480ac12 archive edit & plugins edit 2013-03-07 21:12:31 +08:00
unknown a7bc19768e member list edit 2013-02-20 11:12:08 +08:00
chris de39bce4ce Fix the tooltips 2013-01-11 12:13:16 +08:00
chris dc3be3c9a1 Translation changes 2012-12-03 23:00:04 +08:00
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
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
unknown a4c94c4404 demo site plugin 2012-10-08 16:20:21 +08:00