Harry Bomrah 79c7f8e90f new orbit bar fixed.. ... Conflicts: app/assets/javascripts/orbit_js_1.0.1-front-end.js app/assets/stylesheets/basic/orbit_bar.css.erb app/assets/stylesheets/orbit_bar_bootstrap.css app/views/layouts/_left_menu.html.erb app/views/layouts/_orbit_bar.html.erb app/views/layouts/_right_menu.html.erb app/views/layouts/desktop.html.erb		2013-07-30 16:43:35 +08:00
..
assets	new orbit bar fixed..	2013-07-30 16:43:35 +08:00
controllers	new themes added to desktop plus theme uploader created	2013-07-30 16:43:32 +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	new themes added to desktop plus theme uploader created	2013-07-30 16:43:32 +08:00
uploaders	Change ckeditor gem and kaminari in gemfile	2013-07-22 17:26:32 +08:00
views	new orbit bar fixed..	2013-07-30 16:43:35 +08:00