Rueshyna d5f1d13670 Merge remote-tracking branch 'origin/desktop_work' into desktop ... * origin/desktop_work: simple layout tinyscrollbar fixed highlighting fixed… fixed adding. layout fix tinyscrollbar_bug fixed url handling modified.. tinyscrollbar modified… star checkbox fixed.. tinyscrollbar fixed some changes for gridster Lot of changes in gridster Conflicts: vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb		2013-03-05 17:34:28 +08:00
..
assets	fixed desktop several bug	2013-03-05 17:31:57 +08:00
controllers	fixed delete co author relation bug	2013-03-05 12:41:42 +08:00
helpers	fixed desktop several bug	2013-03-05 17:31:57 +08:00
mailers	relpace seminar to conference	2013-02-04 18:01:38 +08:00
models	authors auto-complete	2013-03-04 12:16:46 +08:00
views	Merge remote-tracking branch 'origin/desktop_work' into desktop	2013-03-05 17:34:28 +08:00