chris d766eea9f4 Changes for NTU common ...

Conflicts:
	lib/tasks/migrate.rake

Conflicts:
	lib/tasks/migrate.rake

Conflicts:
	config/resque_schedule.yml
	lib/tasks/migrate.rake

2013-09-13 15:10:10 +08:00

..

admin

Changes for NTU common

2013-09-13 15:10:10 +08:00

default_widget

Change get_item

2013-07-19 18:39:13 +08:00

desktop

minor update

2013-04-17 14:29:56 +08:00

desktop_widgets

update for desktop widgets

2012-11-05 11:40:11 +08:00

devise

member translation fix

2013-04-26 11:26:11 +08:00

front

fix chris tag cloud

2013-06-06 17:18:42 +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

questionnaire stuff

2013-06-06 18:29:58 +08:00

mobile

Changes for NTU common

2013-09-13 15:10:10 +08:00

shared

add search to archive

2013-06-05 18:03:09 +08:00