Christophe Vilayphiou d88d4e58dc Merge branch 'design_team' into ldap ...

Conflicts:
	config/environments/development.rb

2012-05-09 13:51:00 +08:00

..

jquery.cycle.all.latest.js

include ad_banner query code. cleaned up parser

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

jquery.js

Orbit-bar in front-end and back-end, side-bar and drop-down menu

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

kernel.js

clean up useless flash msgs. add i18n vars for app auth and object auth

2012-05-04 15:40:43 +08:00

nccu_calendar.rss

Ray's changes

2012-05-09 04:15:02 +08:00

nccu_calendar.xml

Ray's changes

2012-05-09 04:15:02 +08:00

Other.xml

Ray's changes for structure and web_links

2012-04-27 11:02:56 +08:00