devin chen 9963395b05 'select2' minor update ... Conflicts: app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak		2013-07-30 16:42:40 +08:00
..
assets	'select2' minor update	2013-07-30 16:42:40 +08:00
controllers	solved desktop conflict during cherry pick	2013-07-30 16:42:26 +08:00
errors	show error message when trying to show a not existed page	2013-01-03 13:50:27 +08:00
helpers	Breadcrumb for dashboard (tags and categories cannot link to original module index)	2013-07-29 17:34:03 +08:00
jobs	ask module: dropdown, icon, big5 encoding, redirect, admin, send mail	2013-06-07 13:03:59 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	solved desktop conflict during cherry pick	2013-07-30 16:42:26 +08:00
uploaders	Change ckeditor gem and kaminari in gemfile	2013-07-22 17:26:32 +08:00
views	'select2' minor update	2013-07-30 16:42:40 +08:00