Orbit/app/controllers/admin
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
..
.designs_controller.rb.swp completing the code with segment fault 2011-08-16 12:14:01 +08:00
ad_banners_controller.rb Change ad_banner preview from using title to id 2012-04-25 16:10:11 +08:00
ad_images_controller.rb Fix ad image date selector 2012-04-24 14:37:06 +08:00
app_auths_controller.rb add "all_user" for app&object auth 2012-02-29 18:56:42 +08:00
assets_controller.rb Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
dashboards_controller.rb Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
designs_controller.rb Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
infos_controller.rb Merge with sub_roles 2011-12-23 18:34:21 +08:00
items_controller.rb Improve code in items, pages, links 2012-02-17 14:54:11 +08:00
links_controller.rb Improve code in items, pages, links 2012-02-17 14:54:11 +08:00
module_apps_controller.rb Merge branch 'design_team' into ldap 2012-04-30 07:57:20 +08:00
object_auths_controller.rb 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
page_parts_controller.rb Merge branch 'design_team' into ldap 2012-04-30 07:57:20 +08:00
pages_controller.rb Separate announcement and news 2012-04-30 06:31:46 +08:00
purchases_controller.rb Change "_filename" to "_identifier" for carrierwave 2012-01-24 11:57:27 +08:00
roles_controller.rb Merge with sub_roles 2011-12-23 18:34:21 +08:00
sessions_controller.rb Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
sites_controller.rb Clean code for layout and modifications in dev.rake 2011-08-22 13:45:21 +08:00
tags_controller.rb edit tags 2012-02-15 15:38:27 +08:00
translations_controller.rb Merge with sub_roles 2011-12-23 18:34:21 +08:00
users_controller.rb Merge with sub_roles 2011-12-23 18:34:21 +08:00