Commit Graph

129 Commits

Author SHA1 Message Date
Bernie Chiu 8fcb9d2124 Translations for search engine 2013-12-24 12:55:56 +08:00
Bernie Chiu 37957c54ef Translations for mobile setting
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
2013-12-24 12:55:43 +08:00
thomaschen 66907d0ab9 add details for button in site info
Conflicts:
	config/locales/en.yml
2013-12-23 09:56:36 +08:00
thomaschen bc7ad1356a add Chinese version sidebar Menu in Site Setting 2013-12-20 18:45:20 +08:00
Manson Wang afb5afeceb Added multi-phone numbers in mobile setting page and fixed language setting 2013-12-12 16:07:27 +08:00
saurabhbhatia e87c678eb7 Channel Videos Mobile Sites Partial 2013-12-03 15:50:27 +08:00
saurabhbhatia 35ce0fda6e Enable Mobile Added to Site preferences 2013-11-20 16:21:05 +08:00
saurabhbhatia c545c6f172 API for Locations 2013-11-19 16:24:15 +08:00
Manson Wang 7ad05ef034 Dashboard with Google Chart 2013-11-04 17:48:51 +08:00
chris 218cb03641 PagePart widgets except "system widget" 2013-10-28 16:29:23 +08:00
chris a4d1c68299 Structure page with json 2013-10-23 18:39:35 +08:00
Spen c76adc1896 new ui member account privilege fix 2013-10-21 10:42:50 +08:00
Spen 00e9a5df5b new ui member settings account data
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
	config/locales/en.yml
	config/routes.rb
2013-10-18 22:28:27 +08:00
Spen 14d2b0cc76 fix new ui member account privilege 2013-10-18 19:52:36 +08:00
saurabhbhatia 3e491380cd Revert "new ui member settings account data"
This reverts commit e1f4ee464b.
2013-10-18 19:51:02 +08:00
Spen e1f4ee464b new ui member settings account data 2013-10-18 19:12:27 +08:00
saurabhbhatia 14fea3638f Updated with some locale fixes in site preferences 2013-10-18 15:26:41 +08:00
saurabhbhatia 4120be6f8e fixes in sitemap, site preference 2013-10-14 16:48:50 +08:00
Spen a067bcd304 Add Brief intro. for all personal plugins
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
2013-09-18 18:55:40 +08:00
Manson 6430e60577 Added the missing translations in config/locales/en.yml and zh_tw.yml
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
2013-09-12 09:30:07 +08:00
Spen 4078d426a6 new ui personal front_end page(member app) & users_new_interface show sub_roles fix 2013-08-21 14:13:36 +08:00
Matt K. Fu e20df41db5 add user log link at site page 2013-06-14 15:24:04 +08:00
Matt K. Fu 54a35b30be fix design index bug when start start from blank DB.
add delay impressionist.
add several i18n vars
2013-05-23 12:07:43 +08:00
Matt K. Fu ef2c732d2e make blank site working better 2013-05-14 11:26:35 +08:00
Matt K. Fu 3e567223e3 fix for Spen's translation and Chris's tag error 2013-04-26 15:37:27 +08:00
Spen 79ef86f2c9 member translation fix 2013-04-26 11:26:11 +08:00
Spen 697944a029 user id set & user fields set & role set & member frontend list & user translation & create new member bug fix 2013-04-25 19:59:59 +08:00
Matt K. Fu b198b1a17b system preference 2013-04-24 19:21:11 +08:00
Matt K. Fu 62fa589e8a add msg when user session expired at page admin 2013-04-24 11:58:48 +08:00
Matt K. Fu 5ff7dfbac6 fronted open switch and backend openness 2013-04-23 18:48:18 +08:00
Matt K. Fu 0781779ac0 solved conflicts 2013-04-17 14:14:24 +08:00
chris b864cc0268 Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
unknown f59da3ce81 member plugin init edit 2013-02-20 18:05:09 +08:00
unknown a7bc19768e member list edit 2013-02-20 11:12:08 +08:00
Fu Matthew 29bb92f841 fix member sidebar
add i18n for modules and default_widgets
2013-02-06 17:44:38 +08:00
chris 83935aaa60 Add translations 2013-01-07 10:42:17 +08:00
chris 6c6bda988d Add mobile version in site settings 2013-01-07 03:57:36 +08:00
Rueshyna cb3a9ea98b change sub_menu to header in site setting 2013-01-03 14:46:02 +08:00
chris ff435a4af4 Change the design for the whole site form designs index 2012-12-07 12:14:31 +08:00
chris 2983b181e6 Fix some translations 2012-12-04 01:03:28 +08:00
chris e2da22b29c Clean translations 2012-12-04 00:17:12 +08:00
chris dc3be3c9a1 Translation changes 2012-12-03 23:00:04 +08:00
chris 43d969a72b Fix attribute_field_helper and comment admin in I18n 2012-11-06 17:51:42 +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
Harry Bomrah 2e809c5c19 Calander view updated... 2012-11-05 11:40:11 +08:00
Matthew K. Fu JuYuan beb843f75b add new member with role interface. add more not usable.
role management new attribute is ok. delete is ok.
2012-11-04 20:42:58 +08:00
chris cc5e238576 Fix after merge from NCCU, the translations still need to be cleaned 2012-10-30 11:08:26 +08:00
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
Matthew K. Fu JuYuan c305a2f687 add i18n variables 2012-10-26 11:19:56 +08:00
Harry Bomrah d2fea92969 GPRS and CALENDAR 2012-10-09 06:42:00 +08:00