Orbit/app/views
Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
Conflicts:
	config/environments/development.rb
2012-03-01 10:13:49 +08:00
..
admin change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action. 2012-02-29 18:58:33 +08:00
devise Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine 2012-02-29 13:07:21 +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 Changes for nccu 2012-02-29 16:01:50 +08:00
.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00