Christophe Vilayphiou f8d1d7242d Merge branch 'design_team' into dashboard

2012-02-23 16:05:33 +08:00

..

admin

Add isotope, categories for announcement page, sort for announcement

2012-02-23 15:52:58 +08:00

devise

Changes for orbit bar, login

2012-02-19 16:33:22 +08:00

js

Integrate Harry's modifications to reload pop-up content

2011-12-29 14:09:06 +08:00

kaminari

Announcement modifications and tags

2012-02-15 00:34:22 +08:00

layouts

Merge branch 'design_team' into dashboard

2012-02-23 16:05:33 +08:00

.swp

adding files not commited from previous commit

2011-07-12 16:02:41 +08:00