Christophe Vilayphiou 1f4fe65430 Merge branch 'design_team' into ldap ...

Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb

2012-04-25 16:45:04 +08:00

..

environments

close alpha on nccu

2012-03-20 14:38:01 +08:00

initializers

close alpha on nccu

2012-03-20 14:38:01 +08:00

locales

Merge branch 'ad_banner' into ldap

2012-04-24 16:46:04 +08:00

application.rb

Merge branch 'master' into ldap

2012-04-12 18:50:48 +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

list.yml

Add sub_menu in r_tags

2012-04-24 02:30:40 +08:00

mongoid.yml

close alpha on nccu

2012-03-20 14:38:01 +08:00

routes.rb

Merge branch 'design_team' into ldap

2012-04-25 16:45:04 +08:00