Harry Bomrah 96b6f7e3fd Merge branch 'desktop_design_devin' into desktop_work1 ... Conflicts: app/assets/javascripts/orbitdesktop.js vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb		2013-04-08 17:30:13 +08:00
..
appstore	desktop CSS update	2013-03-05 09:39:01 +08:00
books	app manager changed plus some changes	2013-03-21 18:25:37 +08:00
patents	desktop CSS update	2013-03-05 09:39:01 +08:00
research_domain	desktop CSS update	2013-03-05 09:39:01 +08:00
research_project	desktop CSS update	2013-03-05 09:39:01 +08:00
settings	devin's new branch	2013-04-01 11:45:12 +08:00
allsections.html.erb	Major tinyscrollbar update	2013-03-21 18:09:39 +08:00
app_manager.html.erb	app manager changed plus some changes	2013-03-21 18:25:37 +08:00
app_view1.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
appstore.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
books.html.erb	app manager changed plus some changes	2013-03-21 18:25:37 +08:00
compatibility.html.erb	add browser compatibility page	2013-03-21 18:25:36 +08:00
desktop.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
index.html.erb	small fix in select2.js	2013-04-03 15:24:30 +08:00
orbit.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
research_d.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
research_p.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
settings.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00