orbit-basic/app
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 css minor changes. 2013-02-25 11:08:57 +08:00
controllers gridster, url code fixed, views removed. 2013-02-25 11:08:56 +08:00
errors show error message when trying to show a not existed page 2013-01-03 13:50:27 +08:00
helpers Fix url with id in default widget 2013-02-23 12:20:45 +08:00
jobs Schedule job for tag_cloud 2013-01-08 12:36:50 +08:00
mailer Add mail_settings 2012-05-09 11:38:29 +08:00
models Fix for path renaming 2013-02-19 18:09:55 +08:00
uploaders Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
views Merge remote-tracking branch 'origin/desktop' into desktop 2013-02-26 17:02:01 +08:00