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

..

_app_selector.html.erb

LDAP with sync rake task

2012-03-06 16:41:06 +08:00

edit.html.erb

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

index.html.erb

creating for disabling widgets and frontend

2012-01-05 16:21:33 +08:00

reload_frontend_pages.js.erb

Add isotope, categories for announcement page, sort for announcement

2012-02-23 15:52:58 +08:00

show.html.erb

Exp with object_auth

2012-02-29 18:50:23 +08:00