Archived

0 Fork 0

This repository has been archived on 2024-03-16. You can view files and clone it. You cannot open issues or pull requests or push a commit.

T

Christophe Vilayphiou 5aad133b6c Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_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/_bulletin_link_qe.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb

2012-03-27 19:15:13 +08:00

app

Changed inherited controller in module_apps to OrbitBackendController

2012-03-27 18:58:04 +08:00

config

Changes in Gemfile

2012-03-19 14:04:28 +08:00

upgrade to rails3, but grip is broken

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

doc

init rails 2.3.2

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