orbit-basic/app/views
chris 6ca52226ba Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
Conflicts:
	app/views/desktop/journal_p.html.erb
2012-11-21 18:38:28 +08:00
..
admin fix and hide for visitors,except for album 2012-11-21 18:31:57 +08:00
desktop small fix for journal_pages desktop 2012-11-21 18:36:56 +08:00
desktop_widgets update for desktop widgets 2012-11-05 11:40:11 +08:00
devise Fix bug: User cannot connect using the orbit button (Devise configuration) 2012-10-26 17:42:14 +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 fix and hide for visitors,except for album 2012-11-21 18:31:57 +08:00
shared complete address field. still have javascript issue for fill back and display address ext fields in modal. 2012-11-20 09:53:37 +08:00
.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
seminar_p.html.erb Added seminar section 2012-07-04 19:12:02 +08:00