developers/orbit-basic

0 Fork 0

T

Christophe Vilayphiou 3bd3820519 Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust

Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/config/locales/en.yml
	vendor/built_in_modules/announcement/config/locales/zh_tw.yml

2012-05-04 15:59:26 +08:00

Fix bug when homepage

2012-05-04 15:51:51 +08:00

fix broken ad_banner

2012-05-04 15:40:43 +08:00

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

init rails 2.3.2

2009-05-08 00:53:18 +08:00

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

2012-05-04 15:59:26 +08:00

add log folder

2011-04-13 18:22:49 +08:00

clean up useless flash msgs. add i18n vars for app auth and object auth

2012-05-04 15:40:43 +08:00

remove useless script

2011-04-13 19:18:40 +08:00

fixing for app_auth

2012-01-05 16:20:51 +08:00

Change to MongoDB

2010-01-04 15:52:30 +08:00

add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.

2012-05-04 15:50:45 +08:00

.gitignore

Fix assets bug: when having a '.' in the name, the extension must be specified

2012-04-25 15:10:28 +08:00

.rspec

Change role structure

2011-12-10 18:12:39 +08:00

config.ru

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

Gemfile

Trying nokogiri

2012-03-27 18:42:22 +08:00

Gemfile.lock

Rmove therubyraces from Gemfile.lock

2012-04-23 14:12:18 +08:00

Rakefile

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

README.md

Update README

2011-04-13 19:06:09 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4