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
..
assets	Merge branch 'desktop_design_devin' into desktop_work1	2013-04-08 17:30:13 +08:00
controllers	widget and gridster fixes	2013-04-01 18:00:47 +08:00
errors	show error message when trying to show a not existed page	2013-01-03 13:50:27 +08:00
helpers	fix for both part and page part settings	2013-03-29 11:12:52 +08:00
jobs	Schedule job for tag_cloud	2013-01-08 12:36:50 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	widget and gridster fixes	2013-04-01 18:00:47 +08:00
uploaders	features and widgets added	2013-03-29 12:04:21 +08:00
views	Merge branch 'desktop_design_devin' into desktop_work1	2013-04-08 17:30:13 +08:00