orbit-basic/app
Harry Bomrah 6d54dbd5f8 bilingual for files fixed and description added and also filename display after selecting filenames
Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js
2013-08-13 17:22:09 +08:00
..
assets bilingual for files fixed and description added and also filename display after selecting filenames 2013-08-13 17:22:09 +08:00
controllers solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
errors show error message when trying to show a not existed page 2013-01-03 13:50:27 +08:00
helpers solved conflict for member_new_ui 2013-08-12 15:40:34 +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 conflict for member_new_ui 2013-08-12 15:40:34 +08:00
uploaders Change ckeditor gem and kaminari in gemfile 2013-07-22 17:26:32 +08:00
views solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00