Merge branch 'master' into dev

Rick Copeland Rick Copeland 2010-12-08

1 2 3 .. 5 > >> (Page 1 of 5)
added Allura/allura/lib/widgets/resources/css/tagEditor.css
added Allura/allura/lib/widgets/resources/images/minus_small.png
added Allura/allura/public/nf/allura/css/fonts/pictos-web.svg
added Allura/allura/public/nf/allura/css/fonts/pictos-web.woff
added Allura/allura/public/nf/allura/css/fonts/pictos-web.eot
added Allura/allura/public/nf/allura/css/fonts/pictos-web.ttf
added Allura/allura/templates/jinja_master/theme_macros.html
removed Allura/allura/templates/jinja_master/footer.html
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/push_re.py
changed requirements.txt
changed Allura/allura/ext/user_profile/templates/user_index.html
changed Allura/allura/lib/widgets/discuss.py
changed Allura/allura/lib/widgets/form_fields.py
changed Allura/allura/lib/plugin.py
changed Allura/allura/lib/repository.py
Allura/allura/lib/widgets/resources/css/tagEditor.css Diff Switch to side-by-side view
Loading...
Allura/allura/lib/widgets/resources/images/minus_small.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/allura/css/fonts/pictos-web.svg Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/allura/css/fonts/pictos-web.woff Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/allura/css/fonts/pictos-web.eot Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/allura/css/fonts/pictos-web.ttf Diff Switch to side-by-side view
Loading...
Allura/allura/templates/jinja_master/theme_macros.html Diff Switch to side-by-side view
Loading...
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/images
File was removed.
Allura/push_re.py Diff Switch to side-by-side view
Loading...
requirements.txt Diff Switch to side-by-side view
Loading...
Allura/allura/ext/user_profile/templates/user_index.html Diff Switch to side-by-side view
Loading...
Allura/allura/lib/widgets/discuss.py Diff Switch to side-by-side view
Loading...
Allura/allura/lib/widgets/form_fields.py Diff Switch to side-by-side view
Loading...
Allura/allura/lib/plugin.py Diff Switch to side-by-side view
Loading...
Allura/allura/lib/repository.py Diff Switch to side-by-side view
Loading...
1 2 3 .. 5 > >> (Page 1 of 5)