Merge branch 'tv/2612' into dev

Wayne Witzel III Wayne Witzel III 2011-08-25

changed Allura/allura/ext/admin/templates/admin_widgets/card_field.html
changed Allura/allura/ext/admin/widgets.py
changed Allura/allura/ext/admin/admin_main.py
changed Allura/allura/lib/security.py
changed Allura/allura/tests/functional/test_admin.py
changed Allura/allura/tests/test_security.py
Allura/allura/ext/admin/templates/admin_widgets/card_field.html Diff Switch to side-by-side view
Loading...
Allura/allura/ext/admin/widgets.py Diff Switch to side-by-side view
Loading...
Allura/allura/ext/admin/admin_main.py Diff Switch to side-by-side view
Loading...
Allura/allura/lib/security.py Diff Switch to side-by-side view
Loading...
Allura/allura/tests/functional/test_admin.py Diff Switch to side-by-side view
Loading...
Allura/allura/tests/test_security.py Diff Switch to side-by-side view
Loading...