Rueshyna 74900ac048 Merge branch 'desktop_work' into desktop_work_devin ... * desktop_work: tinyscrollbar minor update desktop CSS update Conflicts: vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb		2013-03-05 18:35:17 +08:00
..
ad_banner	fix i18n,reload problems	2013-02-18 15:13:31 +08:00
announcement	link to more	2013-02-27 10:50:50 +08:00
archive	member plugin init edit	2013-02-21 17:53:08 +08:00
calendar	fix member sidebar	2013-02-19 14:21:54 +08:00
gallery	add Devin's css file for gallery	2013-03-04 17:27:36 +08:00
location	fix member sidebar	2013-02-06 17:44:38 +08:00
miss_module/config/locales	member plugin init edit	2013-02-21 17:53:08 +08:00
page_content	fix i18n,reload problems	2013-02-18 15:13:31 +08:00
personal_book	member plugin init add frontend	2013-02-22 18:21:11 +08:00
personal_conference	Merge branch 'desktop_work' into desktop_work_devin	2013-03-05 18:35:17 +08:00
personal_diploma	member plugin init add frontend	2013-02-22 18:21:11 +08:00
personal_experience	member plugin init add frontend	2013-02-22 18:21:11 +08:00
personal_honor	member plugin init add frontend	2013-02-22 18:21:11 +08:00
personal_journal	Merge branch 'desktop_work' into desktop_work_devin	2013-03-05 18:35:17 +08:00
personal_lab	Fix init name/key	2013-02-22 14:46:22 +08:00
personal_patent	member plugin init add frontend	2013-02-22 18:21:11 +08:00
personal_project	member plugin init add frontend	2013-02-22 18:21:11 +08:00
personal_research	member plugin init add frontend	2013-02-22 18:21:11 +08:00
web_resource	Fix web links html and index query	2013-02-19 17:39:43 +08:00