opensourceprojects.eu / osp-allura / Commit [ba6408]

Commit [ba6408] master History

Merge branch 'dev' into ffa/motorola

Authored by: Wolf 2011-06-06

Browse code at this revision

Parent(s): [acab0a][d5893a]

Child(ren): [d8922d]

added	scripts/uninstall-home.py
added	scripts/emsignia-SOLUTIONS-blue.gif
added	scripts/emsignia-MOBILITY-red.png
removed	Allura/allura/ext/admin/templates/project_homepage.html
changed	Allura/allura/lib/widgets/form_fields.py
changed	Allura/allura/templates/widgets/admin_form.html
changed	ForgeWiki/forgewiki/templates/wiki/admin_options.html
changed	scripts/backup_project.py
changed	requirements-common.txt
changed	Allura/allura/controllers/project.py
changed	Allura/allura/ext/admin/templates/project_admin.html
changed	Allura/allura/ext/admin/templates/project_trove.html
changed	Allura/allura/ext/admin/admin_main.py
changed	Allura/allura/ext/project_home/project_main.py
changed	Allura/allura/lib/decorators.py
changed	Allura/allura/lib/plugin.py
changed	Allura/allura/model/notification.py
changed	Allura/allura/model/project.py
changed	Allura/allura/tests/functional/test_admin.py
changed	Allura/allura/app.py
changed	ForgeBlog/forgeblog/model/blog.py
changed	ForgeWiki/forgewiki/model/wiki.py
changed	ForgeWiki/forgewiki/wiki_main.py
changed	scripts/teamforge-import.py
changed	requirements-common.txt

scripts/uninstall-home.py Diff Switch to side-by-side view

scripts/emsignia-SOLUTIONS-blue.gif Diff Switch to side-by-side view

scripts/emsignia-MOBILITY-red.png Diff Switch to side-by-side view

Allura/allura/ext/admin/templates/project_homepage.html

File was removed.

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

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

ForgeWiki/forgewiki/templates/wiki/admin_options.html Diff Switch to side-by-side view

scripts/backup_project.py Diff Switch to side-by-side view

requirements-common.txt Diff Switch to side-by-side view

Allura/allura/controllers/project.py Diff Switch to side-by-side view

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

Allura/allura/ext/admin/templates/project_trove.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/project_home/project_main.py Diff Switch to side-by-side view

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

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

Allura/allura/model/notification.py Diff Switch to side-by-side view

Allura/allura/model/project.py Diff Switch to side-by-side view

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

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

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

ForgeWiki/forgewiki/model/wiki.py Diff Switch to side-by-side view

ForgeWiki/forgewiki/wiki_main.py Diff Switch to side-by-side view

scripts/teamforge-import.py Diff Switch to side-by-side view

requirements-common.txt Diff Switch to side-by-side view