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
..
_breadcrumb_back_end.html.erb	Breadcrumb for dashboard (tags and categories cannot link to original module index)	2013-07-29 17:34:03 +08:00
_delete_modal.html.erb	Add default delete modal usage:	2013-07-29 14:29:37 +08:00
_google_font.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
_ie_html5_fix.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
_left_menu.html.erb	Ray's changes for css and js	2013-07-22 16:31:44 +08:00
_meta.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
_orbit_bar.html.erb	Fix orbit bar language change	2013-07-29 19:49:07 +08:00
_right_menu.html.erb	new orbit bar fixed..	2013-07-30 16:43:35 +08:00
_side_bar.html.erb	Fiix layout for safari	2013-07-29 17:34:29 +08:00
_side_bar_content.html.erb	Fiix layout for safari	2013-07-29 17:34:29 +08:00
_users_checkbox_ary.html.erb	fix for not working cache	2012-07-13 18:32:17 +08:00
admin.html.erb	new code for attribute fields and values for new member interface	2012-10-26 11:19:55 +08:00
application.html.erb	clean 403 404 500	2013-05-27 16:46:49 +08:00
back_end.html.erb	Fix controller js and css loading error	2013-07-30 11:48:14 +08:00
basic_back_end.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
compatibility.html.erb	add browser compatibility page	2013-04-17 11:07:45 +08:00
desktop.html.erb	new orbit bar fixed..	2013-07-30 16:43:35 +08:00
devise.html.erb	Changes for IE9 with html5	2012-03-21 15:51:55 +08:00
mobile.mobile.erb	Merge branch 'back' of github.com:Rulingcom/orbit into back	2013-01-14 17:46:27 +08:00
module_widget.html.erb	Changes for widgets	2012-05-13 21:55:39 +08:00
page_edit.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
page_layout.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
standalone.html.erb	questionnaire stuff	2013-06-06 18:29:58 +08:00
structure.html.erb	Fix for structure	2013-07-29 18:46:38 +08:00