Christophe Vilayphiou 2b9190a49e Merge branch 'design_team' into ldap ...

Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

2012-05-08 11:40:38 +08:00

..

_app_selector.html.erb

LDAP with sync rake task

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

edit.html.erb

Announcement preivew

2012-05-04 15:50:45 +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