Christophe Vilayphiou 2eeb530422 Merge branch 'master' into ldap ... Conflicts: app/assets/stylesheets/new_admin.css.erb		2012-04-23 14:13:37 +08:00
..
ad_banners	fix js	2012-04-23 14:07:14 +08:00
ad_images	Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.	2012-04-23 14:07:13 +08:00
app_auths	Listing for Module-apps	2012-01-12 14:13:41 +08:00
assets	brief starting for dashboard,adds i18n vars	2012-02-15 00:34:21 +08:00
attributes	Fix parser_back_end & side_bar & meta	2012-03-30 15:51:29 +08:00
components	change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.	2012-02-29 18:58:33 +08:00
dashboards	Add isotope, categories for announcement page, sort for announcement	2012-02-23 15:52:58 +08:00
designs	Fix bugs and changes for nccu	2012-02-27 18:50:56 +08:00
infos	Ray's back-end modifications for sub-roles	2011-12-28 20:57:18 +08:00
items	changes before Chirs and Ray's trip	2012-04-19 11:50:54 +08:00
links	Improve code in items, pages, links	2012-02-17 14:54:11 +08:00
module_apps	LDAP with sync rake task	2012-03-06 16:41:06 +08:00
object_auths	First version for App and Object auth.Taking Announcement as experiment	2012-02-29 18:55:55 +08:00
page_parts	Add categories for all the widgets	2012-02-28 22:00:05 +08:00
pages	Fix parser_back_end & side_bar & meta	2012-03-30 15:51:29 +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	Fix mainTablePosition in js -> remove the notable class	2012-04-05 14:55:41 +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