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

..

admin

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

desktop

Desktop Widgtes updates..

2012-11-06 10:36:34 +08:00

desktop_widgets

update for desktop widgets

2012-11-05 11:40:11 +08:00

devise

Fix bug: User cannot connect using the orbit button (Devise configuration)

2012-10-26 17:42:14 +08:00

js

Integrate Harry's modifications to reload pop-up content

2011-12-29 14:09:06 +08:00

kaminari

Fixed bugs for nccu

2012-05-22 20:00:07 +08:00

layouts

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

shared

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

.swp

adding files not commited from previous commit

2011-07-12 16:02:41 +08:00

seminar_p.html.erb

Added seminar section

2012-07-04 19:12:02 +08:00