Harry Bomrah 8c68c54a57 ad_banner banner load fixed for test site ... Conflicts: app/views/front/show_banner.html.erb		2013-09-30 16:35:22 +08:00
..
admin	ntue mail cron & log filter fix	2013-07-19 17:18:34 +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	ad_banner banner load fixed for test site	2013-09-30 16:35:22 +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 mobile copyright	2013-02-04 18:02:11 +08:00
shared	add search to archive	2013-06-05 18:03:09 +08:00