Go to file
Fu Matthew bfaa22052f Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
Conflicts:
	app/controllers/admin/page_parts_controller.rb
	app/controllers/default_widget_controller.rb
	app/uploaders/gprs_uploader.rb
	app/uploaders/location_uploader.rb
	app/views/admin/page_parts/_module_widget.html.erb
	app/views/admin/page_parts/reload_widget_styles.js.erb
	app/views/admin/page_parts/reload_widgets.js.erb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
	vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
	vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/README.rdoc
	vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
	vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
	vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/models/location.rb
	vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
	vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
	vendor/built_in_modules/location/config/routes.rb
	vendor/built_in_modules/location/lib/location.rb
	vendor/built_in_modules/location/location.gemspec
	vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
2013-01-24 16:30:02 +08:00
app Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
config Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
db fixed empty db bug 2012-12-07 04:21:27 +08:00
doc init rails 2.3.2 2009-05-08 00:53:18 +08:00
lib Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
log merge 2012-10-01 21:09:09 +08:00
patch Put impressionist delayed job in a patch 2013-01-08 12:45:15 +08:00
public Fix link for ad_banner 2013-01-07 00:36:48 +08:00
script remove useless script 2011-04-13 19:18:40 +08:00
solr/conf First version of Solr search. 2012-08-08 10:59:55 +08:00
spec fixed empty db bug 2012-12-07 04:21:27 +08:00
tmp New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00
vendor Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
.gitignore Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
.rspec Merge with sub_roles 2011-12-23 18:34:21 +08:00
Gemfile Set the version of mongo_session_store-rails3 to 3.0.6 2013-01-14 19:20:58 +08:00
Guardfile Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 2012-10-30 10:11:51 +08:00
README.md Update README 2011-04-13 19:06:09 +08:00
Rakefile God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. 2012-05-08 11:41:58 +08:00
config.ru Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
dump.rdb New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4