Christophe Vilayphiou b4f2354642 Merge branch 'master' into design_team

2012-01-16 08:07:49 +08:00

..

app_auths

Listing for Module-apps

2012-01-12 14:13:41 +08:00

assets

Forgot to remove ":remote => true" for asset new

2011-12-30 02:34:13 +08:00

attributes

Ray's back-end modifications for sub-roles

2011-12-28 20:57:18 +08:00

designs

Merge branch 'fix_it'

2012-01-12 18:15:43 +08:00

infos

Ray's back-end modifications for sub-roles

2011-12-28 20:57:18 +08:00

items

Fix missing modification for "panel_main" to "back_main"

2011-12-29 17:49:48 +08:00

links

Fix missing modification for "panel_main" to "back_main"

2011-12-29 17:49:48 +08:00

module_apps

Merge branch 'fix_it'

2012-01-12 18:15:43 +08:00

page_parts

Fix missing modification for "panel_main" to "back_main"

2011-12-29 17:49:48 +08:00

pages

Merge branch 'fix_it'

2012-01-12 18:15:43 +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

translations

Ray's back_end modification before sub_roles

2011-12-23 18:02:45 +08:00

users

Merge branch 'fix_it'

2012-01-12 18:15:43 +08:00