Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry ... Conflicts: Gemfile.lock app/assets/javascripts/.DS_Store app/assets/stylesheets/style.css.erb app/views/layouts/_orbit_bar.html.erb		2012-06-29 16:10:29 +08:00
..
inc	…
lib	…
ad_banner.js	…
admin.js	…
ajax_form.js	…
application.js	…
attribute_form.js.erb	…
bootstrap.js	…
bulletin_form.js.erb	…
design.js	…
desktop.js	Timeline commit	2012-06-26 15:59:28 +08:00
desktopload.js.erb	…
devise.js.erb	…
event.js	…
html5.js	…
jquery.form.js	…
jquery.isotope.min.js	…
jquery.miniColors.min.js	…
jquery.tinyscrollbar.min.js	…
module.js.erb	…
new_admin.js	…
news_bulletin_form.js	…
orbit-1.0.js	…
orbit-bar-member.js	…
orbit-bar-search.js	…
orbitTimeline.js	new page add and timeline changes	2012-06-28 17:31:48 +08:00
orbit_bar.js	…
orbitdesktop.js	new page add and timeline changes	2012-06-28 17:31:48 +08:00
orbitdesktopAPI.js	timeline updates major ones..	2012-06-26 21:09:33 +08:00
page_edit.js.erb	…
plugin.js	…
rc.js	…
rss.js	…
side_bar_history.js	…
site_editor.js	…
sort_header.js	…
tinymce_orbit.js.erb	…
translation_page.js	…
user_form.js	…