Rueshyna 80b6a9ab48 Merge branch 'desktop' into desktop_work ... * desktop: highlighting fixed… add Devin's css file for gallery using refine tiny scroll bar js for personal plugin fixed adding. layout fix layout fix tinyscrollbar_bug fixed url handling modified.. tinyscrollbar modified… star checkbox fixed.. tinyscrollbar fixed some changes for gridster Lot of changes in gridster authors auto-complete fixed paper title and journal title bug Conflicts: vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_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_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.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_pages/journal_type.html.erb		2013-03-04 18:03:59 +08:00
..
assets	fixed adding.	2013-03-04 16:31:37 +08:00
controllers	using refine tiny scroll bar js for personal plugin	2013-03-04 16:35:09 +08:00
helpers	using refine tiny scroll bar js for personal plugin	2013-03-04 16:35:09 +08:00
mailers	Plugins	2012-09-14 00:05:31 +08:00
models	using refine tiny scroll bar js for personal plugin	2013-03-04 16:35:09 +08:00
views	Merge branch 'desktop' into desktop_work	2013-03-04 18:03:59 +08:00