developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/controllers
History
chris 7d5531bf01 Merge branch 'nccu_master' into demo_site 
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
 		2012-08-22 18:07:49 +08:00
..
admin Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
application_controller.rb RSS first page 2012-08-08 17:41:48 +08:00
desktop_appstore_controller.rb new page add and timeline changes 2012-06-28 17:31:48 +08:00
desktop_controller.rb Gallery started. 2012-08-20 23:14:10 +08:00
desktop_orbit_controller.rb Timeline design and timescale update 2012-07-06 16:11:03 +08:00
desktop_publications_controller.rb Added seminar section 2012-07-04 19:12:02 +08:00
desktop_research_controller.rb Page added for desktop 2012-08-20 23:17:31 +08:00
gridfs_controller.rb Multi language and side bar update 2012-08-20 23:14:11 +08:00
orbit_backend_controller.rb Fix bug for sorting when there's only one category with elements 2012-08-11 16:56:28 +08:00
orbit_frontend_component_controller.rb Changes for widgets 2012-05-13 21:55:39 +08:00
orbit_frontend_controller.rb First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
orbit_widget_controller.rb Change Obit to Orbit 2012-03-16 11:54:31 +08:00
otheraccounts_controller.rb few experiments… 2012-05-16 11:18:54 +08:00
pages_controller.rb Error popup only shows on flash[:error] 2012-08-15 15:55:29 +08:00
sessions_controller.rb Fix .class to .class.to_s 2012-07-30 18:34:54 +08:00