Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap ... Conflicts: Gemfile.lock app/controllers/admin/module_apps_controller.rb app/controllers/application_controller.rb vendor/built_in_modules/web_resource/web_resource.json		2012-05-14 00:57:17 +08:00
..
ad_banners	hidding new ad_banner	2012-05-09 14:17:20 +08:00
ad_images	Fix site_locale_default_head and active for current locale	2012-05-07 00:53:52 +08:00
app_auths	Listing for Module-apps	2012-01-12 14:13:41 +08:00
assets	Fix for quick edit file and link in announcement	2012-04-26 16:42:28 +08:00
attributes	Fix parser_back_end & side_bar & meta	2012-03-30 15:51:29 +08:00
components	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
dashboards	Small adjustment for dashboard	2012-05-09 05:55:47 +08:00
designs	Put sorting in web_link, page_context and design	2012-05-05 21:20:20 +08:00
infos	Ray's back-end modifications for sub-roles	2011-12-28 20:57:18 +08:00
items	Put nestedSortable in page_edit.js.erb	2012-05-12 22:12:17 +08:00
links	Improve code in items, pages, links	2012-02-17 14:54:11 +08:00
module_apps	Merge branch 'design_team' into ldap	2012-05-14 00:57:17 +08:00
module_apps_new_interface	New Interface for App Auth and Object Auth	2012-05-14 00:50:12 +08:00
object_auths	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	New Interface for App Auth and Object Auth	2012-05-14 00:50:12 +08:00
page_parts	Fix titles for widgets	2012-05-13 23:09:48 +08:00
pages	Add category and tag to pages	2012-05-14 00:33:52 +08:00
purchases	Ray's back_end modification before sub_roles	2011-12-23 18:02:45 +08:00
roles	Merge branch 'fix_it'	2012-01-12 18:15:43 +08:00
sites	Hide some links in side_bar for site_settings	2012-05-09 12:53:42 +08:00
tags	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
translations	Fix wrong variable names in translations	2012-05-02 16:22:06 +08:00
users	Ray's modification before redesign	2012-01-24 11:57:27 +08:00