opensourceprojects.eu / osp-allura / Commit [5ff1d6]

Commit [5ff1d6] master History

Merge branch 'js/p40' into tv/motorola

Authored by: Tim Van Steenburgh 2011-06-02

Browse code at this revision

Parent(s): [a744c5][d9e6b5]

Child(ren): [8a4ef4]

changed	Allura/allura/lib/plugin.py
changed	ForgeBlog/forgeblog/model/blog.py
changed	scripts/teamforge-import.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/model/auth.py
changed	Allura/allura/tests/functional/test_admin.py
changed	Allura/allura/tests/model/test_auth.py

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

ForgeBlog/forgeblog/model/blog.py Diff Switch to side-by-side view

scripts/teamforge-import.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/model/auth.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/model/test_auth.py Diff Switch to side-by-side view