You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ac...@apache.org on 2013/04/16 14:29:39 UTC

[49/50] git commit: Merge branch 'master' into acs2/5518

Merge branch 'master' into acs2/5518


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/674348a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/674348a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/674348a2

Branch: refs/heads/acs2/5518
Commit: 674348a2bd1e17fc102ec5e6ad27d97950dd95fd
Parents: 9213be0 630309e
Author: Alvaro del Castillo <ac...@barrapunto.com>
Authored: Tue Apr 16 13:34:04 2013 +0200
Committer: Alvaro del Castillo <ac...@barrapunto.com>
Committed: Tue Apr 16 13:34:04 2013 +0200

----------------------------------------------------------------------
 .gitignore                                         |    1 +
 Allura/LICENSE                                     |  335 ++++++++
 Allura/NOTICE                                      |   18 +
 Allura/README.txt                                  |   24 -
 Allura/allura/app.py                               |   27 +-
 Allura/allura/command/base.py                      |   10 +-
 Allura/allura/command/reclone_repo.py              |    2 +-
 Allura/allura/command/script.py                    |    2 +-
 Allura/allura/command/show_models.py               |    2 +-
 Allura/allura/command/taskd.py                     |   10 +-
 Allura/allura/command/taskd_cleanup.py             |   12 +-
 Allura/allura/config/environment.py                |    3 -
 Allura/allura/config/middleware.py                 |   17 +-
 Allura/allura/controllers/auth.py                  |  429 ++++++----
 .../controllers/basetest_neighborhood_root.py      |    3 +-
 Allura/allura/controllers/basetest_project_root.py |    3 +-
 Allura/allura/controllers/discuss.py               |   26 +-
 Allura/allura/controllers/project.py               |   86 ++-
 Allura/allura/controllers/repository.py            |   69 ++-
 Allura/allura/controllers/rest.py                  |    3 +-
 Allura/allura/controllers/root.py                  |   19 +-
 Allura/allura/controllers/search.py                |    5 +-
 Allura/allura/controllers/site_admin.py            |  140 +++-
 Allura/allura/controllers/static.py                |    8 +-
 Allura/allura/controllers/trovecategories.py       |    3 +-
 Allura/allura/eventslistener.py                    |   63 ++
 Allura/allura/ext/admin/admin_main.py              |   23 +-
 .../templates/admin_widgets/metadata_admin.html    |    3 +
 .../allura/ext/admin/templates/project_admin.html  |    2 +-
 .../ext/admin/templates/project_overview.html      |    8 +-
 .../allura/ext/admin/templates/project_tools.html  |   28 +-
 Allura/allura/ext/admin/widgets.py                 |    3 +-
 Allura/allura/ext/project_home/project_main.py     |    4 +-
 Allura/allura/ext/search/search_main.py            |    4 +-
 Allura/allura/ext/user_profile/user_main.py        |   23 +-
 Allura/allura/i18n/ru/LC_MESSAGES/pyforge.po       |    5 +-
 Allura/allura/lib/app_globals.py                   |   43 +-
 Allura/allura/lib/base.py                          |    2 +-
 Allura/allura/lib/custom_middleware.py             |   62 ++-
 Allura/allura/lib/decorators.py                    |   10 +-
 Allura/allura/lib/graphics/graphic_methods.py      |   69 ++
 Allura/allura/lib/helpers.py                       |   39 +-
 Allura/allura/lib/import_api.py                    |    3 +
 Allura/allura/lib/macro.py                         |   65 ++-
 Allura/allura/lib/mail_util.py                     |    2 +-
 Allura/allura/lib/markdown_extensions.py           |   23 +-
 Allura/allura/lib/oid_helper.py                    |    3 +-
 Allura/allura/lib/plugin.py                        |   68 ++-
 Allura/allura/lib/repository.py                    |   22 +-
 Allura/allura/lib/search.py                        |   60 +-
 Allura/allura/lib/security.py                      |   68 ++-
 Allura/allura/lib/solr.py                          |    5 +-
 Allura/allura/lib/spam/__init__.py                 |   30 +-
 Allura/allura/lib/spam/akismetfilter.py            |   53 ++
 Allura/allura/lib/spam/akismetservice.py           |   28 -
 Allura/allura/lib/spam/mollomfilter.py             |   61 ++
 Allura/allura/lib/utils.py                         |   83 +--
 Allura/allura/lib/validators.py                    |   77 ++
 Allura/allura/lib/widgets/discuss.py               |   43 +-
 Allura/allura/lib/widgets/form_fields.py           |   87 ++-
 Allura/allura/lib/widgets/forms.py                 |  160 ++--
 Allura/allura/lib/widgets/oauth_widgets.py         |    2 +-
 Allura/allura/lib/widgets/project_list.py          |    2 +-
 .../allura/lib/widgets/resources/css/combobox.css  |   17 +
 .../lib/widgets/resources/css/jquery.tagsinput.css |    8 +
 Allura/allura/lib/widgets/resources/css/search.css |   12 +
 Allura/allura/lib/widgets/resources/js/combobox.js |  146 ++++
 .../lib/widgets/resources/js/jquery.lightbox_me.js |  198 +++--
 .../lib/widgets/resources/js/jquery.tag.editor.js  |  147 ----
 .../lib/widgets/resources/js/jquery.tagsinput.js   |  357 ++++++++
 .../resources/js/sortable_repeated_field.js        |    4 +-
 Allura/allura/lib/widgets/search.py                |    4 +-
 Allura/allura/lib/widgets/subscriptions.py         |   15 +-
 Allura/allura/model/artifact.py                    |   29 +-
 Allura/allura/model/attachments.py                 |    2 +-
 Allura/allura/model/auth.py                        |   30 +-
 Allura/allura/model/discuss.py                     |   15 +-
 Allura/allura/model/index.py                       |    2 +-
 Allura/allura/model/monq_model.py                  |   23 +-
 Allura/allura/model/neighborhood.py                |   26 +-
 Allura/allura/model/notification.py                |    9 +-
 Allura/allura/model/oauth.py                       |    2 +-
 Allura/allura/model/project.py                     |  149 +++-
 Allura/allura/model/repo.py                        |  527 +++++++++++-
 Allura/allura/model/repo_refresh.py                |  274 ++++---
 Allura/allura/model/repository.py                  |  128 +++-
 Allura/allura/model/session.py                     |    2 +-
 Allura/allura/model/stats.py                       |  643 ++++++++++++++-
 Allura/allura/nf/allura/css/allura.css             |   19 +-
 Allura/allura/nf/allura/css/site_style.css         |  124 +++-
 Allura/allura/public/nf/images/down.png            |  Bin 0 -> 2993 bytes
 Allura/allura/public/nf/images/equal.png           |  Bin 0 -> 343 bytes
 Allura/allura/public/nf/images/up.png              |  Bin 0 -> 2974 bytes
 Allura/allura/public/nf/js/allura-base.js          |   14 +-
 Allura/allura/public/nf/js/jquery.maxlength-min.js |    8 -
 Allura/allura/public/nf/js/jquery.maxlength.min.js |    7 +
 Allura/allura/public/nf/js/project_tools.js        |   11 +-
 Allura/allura/scripts/__init__.py                  |    1 +
 Allura/allura/scripts/refresh_last_commits.py      |  186 +++++
 Allura/allura/scripts/refreshrepo.py               |  155 ++++
 Allura/allura/scripts/scripttask.py                |   91 ++
 Allura/allura/tasks/index_tasks.py                 |    2 +-
 Allura/allura/tasks/mail_tasks.py                  |    2 +-
 Allura/allura/tasks/repo_tasks.py                  |   17 +-
 Allura/allura/templates/app_admin_options.html     |   10 +-
 Allura/allura/templates/jinja_master/lib.html      |   44 +-
 .../templates/jinja_master/sidebar_menu.html       |    2 +-
 .../templates/jinja_master/theme_macros.html       |    4 +-
 Allura/allura/templates/jinja_master/top_nav.html  |    8 +-
 Allura/allura/templates/mail/footer.txt            |    2 +-
 Allura/allura/templates/members.html               |   26 +
 Allura/allura/templates/neighborhood_list.html     |   31 +
 Allura/allura/templates/oauth_authorize_ok.html    |    4 +-
 Allura/allura/templates/repo/barediff.html         |    8 +-
 Allura/allura/templates/repo/commit.html           |    2 +-
 Allura/allura/templates/repo/diff.html             |    8 +-
 Allura/allura/templates/repo/file.html             |    2 +-
 Allura/allura/templates/repo/forks.html            |   13 +
 Allura/allura/templates/repo/log.html              |   54 ++-
 Allura/allura/templates/repo/tarball.html          |   77 ++
 Allura/allura/templates/repo/tree.html             |    6 +
 Allura/allura/templates/search_index.html          |    4 +-
 Allura/allura/templates/site_admin.html            |   12 +-
 .../allura/templates/site_admin_api_tickets.html   |    2 +-
 Allura/allura/templates/site_admin_task_list.html  |   93 +++
 Allura/allura/templates/site_admin_task_new.html   |  112 +++
 Allura/allura/templates/site_admin_task_view.html  |  153 ++++
 Allura/allura/templates/tool_list.html             |   21 +
 Allura/allura/templates/trovecategories.html       |    2 +-
 Allura/allura/templates/user_availability.html     |   83 ++
 Allura/allura/templates/user_contacts.html         |   58 ++
 Allura/allura/templates/user_info.html             |   47 ++
 Allura/allura/templates/user_preferences.html      |  279 -------
 Allura/allura/templates/user_prefs.html            |  140 ++++
 Allura/allura/templates/user_skills.html           |   33 +-
 Allura/allura/templates/user_subs.html             |   54 ++
 .../allura/templates/widgets/download_button.html  |    2 +-
 Allura/allura/templates/widgets/moderate_post.html |   16 +-
 .../allura/templates/widgets/moderate_posts.html   |   10 +-
 .../widgets/neighborhood_overview_form.html        |    6 +
 Allura/allura/templates/widgets/post_widget.html   |   60 +-
 .../templates/widgets/project_user_combo.html      |    5 +
 Allura/allura/templates/widgets/repo/log.html      |   13 +-
 .../allura/templates/widgets/search_results.html   |   58 +-
 Allura/allura/tests/decorators.py                  |    2 +-
 Allura/allura/tests/functional/test_admin.py       |   27 +-
 Allura/allura/tests/functional/test_auth.py        |  114 ++--
 Allura/allura/tests/functional/test_discuss.py     |   41 +-
 Allura/allura/tests/functional/test_home.py        |   26 +-
 .../allura/tests/functional/test_neighborhood.py   |   91 ++-
 Allura/allura/tests/functional/test_root.py        |    6 +-
 Allura/allura/tests/functional/test_site_admin.py  |   74 ++-
 Allura/allura/tests/functional/test_tool_list.py   |   13 +
 .../allura/tests/functional/test_user_profile.py   |    2 +-
 Allura/allura/tests/model/test_artifact.py         |    4 +-
 Allura/allura/tests/model/test_auth.py             |    9 +-
 Allura/allura/tests/model/test_discussion.py       |    6 +-
 Allura/allura/tests/model/test_neighborhood.py     |    6 +-
 Allura/allura/tests/model/test_notification.py     |    6 +-
 Allura/allura/tests/model/test_openid.py           |    3 +-
 Allura/allura/tests/model/test_project.py          |   24 +-
 Allura/allura/tests/model/test_repo.py             |  503 +++++++++++-
 Allura/allura/tests/test_app.py                    |    2 +-
 Allura/allura/tests/test_diff.py                   |  122 +++
 Allura/allura/tests/test_globals.py                |  187 +++--
 Allura/allura/tests/test_helpers.py                |   40 +-
 Allura/allura/tests/test_scripttask.py             |   24 +
 Allura/allura/tests/test_security.py               |   94 +++
 Allura/allura/tests/test_tasks.py                  |    5 +-
 Allura/allura/tests/test_utils.py                  |   64 ++-
 Allura/allura/tests/test_validators.py             |  107 +++
 Allura/allura/tests/tscript.py                     |    2 +-
 .../test_discussion_moderation_controller.py       |    5 +-
 Allura/allura/tests/unit/patches.py                |    2 +-
 Allura/allura/tests/unit/spam/test_akismet.py      |  103 +++
 Allura/allura/tests/unit/spam/test_mollom.py       |   77 ++
 Allura/allura/tests/unit/spam/test_spam_filter.py  |   40 +
 .../tests/unit/test_helpers/test_set_context.py    |    2 +-
 Allura/allura/tests/unit/test_project.py           |   59 ++
 Allura/allura/tests/unit/test_repo.py              |  252 ++++---
 Allura/allura/tests/unit/test_sitemapentry.py      |   16 +
 Allura/allura/tests/unit/test_spam.py              |   95 ---
 Allura/allura/tests/unit/test_utils.py             |  158 ----
 Allura/allura/websetup/bootstrap.py                |    3 +-
 Allura/allura/websetup/schema.py                   |    4 +-
 Allura/development.ini                             |    9 +
 Allura/docs/conf.py                                |    4 +-
 Allura/docs/tutorials/wiki-tool.rst                |    2 +-
 Allura/setup.py                                    |    4 +
 Allura/test-light.py                               |    2 +-
 Allura/test.ini                                    |    3 +
 AlluraTesting/LICENSE                              |  234 ++++++
 AlluraTesting/alluratest/controller.py             |    7 +-
 AlluraTesting/alluratest/test_syntax.py            |    5 +-
 AlluraTesting/alluratest/validation.py             |    3 +-
 CONTRIBUTING                                       |    2 +-
 ForgeActivity/forgeactivity/main.py                |    6 +-
 ForgeActivity/forgeactivity/widgets/follow.py      |    2 +-
 ForgeBlog/forgeblog/command/__init__.py            |    1 -
 ForgeBlog/forgeblog/command/rssfeeds.py            |   13 +-
 ForgeBlog/forgeblog/main.py                        |   41 +-
 ForgeBlog/forgeblog/model/blog.py                  |    9 +-
 ForgeBlog/forgeblog/templates/blog/search.html     |    6 +-
 .../templates/blog_widgets/preview_post.html       |    2 +-
 .../templates/blog_widgets/view_post.html          |    2 +-
 ForgeBlog/forgeblog/tests/test_commands.py         |   26 +-
 ForgeBlog/forgeblog/tests/test_roles.py            |    2 +-
 ForgeBlog/forgeblog/tests/unit/__init__.py         |    4 +-
 ForgeBlog/forgeblog/tests/unit/test_blog_post.py   |    2 +-
 ForgeChat/forgechat/command.py                     |    2 +-
 ForgeChat/forgechat/main.py                        |   29 +-
 ForgeChat/forgechat/templates/chat/search.html     |    6 +-
 ForgeDiscussion/NOTICE                             |    5 +
 .../forgediscussion/controllers/forum.py           |    2 +-
 .../forgediscussion/controllers/root.py            |   31 +-
 ForgeDiscussion/forgediscussion/forum_main.py      |    7 +-
 ForgeDiscussion/forgediscussion/import_support.py  |    2 +-
 ForgeDiscussion/forgediscussion/tasks.py           |    2 +-
 .../templates/discussionforums/search.html         |    4 +-
 .../forgediscussion/tests/functional/test_forum.py |   36 +-
 .../tests/functional/test_import.py                |    5 +-
 .../forgediscussion/tests/test_forum_roles.py      |    2 +-
 ForgeDiscussion/forgediscussion/widgets/admin.py   |    2 +-
 .../forgediscussion/widgets/forum_widgets.py       |   40 +-
 ForgeGit/NOTICE                                    |    5 +
 ForgeGit/forgegit/controllers.py                   |    4 +-
 ForgeGit/forgegit/git_main.py                      |    2 +-
 ForgeGit/forgegit/model/git_repo.py                |   61 ++-
 ForgeGit/forgegit/templates/git/index.html         |   16 +-
 .../5c/47243c8e424136fd5cdd18cd94d34c66d1955c      |    3 +
 .../5c/891311e2b402f3f86eabf1688b5496183d9f94      |  Bin 0 -> 24 bytes
 .../b1/42cbffd81acd7c57b47bf64fbb9e0920d82c55      |  Bin 0 -> 78 bytes
 .../forgegit/tests/data/testgit.git/refs/heads/zz  |    1 +
 .../2c/e83a24e52c21e8d2146b1a04a20717c0bb08d7      |    2 +
 .../4d/a92902b500ae6b74b8e6dea9639ebfde6a007f      |  Bin 0 -> 158 bytes
 .../82/ac89a3fa20831c99faa54331fdce563df45dc8      |  Bin 0 -> 794 bytes
 .../8d/27123659c0022b0a4a7b10f4d1fe03800a1c8c      |  Bin 0 -> 158 bytes
 .../d9/61abbbf10341ee18a668c975842c35cfc0bef2      |    1 +
 .../e1/db0418f7fe2c16e9a57b50196e6ff25c2089ca      |  Bin 0 -> 415 bytes
 .../tests/data/testmime.git/refs/heads/master      |    2 +-
 .../forgegit/tests/functional/test_controllers.py  |   81 ++-
 ForgeGit/forgegit/tests/model/test_repository.py   |  129 +++-
 ForgeGit/forgegit/tests/test_git_app.py            |    2 +-
 ForgeGit/forgegit/tests/test_tasks.py              |    2 +-
 ForgeLink/NOTICE                                   |    5 +
 ForgeLink/forgelink/link_main.py                   |    5 +-
 ForgeSVN/NOTICE                                    |    5 +
 ForgeSVN/forgesvn/controllers.py                   |    4 +-
 ForgeSVN/forgesvn/model/svn.py                     |  237 +++++--
 ForgeSVN/forgesvn/svn_main.py                      |    5 +-
 .../tests/data/testsvn/hooks/post-revprop-change   |    3 +-
 .../forgesvn/tests/functional/test_controllers.py  |   18 +-
 ForgeSVN/forgesvn/tests/model/test_repository.py   |  157 ++--
 .../forgesvn/tests/model/test_svnimplementation.py |   58 ++
 ForgeSVN/forgesvn/tests/test_svn_app.py            |    2 +-
 ForgeSVN/forgesvn/tests/test_tasks.py              |    2 +-
 ForgeSVN/setup.py                                  |    9 +
 ForgeShortUrl/forgeshorturl/command/base.py        |    5 -
 .../forgeshorturl/command/migrate_urls.py          |  106 ---
 ForgeShortUrl/forgeshorturl/main.py                |   18 +-
 ForgeShortUrl/forgeshorturl/model/shorturl.py      |    6 +-
 ForgeShortUrl/forgeshorturl/templates/search.html  |    2 +-
 .../forgeshorturl/tests/functional/test.py         |    4 +-
 ForgeShortUrl/forgeshorturl/tests/test_commands.py |   71 --
 ForgeShortUrl/setup.py                             |    2 -
 ForgeTracker/NOTICE                                |    5 +
 .../forgetracker/command/fix_discussion.py         |   84 ++
 ForgeTracker/forgetracker/import_support.py        |    9 +-
 ForgeTracker/forgetracker/model/ticket.py          |  203 ++++-
 ForgeTracker/forgetracker/tasks.py                 |   17 +
 .../forgetracker/templates/tracker/index.html      |   10 +
 .../forgetracker/templates/tracker/milestone.html  |   11 +-
 .../templates/tracker/move_ticket.html             |    9 +
 .../forgetracker/templates/tracker/search.html     |    9 +
 .../forgetracker/templates/tracker/ticket.html     |   22 +-
 .../templates/tracker_widgets/mass_edit.html       |    2 +-
 .../templates/tracker_widgets/mass_edit_form.html  |   10 +-
 .../tracker_widgets/ticket_search_results.html     |    8 +-
 .../tests/command/test_fix_discussion.py           |   65 ++
 .../forgetracker/tests/functional/test_import.py   |    5 +-
 .../forgetracker/tests/functional/test_rest.py     |    5 +-
 .../forgetracker/tests/functional/test_root.py     |  500 +++++++++++-
 .../forgetracker/tests/test_tracker_roles.py       |    2 +-
 ForgeTracker/forgetracker/tests/unit/__init__.py   |    5 +-
 .../forgetracker/tests/unit/test_globals_model.py  |   71 ++-
 .../tests/unit/test_milestone_controller.py        |    2 +-
 .../tests/unit/test_root_controller.py             |    2 +-
 .../tests/unit/test_ticket_custom_fields_form.py   |    2 +-
 .../forgetracker/tests/unit/test_ticket_form.py    |    2 +-
 .../forgetracker/tests/unit/test_ticket_model.py   |  130 +++-
 ForgeTracker/forgetracker/tracker_main.py          |  324 +++++---
 .../forgetracker/widgets/admin_custom_fields.py    |    2 +-
 .../forgetracker/widgets/resources/js/mass-edit.js |   16 +-
 ForgeTracker/forgetracker/widgets/ticket_form.py   |   93 ++-
 ForgeTracker/forgetracker/widgets/ticket_search.py |    2 +-
 ForgeTracker/setup.py                              |    3 +
 .../forgeuserstats/controllers/userstats.py        |  308 +++++++
 ForgeUserStats/forgeuserstats/main.py              |  146 ++++
 ForgeUserStats/forgeuserstats/model/stats.py       |   51 ++
 .../nf/userstats/images/stats_24.png               |  Bin 0 -> 654 bytes
 .../nf/userstats/images/stats_32.png               |  Bin 0 -> 715 bytes
 .../nf/userstats/images/stats_48.png               |  Bin 0 -> 925 bytes
 .../forgeuserstats/templates/artifacts.html        |   65 ++
 .../forgeuserstats/templates/commits.html          |   54 ++
 ForgeUserStats/forgeuserstats/templates/index.html |  435 ++++++++++
 .../forgeuserstats/templates/settings.html         |   19 +
 .../forgeuserstats/templates/tickets.html          |   64 ++
 .../forgeuserstats/tests/data/testgit.git/HEAD     |    1 +
 .../forgeuserstats/tests/data/testgit.git/config   |    4 +
 .../tests/data/testgit.git/description             |    1 +
 .../tests/data/testgit.git/info/exclude            |    6 +
 .../0d/666fc313e6f4829e8d4446d4529394f8e464a9      |  Bin 0 -> 29 bytes
 .../0f/419b54b956f4a849a689105216282f1a4c749a      |  Bin 0 -> 51 bytes
 .../1e/146e67985dcd71c74de79613719bef7bddca4a      |  Bin 0 -> 164 bytes
 .../43/80f66cf5cbd858b73156681d665593ec80a58d      |  Bin 0 -> 43 bytes
 .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904      |  Bin 0 -> 15 bytes
 .../6a/45885ae7347f1cac5103b0050cc1be6a1496c8      |  Bin 0 -> 158 bytes
 .../6d/2ce67bdd55ae2c2ac72cbc879ed7c67ecc9786      |  Bin 0 -> 43 bytes
 .../8c/3c7fbcd903744b20fd7567a1fcefa99133b5bc      |  Bin 0 -> 53 bytes
 .../9a/7df788cf800241e3bb5a849c8870f2f8259d98      |  Bin 0 -> 129 bytes
 .../be/00c63250248c284b842deee5d8fb0b8132acab      |  Bin 0 -> 42 bytes
 .../d7/c40db3ffe2b87e96b94c280a67265c8de7a4ad      |  Bin 0 -> 51 bytes
 .../df/30427c488aeab84b2352bdf88a3b19223f9d7a      |    2 +
 .../e5/6a4d15295d3754310f114c86d93645308110ad      |  Bin 0 -> 43 bytes
 .../e9/65047ad7c57865823c7d992b1d046ea66edf78      |  Bin 0 -> 21 bytes
 .../tests/data/testgit.git/refs/heads/master       |    1 +
 ForgeUserStats/forgeuserstats/tests/test_model.py  |  374 +++++++++
 ForgeUserStats/forgeuserstats/tests/test_stats.py  |  185 +++++
 ForgeUserStats/forgeuserstats/version.py           |    2 +
 ForgeUserStats/forgeuserstats/widgets/forms.py     |   22 +
 ForgeUserStats/setup.py                            |   33 +
 ForgeUserStats/test.ini                            |   54 ++
 ForgeWiki/NOTICE                                   |    5 +
 ForgeWiki/forgewiki/command/__init__.py            |    1 -
 ForgeWiki/forgewiki/command/base.py                |    4 -
 .../forgewiki/command/wiki2markdown/__init__.py    |   94 ---
 .../forgewiki/command/wiki2markdown/extractors.py  |  178 ----
 .../forgewiki/command/wiki2markdown/loaders.py     |  191 -----
 ForgeWiki/forgewiki/converters.py                  |   13 +-
 ForgeWiki/forgewiki/model/wiki.py                  |   13 +-
 .../forgewiki/scripts/wiki2markdown/__init__.py    |    1 +
 .../forgewiki/scripts/wiki2markdown/extractors.py  |  171 ++++
 .../forgewiki/scripts/wiki2markdown/loaders.py     |  182 ++++
 .../scripts/wiki2markdown/wiki2markdown.py         |  109 +++
 ForgeWiki/forgewiki/templates/wiki/page_view.html  |    4 +-
 ForgeWiki/forgewiki/templates/wiki/search.html     |    2 +-
 ForgeWiki/forgewiki/tests/functional/test_root.py  |    6 +-
 ForgeWiki/forgewiki/tests/test_wiki2markdown.py    |    8 +-
 ForgeWiki/forgewiki/tests/test_wiki_roles.py       |    2 +-
 ForgeWiki/forgewiki/wiki_main.py                   |   67 ++-
 Makefile                                           |    8 +
 Makefile.def.buildbot                              |    8 +-
 NoWarnings/NOTICE                                  |    5 +
 NoWarnings/setup.py                                |    1 -
 README.markdown                                    |   92 +--
 rebuild-all.bash                                   |    9 +
 rebuild.bash                                       |    8 -
 requirements-common.txt                            |   16 +-
 requirements-optional.txt                          |    7 +
 requirements-sf.txt                                |   10 +-
 requirements.txt                                   |    8 +-
 run_clonedigger                                    |    3 +-
 run_tests                                          |    2 +-
 scripts/allura_import.py                           |   16 +-
 scripts/benchmark-scm.py                           |  125 +++
 scripts/create-allura-sitemap.py                   |    2 +-
 scripts/migrate_project_database.py                |    2 +-
 scripts/migrations/000-fix-tracker-fields.py       |    2 +-
 scripts/migrations/001-restore-labels.py           |    2 +-
 .../migrations/002-fix-tracker-thread-subjects.py  |    2 +-
 scripts/migrations/003-migrate_project_roles.py    |    2 +-
 .../migrations/004-make-attachments-polymorphic.py |    2 +-
 scripts/migrations/006-migrate-artifact-refs.py    |    2 +-
 scripts/migrations/007-update-acls.py              |    2 +-
 scripts/migrations/010-fix-home-permissions.py     |    2 +-
 scripts/migrations/012-uninstall-home.py           |    2 +-
 scripts/migrations/013-update-ordinals.py          |    2 +-
 scripts/migrations/014-add-trove-category-agpl.py  |    2 +-
 .../015-add-neighborhood_id-to-blog-posts.py       |    2 +-
 scripts/migrations/016-add-trove-category-lppl.py  |    2 +-
 scripts/migrations/017-sync-trove-categories.py    |    2 +-
 .../migrations/020-remove-wiki-title-slashes.py    |    2 +-
 .../migrations/024-migrate-custom-profile-text.py  |    2 +-
 scripts/migrations/025-add-is-nbhd-project.py      |    2 +-
 .../027-change-ticket-write-permissions.py         |    2 +-
 scripts/project-import.py                          |    2 +-
 scripts/publicize-neighborhood.py                  |    2 +-
 scripts/refresh-all-repos.py                       |  169 ----
 scripts/rethumb.py                                 |    2 +-
 scripts/scrub-allura-data.py                       |    2 +-
 scripts/teamforge-import.py                        |    2 +-
 update.sh                                          |    4 +-
 vagrant/README                                     |   14 +-
 vagrant/Vagrantfile                                |    6 +-
 vagrant/allura_setup.sh                            |   18 +-
 vagrant/manifests/ubuntu-1204-server-amd64.pp      |  134 +++
 vagrant/start_allura                               |    6 +-
 397 files changed, 13071 insertions(+), 3740 deletions(-)
----------------------------------------------------------------------