Orbit/lib
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
..
ad_banner Add rake task for ad_banner. Will have ad_banner at dev:build 2012-02-04 09:37:23 +08:00
desktopapp test 2012-06-26 16:59:29 +08:00
fraisier fix announcement & add lang tab 2012-04-05 15:23:20 +08:00
noko Add rake task for layout with nokogiri 2012-03-27 19:00:03 +08:00
orbit_app first version app config for Spen durning Chris's leave. 2012-09-24 11:43:48 +08:00
parsers Edit uploaded package 2012-10-26 11:19:57 +08:00
tasks Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
template Changes into page_part edition. 2012-02-16 13:09:09 +08:00
NewBlog.zip update app package for previous commit 2012-01-24 12:28:32 +08:00
central_server_exchange_app.rb Integration of module_app workflow 2011-11-19 14:33:26 +08:00
github_app.rb Update source: pull from git 2011-08-23 15:01:22 +08:00
main_public_key.pem Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
orbit_app.rb first version app config for Spen durning Chris's leave. 2012-09-24 11:43:48 +08:00
orbit_basis.rb Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
orbit_controller_lib.rb category disable for backend 2012-07-06 18:11:55 +08:00
orbit_core_lib.rb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
orbit_search_lib.rb Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
resque_ext.rb Add this toolbar, and nccu calendar fix 2012-06-04 16:51:29 +08:00