opensourceprojects.eu / osp-allura / Commit [03e52e]

Commit [03e52e] master History

Merge branch '42cc_4189_new_dev' into dev

Authored by: Tim Van Steenburgh 2012-08-14

Browse code at this revision

Parent(s): [7a868b][89029e]

Child(ren): [4334ee]

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

added	Allura/allura/nf/allura/images/vote_up.png
added	Allura/allura/nf/allura/images/vote_down.png
added	Allura/allura/public/nf/js/spin.min.js
added	ForgeWiki/forgewiki/tests/test_converters.py
added	ForgeWiki/forgewiki/tests/test_wiki2markdown.py
added	ForgeWiki/forgewiki/command/wiki2markdown/extractors.py
added	ForgeWiki/forgewiki/command/wiki2markdown/loaders.py
added	ForgeWiki/forgewiki/command/wiki2markdown/__init__.py
added	ForgeWiki/forgewiki/command/base.py
added	ForgeWiki/forgewiki/command/__init__.py
added	ForgeWiki/forgewiki/converters.py
added	scripts/migrations/028-remove-svn-trees.py
added	requirements-optional.txt
removed	Allura/allura/ext/user_profile/templates/user_timeline.html
removed	Allura/allura/lib/widgets/resources/css/vote.css
changed	Allura/allura/model/repo.py
changed	Allura/allura/command/base.py
changed	Allura/allura/config/app_cfg.py
changed	Allura/allura/controllers/discuss.py
changed	Allura/allura/controllers/repository.py
changed	Allura/allura/ext/admin/templates/project_tools.html
changed	Allura/allura/ext/user_profile/user_main.py
changed	Allura/allura/lib/widgets/resources/js/vote.js
changed	Allura/allura/lib/widgets/vote.py
changed	Allura/allura/lib/app_globals.py

Allura/allura/nf/allura/images/vote_up.png Diff Switch to side-by-side view

Allura/allura/nf/allura/images/vote_down.png Diff Switch to side-by-side view

Allura/allura/public/nf/js/spin.min.js Diff Switch to side-by-side view

ForgeWiki/forgewiki/tests/test_converters.py Diff Switch to side-by-side view

ForgeWiki/forgewiki/tests/test_wiki2markdown.py Diff Switch to side-by-side view

ForgeWiki/forgewiki/command/wiki2markdown/extractors.py Diff Switch to side-by-side view

ForgeWiki/forgewiki/command/wiki2markdown/loaders.py Diff Switch to side-by-side view

ForgeWiki/forgewiki/command/wiki2markdown/init.py Diff Switch to side-by-side view

ForgeWiki/forgewiki/command/base.py Diff Switch to side-by-side view

ForgeWiki/forgewiki/command/init.py Diff Switch to side-by-side view

ForgeWiki/forgewiki/converters.py Diff Switch to side-by-side view

scripts/migrations/028-remove-svn-trees.py Diff Switch to side-by-side view

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

Allura/allura/ext/user_profile/templates/user_timeline.html

File was removed.

Allura/allura/lib/widgets/resources/css/vote.css

File was removed.

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

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

Allura/allura/config/app_cfg.py Diff Switch to side-by-side view

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

Allura/allura/controllers/repository.py 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/user_profile/user_main.py Diff Switch to side-by-side view

Allura/allura/lib/widgets/resources/js/vote.js Diff Switch to side-by-side view

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

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

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