Rueshyna a9bf400fac Merge branch 'desktop_work_devin' into desktop ...

* desktop_work_devin:
  tinyscrollbar minor update
  desktop CSS update
  tinyscrollbar minor update
  desktop CSS update

Conflicts:
	app/views/desktop/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb

2013-03-05 18:48:12 +08:00

..

admin

fix widget field reload

2013-02-27 10:51:41 +08:00

default_widget

link to more

2013-02-27 10:50:50 +08:00

desktop

Merge branch 'desktop_work_devin' into desktop

2013-03-05 18:48:12 +08:00

desktop_widgets

update for desktop widgets

2012-11-05 11:40:11 +08:00

devise

desktop CSS update

2013-03-05 09:39:01 +08:00

front

Fix breadcrumb again

2013-02-19 17:50:46 +08:00

js

Integrate Harry's modifications to reload pop-up content

2011-12-29 14:09:06 +08:00

kaminari

Add mobile but remove news in it

2013-01-07 03:03:38 +08:00

layouts

fix member sidebar

2013-02-19 14:21:54 +08:00

mobile

Changes for mobile copyright

2013-02-04 18:02:11 +08:00

shared

member list edit

2013-02-21 14:13:46 +08:00