developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/config
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
..
environments Fix bugs on 172:180 2012-08-08 17:56:00 +08:00
initializers Add authorization for rescue interface 2012-08-12 23:29:13 +08:00
locales Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
application.rb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
boot.rb rails 3.1 and designs (with bug) 2011-07-12 16:00:57 +08:00
config.yml close alpha on nccu 2012-03-20 14:38:01 +08:00
database.yml.example Add admin/pages scaffold and basic page render 2009-05-08 01:18:16 +08:00
environment.rb Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
ldap.yml put ldap setting into config file. should load be rails env. Also make god config more friendly. 2012-06-22 14:32:28 +08:00
list.yml Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
mongoid.yml Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
resque.god NCCU 上傳版本 0709 2012-07-09 16:02:59 +08:00
resque_schedule.god add rescue job . can work with init script 2012-06-29 17:42:36 +08:00
resque_schedule.yml fix over queue at resque 2012-07-03 10:51:26 +08:00
routes.rb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
sunspot.yml First version of Solr search. 2012-08-08 10:59:55 +08:00