opensourceprojects.eu / osp-allura / Commit [3d528f]

Commit [3d528f] master History

Merge branch 'js/2598' into dev

Authored by: Wayne Witzel III 2011-08-25

Browse code at this revision

Parent(s): [61328f][9d8275]

Child(ren): [41895e][a8468d]

added	Allura/allura/templates/widgets/download_button.html
changed	Allura/allura/lib/widgets/macros.py
changed	Allura/allura/lib/macro.py
changed	Allura/allura/templates/jinja_master/lib.html
changed	Allura/allura/tests/test_globals.py
changed	Allura/allura/ext/admin/templates/admin_widgets/card_field.html
changed	Allura/allura/ext/admin/admin_main.py
changed	Allura/allura/ext/admin/widgets.py
changed	Allura/allura/lib/security.py
changed	Allura/allura/tests/functional/test_admin.py
changed	Allura/allura/tests/test_security.py

Allura/allura/templates/widgets/download_button.html Diff Switch to side-by-side view

Allura/allura/lib/widgets/macros.py Diff Switch to side-by-side view

Allura/allura/lib/macro.py Diff Switch to side-by-side view

Allura/allura/templates/jinja_master/lib.html Diff Switch to side-by-side view

Allura/allura/tests/test_globals.py Diff Switch to side-by-side view

Allura/allura/ext/admin/templates/admin_widgets/card_field.html Diff Switch to side-by-side view

Allura/allura/ext/admin/admin_main.py Diff Switch to side-by-side view

Allura/allura/ext/admin/widgets.py Diff Switch to side-by-side view

Allura/allura/lib/security.py Diff Switch to side-by-side view

Allura/allura/tests/functional/test_admin.py Diff Switch to side-by-side view

Allura/allura/tests/test_security.py Diff Switch to side-by-side view