Christophe Vilayphiou f1c8bed29d Merge branch 'design_team' into ldap ...

Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

2012-05-22 20:33:07 +08:00

..

.designs_controller.rb.swp

completing the code with segment fault

2011-08-16 12:14:01 +08:00

ad_banners_controller.rb

fix view for different_user for ad_banner. add field 'best size' for ad_banner within form

2012-05-18 14:19:13 +08:00

ad_images_controller.rb

fix view for different_user for ad_banner. add field 'best size' for ad_banner within form

2012-05-18 14:19:13 +08:00

app_auths_controller.rb

add "all_user" for app&object auth

2012-02-29 18:56:42 +08:00

asset_categories_controller.rb

Proof i18n_variable for categories

2012-05-18 10:28:28 +08:00

asset_tags_controller.rb

Add tags to assets

2012-05-16 18:19:41 +08:00

assets_controller.rb

Asset changes, add description

2012-05-17 18:31:40 +08:00

dashboards_controller.rb

Changes on nccu

2012-05-18 15:20:45 +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

Proof i18n_variable for categories

2012-05-18 10:28:28 +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

Changes for structure

2012-05-22 14:45:49 +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

Changes on nccu

2012-05-18 15:20:45 +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

Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509

2012-05-16 12:13:07 +08:00

page_parts_controller.rb

Merge branch 'design_team' into ldap

2012-05-10 00:34:23 +08:00

pages_controller.rb

Changes for structure

2012-05-22 14:45:49 +08:00

purchases_controller.rb

Change "_filename" to "_identifier" for carrierwave

2012-01-24 11:57:27 +08:00

roles_controller.rb

Proof i18n_variable for categories

2012-05-18 10:28:28 +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