Rueshyna fb931b0a4a Merge remote-tracking branch 'origin/desktop' into desktop ... * origin/desktop: Remove Gemfile.lock sort conference and type add conferene list order function css minor changes. gridster, url code fixed, views removed. Fix selection of sub_menu for widget (the value wasn't set) Fix bug in widget selection css minor changes. Fix public_r_tag selection gridster, url code fixed, views removed.		2013-02-26 17:02:01 +08:00
..
assets	gridster, url code fixed, views removed.	2013-02-25 11:08:56 +08:00
controllers	generate journal page by rails side and fixed model name bug	2013-02-26 15:15:09 +08:00
helpers	generate journal page by rails side and fixed model name bug	2013-02-26 15:15:09 +08:00
mailers	Plugins	2012-09-14 00:05:31 +08:00
models	generate journal page by rails side and fixed model name bug	2013-02-26 15:15:09 +08:00
views	fixed journal co author bug	2013-02-26 16:57:08 +08:00