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

..

admin

Fix selection of sub_menu for widget (the value wasn't set)

2013-02-25 10:35:59 +08:00

default_widget

Remove useless code not removed in merge

2013-02-19 20:42:46 +08:00

desktop

generate journal page by rails side and fixed model name bug

2013-02-26 15:15:09 +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-19 14:21:54 +08:00

mobile

Changes for mobile copyright

2013-02-04 18:02:11 +08:00

shared

member list edit

2013-02-21 14:13:46 +08:00