Matthew K. Fu JuYuan 2cd67356a5 Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509 ... Conflicts: config/locales/zh_tw.yml		2012-05-14 12:36:09 +08:00
..
assets	Changes for widgets	2012-05-13 21:55:39 +08:00
controllers	Fix for manager and admin can see all post in announcement. Haven't applied to news	2012-05-14 00:50:36 +08:00
helpers	New Interface for App Auth and Object Auth	2012-05-14 00:50:12 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	Change to apply page to had object_auth	2012-05-14 12:34:15 +08:00
views	Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509	2012-05-14 00:51:53 +08:00