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
..
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 remote-tracking branch 'origin/desktop_work' into desktop	2013-03-05 17:34:28 +08:00
desktop_widgets	update for desktop widgets	2012-11-05 11:40:11 +08:00
devise	view update	2012-12-06 07:59:43 +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-06 17:44:38 +08:00
mobile	Changes for mobile copyright	2013-02-04 18:02:11 +08:00
shared	member list edit	2013-02-20 11:12:08 +08:00