Fu Matthew 9fec7beb47 Merge branch 'development' of github.com:Rulingcom/orbit into development ...

Conflicts:
	app/controllers/default_widget_controller.rb
	lib/tasks/migrate.rake

2013-02-22 17:53:49 +08:00

..

admin

Merge branch 'development' of github.com:Rulingcom/orbit into development

2013-02-22 17:53:49 +08:00

default_widget

Remove useless code not removed in merge

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

desktop

fixed conference icon and rename _p to _window of conference view

2013-02-21 13:51:42 +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