Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap ...

Conflicts:
	config/environments/development.rb

2012-03-01 10:13:49 +08:00

..

assets

Changes for nccu

2012-02-29 16:01:50 +08:00

controllers

Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

2012-03-01 10:13:49 +08:00

helpers

First version for App and Object auth.Taking Announcement as experiment

2012-02-29 18:55:55 +08:00

models

Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

2012-03-01 10:13:49 +08:00

uploaders

Modifications for images in html code

2011-10-18 11:21:24 +08:00

views

Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

2012-03-01 10:13:49 +08:00