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

Commit [c58f0b] master History

Merge branch 'js/2170' into dev

js/2170:
[#2170] Allura theme now links Account to /auth/prefs/ instead of /account to fix 404

Authored by: John Hoffmann 2011-06-08

Browse code at this revision

Parent(s): [b6aefa][db71c5]

Child(ren): [917c50]

1 2 > >> (Page 1 of 2)

added	Allura/allura/lib/htmltruncate.py
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/templates/jinja_master/theme_macros.html
changed	Allura/allura/controllers/project.py
changed	Allura/allura/controllers/static.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/ext/user_profile/templates/user_index.html
changed	Allura/allura/lib/decorators.py
changed	Allura/allura/lib/macro.py
changed	Allura/allura/lib/plugin.py
changed	Allura/allura/model/artifact.py
changed	Allura/allura/model/notification.py
changed	Allura/allura/model/project.py
changed	Allura/allura/nf/allura/css/site_style.css
changed	Allura/allura/templates/jinja_master/nav_menu.html
changed	Allura/allura/tests/functional/test_admin.py
changed	Allura/allura/tests/functional/test_home.py
changed	Allura/allura/tests/functional/test_neighborhood.py
changed	Allura/allura/tests/functional/test_rest.py

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

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/templates/jinja_master/theme_macros.html Diff Switch to side-by-side view

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

Allura/allura/controllers/static.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/ext/user_profile/templates/user_index.html Diff Switch to side-by-side view

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

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

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

Allura/allura/model/artifact.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/nf/allura/css/site_style.css Diff Switch to side-by-side view

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

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

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

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

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

1 2 > >> (Page 1 of 2)