Matthew K. Fu JuYuan b4a2737407 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ...

Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml

2012-11-16 15:42:39 +08:00

..

inc

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

2012-11-16 15:42:39 +08:00

lib

Changes for i18n yml

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

ad_banner.js

…

admin.js

…

ajax_form.js.erb

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

application.js

…

archive_form.js.erb

…

archive_plugin_form.js.erb

…

attribute_form.js.erb

…

bootstrap.js

Ray's changes in css and js

2012-10-09 07:48:05 +08:00

bulletin_form.js.erb

Changes for i18n yml

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

design.js

…

desktop.js

…

desktopload.js.erb

…

devise.js.erb

…

event.js

…

html5.js

…

jquery.form.js

…

jquery.isotope.min.js

…

jquery.masonry.min.js

…

jquery.miniColors.min.js

…

jquery.mu.image.resize.degsin.js

…

jquery.mu.image.resize.js

…

jquery.tinyscrollbar.js

…

jquery.tinyscrollbar.min.js

…

module.js.erb

…

new_admin.js

…

news_bulletin_form.js.erb

Changes for i18n yml

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

orbit_bar.js

…

orbit-1.0.js

…

orbit-1.0.js.backup20120913

…

orbit-bar-member.js

…

orbit-bar-search.js

…

orbitdesktop.js

Desktop Widgtes updates..

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

orbitdesktopAPI.js

…

orbitTimeline.js

…

page_edit.js.erb

…

plugin.js

…

rc.js

…

rss.js

…

side_bar_history.js

…

site_editor.js

…

sort_header.js.erb

…

tinymce_orbit.js.erb

Fix bugs:

2012-11-01 09:30:12 +08:00

translation_page.js

…

user_form.js

…