opensourceprojects.eu / osp-allura / Commit [591c74]

Commit [591c74] master History

Merge branch 'master' into dev

Authored by: Rick Copeland 2010-12-08

Browse code at this revision

Parent(s): [41adad][c11e9c]

Child(ren): [1d84c0]

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/allura/command/base.py
changed	ForgeClassic/sfx/lib/sfx_api.py
changed	ForgeMail/forgemail/app/handlers/react.py
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

Allura/allura/lib/widgets/resources/css/tagEditor.css Diff Switch to side-by-side view

Allura/allura/lib/widgets/resources/images/minus_small.png Diff Switch to side-by-side view

Allura/allura/public/nf/allura/css/fonts/pictos-web.svg Diff Switch to side-by-side view

Allura/allura/public/nf/allura/css/fonts/pictos-web.woff Diff Switch to side-by-side view

Allura/allura/public/nf/allura/css/fonts/pictos-web.eot Diff Switch to side-by-side view

Allura/allura/public/nf/allura/css/fonts/pictos-web.ttf Diff Switch to side-by-side view

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

Allura/allura/templates/jinja_master/footer.html

File was removed.

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/command/base.py Diff Switch to side-by-side view

ForgeClassic/sfx/lib/sfx_api.py Diff Switch to side-by-side view

ForgeMail/forgemail/app/handlers/react.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/widgets/discuss.py Diff Switch to side-by-side view

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

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

1 2 3 .. 5 > >> (Page 1 of 5)