chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_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/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

2012-10-29 16:10:07 +08:00

..

.gitkeep

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

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

anc_tasks.rake

starting Resque

2012-05-08 20:21:28 +08:00

app_auth.rake

merge with november_presentation

2011-12-22 15:43:38 +08:00

build_new_member.rake

for user new interface, member role is working.

2012-10-26 11:27:37 +08:00

data_migration.rake

add data_migration for rename field for attribute_field. not yet tested

2012-09-14 00:02:22 +08:00

designs.rake

Fix designs.rake

2012-05-14 09:30:49 +08:00

dev.rake

Edit uploaded package

2012-10-26 11:19:57 +08:00

index.rake

add rake task for rebuild index

2012-09-24 18:46:38 +08:00

items.rake

Changes on nccu

2012-05-18 15:20:45 +08:00

matt_dev.rake

fix approval at news and announcement for abnormal flags that causing search result fault.

2012-08-08 11:01:50 +08:00

mid_site_sync.rake

fix for rescue job failed on 171

2012-10-08 16:42:49 +08:00

migrate.rake

Fix migration bug

2012-09-11 16:32:20 +08:00

nccu.rake

add rake task

2012-10-16 15:43:31 +08:00

noko.rake

Add rake task for layout with nokogiri

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

page_content.rake

Fix bugs and changes for nccu

2012-02-27 18:50:56 +08:00

pages.rake

Edit uploaded package

2012-10-26 11:19:57 +08:00

resque.rake

starting Resque

2012-05-08 20:21:28 +08:00

site.rake

Final modifications for the presentation

2011-11-22 18:54:10 +08:00

user.rake

change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.

2012-02-29 18:58:33 +08:00