Christophe Vilayphiou b4ff5cea05 Merge branch 'yml' of github.com:Rulingcom/NCCU into yml ...

Conflicts:
	app/helpers/admin/item_helper.rb
	app/views/admin/ad_banners/_ad_banner_tab.html.erb
	app/views/admin/assets/edit.html.erb
	app/views/admin/assets/file_upload.html.erb
	app/views/admin/assets/new.html.erb
	app/views/admin/attributes/index.html.erb
	app/views/admin/object_auths_new_interface/setting.html.erb
	app/views/admin/page_parts/_edit.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/shared/_privilege_user.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/edit.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/new.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
	vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb
	vendor/built_in_modules/news/config/locales/en.yml
	vendor/built_in_modules/news/config/locales/zh_tw.yml
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb

2012-09-24 09:19:19 +08:00

..

environments

Fix bugs on 172:180

2012-08-08 17:56:00 +08:00

initializers

Changes for i18n yml

2012-09-24 09:02:45 +08:00

locales

Merge branch 'yml' of github.com:Rulingcom/NCCU into yml

2012-09-24 09:19:19 +08:00

application.rb

God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.

2012-05-08 20:21:28 +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

Sitemap done for backend and fronted

2012-07-27 19:13:40 +08:00

mongoid.yml

tiny mce fix

2012-09-19 17:59:17 +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

resque.god

NCCU 上傳版本 0709

2012-07-09 16:02:59 +08:00

routes.rb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

sunspot.yml

First version of Solr search.

2012-08-08 10:59:55 +08:00