Matthew K. Fu JuYuan 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config ...

Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

2012-11-26 17:55:53 +08:00

..

admin

member selects

2012-11-26 10:25:34 +08:00

desktop

add paper status textfield

2012-11-26 10:23:50 +08:00

desktop_widgets

update for desktop widgets

2012-11-05 11:40:11 +08:00

devise

Fix bug: User cannot connect using the orbit button (Devise configuration)

2012-10-26 17:42:14 +08:00

js

Integrate Harry's modifications to reload pop-up content

2011-12-29 14:09:06 +08:00

kaminari

Fixed bugs for nccu

2012-05-22 20:00:07 +08:00

layouts

Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config

2012-11-26 17:55:53 +08:00

shared

user roles starts

2012-11-22 21:10:35 +08:00

.swp

adding files not commited from previous commit

2011-07-12 16:02:41 +08:00

seminar_p.html.erb

Added seminar section

2012-07-04 19:12:02 +08:00