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

Commit [349351] master History

Merged master into dev

Authored by: Rick Copeland 2010-12-14

Browse code at this revision

Parent(s): [9bc4aa][b122d0]

Child(ren): [bde8d6]

<< < 1 2 3 4 .. 8 > >> (Page 2 of 8)

removed	Allura/allura/templates/jinja_master/main_menu.html
removed	ForgeClassic/sfx/nf
removed	ForgeClassic/sfx/nf/sfx
removed	ForgeClassic/sfx/nf/sfx/css
removed	ForgeClassic/sfx/nf/sfx/css/sfx.css
removed	ForgeClassic/sfx/nf/sfx/images
removed	ForgeClassic/sfx/nf/sfx/images/geeknet-logo.png
removed	ForgeClassic/sfx/nf/sfx/images/sf10.png
removed	ForgeClassic/sfx/templates/sfx/theme
removed	ForgeClassic/sfx/templates/sfx/theme/footer.html
changed	Allura/allura/controllers/auth.py
changed	Allura/allura/controllers/rest.py
changed	Allura/allura/controllers/static.py
changed	Allura/allura/lib/widgets/__init__.py
changed	Allura/allura/lib/validators.py
changed	Allura/allura/model/__init__.py
changed	Allura/allura/templates/widgets/forge_form.html
changed	Allura/allura/templates/user_preferences.html
changed	requirements.txt
changed	Allura/allura/controllers/repository.py
changed	Allura/allura/controllers/template.py
changed	Allura/allura/controllers/test.py
changed	Allura/allura/ext/admin/templates/project_overview.html
changed	Allura/allura/ext/admin/templates/project_permissions.html
changed	Allura/allura/ext/admin/templates/project_perms.html

Allura/allura/templates/jinja_master/main_menu.html

File was removed.

ForgeClassic/sfx/nf

File was removed.

ForgeClassic/sfx/nf/sfx

File was removed.

ForgeClassic/sfx/nf/sfx/css

File was removed.

ForgeClassic/sfx/nf/sfx/css/sfx.css

File was removed.

ForgeClassic/sfx/nf/sfx/images

File was removed.

ForgeClassic/sfx/nf/sfx/images/geeknet-logo.png

File was removed.

ForgeClassic/sfx/nf/sfx/images/sf10.png

File was removed.

ForgeClassic/sfx/templates/sfx/theme

File was removed.

ForgeClassic/sfx/templates/sfx/theme/footer.html

File was removed.

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

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

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

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

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

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

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

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

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

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

Allura/allura/controllers/template.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_overview.html Diff Switch to side-by-side view

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

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

<< < 1 2 3 4 .. 8 > >> (Page 2 of 8)