Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap ... Conflicts: config/environments/development.rb		2012-03-01 10:13:49 +08:00
..
assets	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth	2012-02-29 19:03:29 +08:00
helpers	merge with master	2012-01-11 20:31:52 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	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
views	Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap	2012-03-01 10:13:49 +08:00