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
..
ad_banners	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
ad_images	Fix ad_banner sec and msec	2012-04-26 17:11:06 +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	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
designs	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
infos	Ray's back-end modifications for sub-roles	2011-12-28 20:57:18 +08:00
items	Ray's changes for structure and web_links	2012-04-27 11:02:56 +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-04-30 07:57:20 +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
page_parts	Separate announcement and news	2012-04-30 06:31:46 +08:00
pages	Separate announcement and news	2012-04-30 06:31:46 +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	Ray's back_end modification before sub_roles	2011-12-23 18:02:45 +08:00
tags	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
translations	Ray's back_end modification before sub_roles	2011-12-23 18:02:45 +08:00
users	Ray's modification before redesign	2012-01-24 11:57:27 +08:00