orbit-basic/app/controllers/admin
Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap
Conflicts:
	Gemfile
	app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
..
.designs_controller.rb.swp completing the code with segment fault 2011-08-16 12:14:01 +08:00
ad_banners_controller.rb Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager. 2012-05-04 15:40:43 +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 Add impressionist 2012-05-15 21:26:09 +08:00
designs_controller.rb Put sorting in web_link, page_context and design 2012-05-05 21:20:20 +08:00
infos_controller.rb Merge with sub_roles 2011-12-23 18:34:21 +08:00
items_controller.rb Fix bugs for shift_to and change items.rake for the missing position in db 2012-05-11 17:56:26 +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-05-14 00:57:17 +08:00
module_apps_new_interface_controller.rb New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +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
object_auths_new_interface_controller.rb Add impressionist 2012-05-15 21:26:09 +08:00
page_parts_controller.rb Merge branch 'design_team' into ldap 2012-05-10 00:34:23 +08:00
pages_controller.rb Add category and tag to pages 2012-05-14 00:33:52 +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 Add site_info 2012-05-07 00:54:18 +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