Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config ... Conflicts: app/views/layouts/_side_bar_content.html.erb config/locales/zh_tw.yml config/mongoid.yml vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb vendor/built_in_modules/announcement/init.rb		2012-12-05 11:36:32 +08:00
..
announcement	Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config	2012-12-05 11:36:32 +08:00
archive	Change icons	2012-11-29 00:49:53 +08:00
calendar	calendar js minor update	2012-11-21 19:02:54 +08:00
gallery	Fix some translations	2012-12-04 01:03:28 +08:00
gprs	fix and hide for visitors,except for album	2012-11-21 18:31:57 +08:00
page_content	Translation changes	2012-12-03 23:00:04 +08:00
personal_book	Translation changes	2012-12-03 23:00:04 +08:00
personal_diploma	Translation changes	2012-12-03 23:00:04 +08:00
personal_experience	Translation changes	2012-12-03 23:00:04 +08:00
personal_honor	Translation changes	2012-12-03 23:00:04 +08:00
personal_journal	if coauthor not in coauthor db then it will be add in db	2012-12-04 00:31:06 +08:00
personal_lab	Translation changes	2012-12-03 23:00:04 +08:00
personal_patent	Translation changes	2012-12-03 23:00:04 +08:00
personal_project	Translation changes	2012-12-03 23:00:04 +08:00
personal_research	Translation changes	2012-12-03 23:00:04 +08:00
personal_seminar	Translation changes	2012-12-03 23:00:04 +08:00
web_resource	Translation changes	2012-12-03 23:00:04 +08:00