Orbit/app/views
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
..
admin Clean up code , cache other auths. Fix sidebar 2012-05-29 17:17:26 +08:00
desktop new page add and timeline changes 2012-06-28 17:31:48 +08:00
devise Change for the notice msg at login page 2012-04-30 00:24:10 +08:00
js Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
kaminari Fixed bugs for nccu 2012-05-22 20:00:07 +08:00
layouts Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry 2012-06-29 16:10:29 +08:00
shared Clean up code , cache other auths. Fix sidebar 2012-05-29 17:17:26 +08:00
.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00