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

..

preview

complete preview for both new and announcement

2012-09-07 17:55:59 +08:00

_address_modal_dialog.html.erb

Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

2012-10-30 10:11:51 +08:00

_addthis_toolbox

Add this toolbar, and nccu calendar fix

2012-06-04 16:51:29 +08:00

_privilege_user.html.erb

Add missing translations

2012-09-24 09:02:46 +08:00

_search_not_found.html.erb

full site search with google

2012-07-25 17:20:25 +08:00

render_share.html.erb

Fix fb share, redirect with js when the page is not requested by fb but by user

2012-08-08 11:04:19 +08:00