Matthew K. Fu JuYuan 17635a2cf2 Merge branch 'anc_approval_list' of https://github.com/Rulingcom/orbit into anc_approval_list		2012-04-30 03:14:53 +08:00
..
assets	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Fix for NCCU 0430 all functions ok with two submanagers but different behavors	2012-04-30 03:14:15 +08:00
helpers	Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen	2012-04-30 00:24:11 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	Fix filter and sort for status in announcement	2012-04-24 00:46:34 +08:00
views	Merge branch 'anc_approval_list' of https://github.com/Rulingcom/orbit into anc_approval_list	2012-04-30 03:14:53 +08:00