opensourceprojects.eu / osp-allura / Commit [84c18d]

Commit [84c18d] master History

Merge branch 'master' into dev

Signed-off-by: Wolf wolf@geek.net

Authored by: Wolf 2011-04-28

Browse code at this revision

Parent(s): [76cf08][a3ab54]

Child(ren): [f6375a]

1 2 3 4 > >> (Page 1 of 4)

added	Allura/allura/model/types.py
added	scripts/update-acls.py
removed	Allura/allura/ext/admin/templates/project_roles.html
removed	Allura/allura/templates/neighborhood_admin_permissions.html
removed	ForgeDownloads/forgedownloads/link_main.py
changed	Allura/allura/command/show_models.py
changed	Allura/allura/lib/search.py
changed	ForgeTracker/forgetracker/model/ticket.py
changed	ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
changed	requirements-common.txt
changed	Allura/allura/controllers/attachments.py
changed	Allura/allura/controllers/auth.py
changed	Allura/allura/controllers/discuss.py
changed	Allura/allura/controllers/project.py
changed	Allura/allura/controllers/repository.py
changed	Allura/allura/controllers/root.py
changed	Allura/allura/controllers/site_admin.py
changed	Allura/allura/controllers/test.py
changed	Allura/allura/ext/admin/templates/project_homepage.html
changed	Allura/allura/ext/admin/templates/project_overview.html
changed	Allura/allura/ext/admin/templates/project_screenshots.html
changed	Allura/allura/ext/admin/templates/project_tools.html
changed	Allura/allura/ext/admin/admin_main.py
changed	Allura/allura/ext/project_home/project_main.py
changed	Allura/allura/ext/user_profile/user_main.py

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

scripts/update-acls.py Diff Switch to side-by-side view

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

File was removed.

Allura/allura/templates/neighborhood_admin_permissions.html

File was removed.

ForgeDownloads/forgedownloads/link_main.py

File was removed.

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

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

ForgeTracker/forgetracker/model/ticket.py Diff Switch to side-by-side view

ForgeTracker/forgetracker/tests/unit/test_ticket_model.py Diff Switch to side-by-side view

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

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

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

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

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

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

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

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

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

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

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

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

Allura/allura/ext/admin/templates/project_tools.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/ext/user_profile/user_main.py Diff Switch to side-by-side view

1 2 3 4 > >> (Page 1 of 4)