Christophe Vilayphiou 20504b2205 Merge branch 'design_team' into ldap ... Conflicts: app/controllers/admin/page_parts_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb		2012-04-30 07:57:20 +08:00
..
assets	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Merge branch 'design_team' into ldap	2012-04-30 07:57:20 +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	DRY code for sorting	2012-04-30 06:30:52 +08:00
views	Merge branch 'design_team' into ldap	2012-04-30 07:57:20 +08:00