提交: 66d197c9ed6524bf27979462659170baaadf32dc - allura (git)

allura

Commit MetaInfo

• 修订版: 66d197c9ed6524bf27979462659170baaadf32dc (tree)
• 时间: 2012-05-17 00:31:54
• 作者: Yaroslav Luzin <jardev@gmai...>
• Commiter: Yaroslav Luzin

Log Message

Merge branch 'dev' into t48_blog_pull_in_rss

Conflicts:
Allura/allura/command/init.py
Allura/allura/tests/test_commands.py
Allura/setup.py

更改概述

• modified: Allura/allura/app.py
• modified: Allura/allura/command/__init__.py
• modified: Allura/allura/command/create_neighborhood.py
• add: Allura/allura/command/set_neighborhood_features.py
• delete: Allura/allura/command/set_neighborhood_level.py
• delete: Allura/allura/command/set_neighborhood_private.py
• modified: Allura/allura/command/show_models.py
• modified: Allura/allura/command/taskd.py
• modified: Allura/allura/controllers/attachments.py
• modified: Allura/allura/controllers/discuss.py
• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/controllers/root.py
• modified: Allura/allura/controllers/search.py
• modified: Allura/allura/controllers/static.py
• add: Allura/allura/controllers/test_neighborhood_root.py
• delete: Allura/allura/controllers/{test.py => test_project_root.py}
• modified: Allura/allura/ext/admin/admin_main.py
• modified: Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
• modified: Allura/allura/ext/admin/templates/project_groups.html
• modified: Allura/allura/ext/admin/templates/project_overview.html
• modified: Allura/allura/ext/admin/widgets.py
• modified: Allura/allura/ext/search/search_main.py
• modified: Allura/allura/ext/user_profile/templates/user_index.html
• modified: Allura/allura/ext/user_profile/user_main.py
• modified: Allura/allura/lib/app_globals.py
• delete: Allura/allura/lib/dispatch.py
• modified: Allura/allura/lib/exceptions.py
• modified: Allura/allura/lib/helpers.py
• modified: Allura/allura/lib/macro.py
• modified: Allura/allura/lib/mail_util.py
• modified: Allura/allura/lib/markdown_extensions.py
• modified: Allura/allura/lib/plugin.py
• modified: Allura/allura/lib/repository.py
• modified: Allura/allura/lib/utils.py
• modified: Allura/allura/lib/widgets/forms.py
• modified: Allura/allura/lib/widgets/project_list.py
• modified: Allura/allura/lib/widgets/resources/js/sortable_repeated_field.js
• modified: Allura/allura/model/artifact.py
• modified: Allura/allura/model/auth.py
• modified: Allura/allura/model/discuss.py
• modified: Allura/allura/model/filesystem.py
• modified: Allura/allura/model/monq_model.py
• modified: Allura/allura/model/neighborhood.py
• modified: Allura/allura/model/notification.py
• modified: Allura/allura/model/project.py
• modified: Allura/allura/model/repository.py
• modified: Allura/allura/public/nf/css/forge/hilite.css
• modified: Allura/allura/public/nf/js/jquery-base.js
• add: Allura/allura/public/nf/js/project_groups.js
• modified: Allura/allura/tasks/mail_tasks.py
• modified: Allura/allura/templates/jinja_master/master.html
• modified: Allura/allura/templates/jinja_master/nav_menu.html
• modified: Allura/allura/templates/jinja_master/theme_macros.html
• add: Allura/allura/templates/neighborhood_help.html
• delete: Allura/allura/templates/neighborhood_lib.html
• add: Allura/allura/templates/neighborhood_stats.html
• add: Allura/allura/templates/neighborhood_stats_adminlist.html
• modified: Allura/allura/templates/repo/file.html
• modified: Allura/allura/templates/widgets/analytics.html
• modified: Allura/allura/templates/widgets/neighborhood_add_project.html
• modified: Allura/allura/templates/widgets/neighborhood_overview_form.html
• modified: Allura/allura/templates/widgets/project_list_widget.html
• modified: Allura/allura/templates/widgets/project_summary.html
• modified: Allura/allura/tests/decorators.py
• modified: Allura/allura/tests/functional/test_admin.py
• modified: Allura/allura/tests/functional/test_auth.py
• modified: Allura/allura/tests/functional/test_discuss.py
• modified: Allura/allura/tests/functional/test_home.py
• modified: Allura/allura/tests/functional/test_neighborhood.py
• modified: Allura/allura/tests/functional/test_root.py
• modified: Allura/allura/tests/functional/test_user_profile.py
• modified: Allura/allura/tests/model/test_auth.py
• modified: Allura/allura/tests/model/test_discussion.py
• modified: Allura/allura/tests/model/test_filesystem.py
• modified: Allura/allura/tests/model/test_neighborhood.py
• modified: Allura/allura/tests/model/test_notification.py
• modified: Allura/allura/tests/test_commands.py
• modified: Allura/allura/tests/test_globals.py
• modified: Allura/allura/tests/test_mail_util.py
• modified: Allura/allura/tests/test_tasks.py
• modified: Allura/allura/tests/test_utils.py
• modified: Allura/allura/websetup/bootstrap.py
• modified: Allura/development.ini
• modified: Allura/setup.py
• modified: Allura/test.ini
• modified: AlluraTesting/alluratest/controller.py
• modified: AlluraTesting/alluratest/validation.py
• modified: AlluraTesting/setup.py
• modified: ForgeBlog/forgeblog/tests/unit/__init__.py
• modified: ForgeBlog/test.ini
• modified: ForgeChat/test.ini
• modified: ForgeDiscussion/forgediscussion/controllers/root.py
• modified: ForgeDiscussion/forgediscussion/forum_main.py
• modified: ForgeDiscussion/forgediscussion/model/forum.py
• modified: ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
• modified: ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
• modified: ForgeDiscussion/forgediscussion/tests/functional/test_import.py
• modified: ForgeDiscussion/test.ini
• modified: ForgeDownloads/test.ini
• modified: ForgeGit/forgegit/tests/functional/test_controllers.py
• modified: ForgeGit/test.ini
• modified: ForgeHg/forgehg/tests/functional/test_controllers.py
• modified: ForgeHg/test.ini
• modified: ForgeLink/test.ini
• modified: ForgeSVN/forgesvn/tests/functional/test_controllers.py
• modified: ForgeSVN/test.ini
• modified: ForgeTracker/forgetracker/model/ticket.py
• modified: ForgeTracker/forgetracker/templates/tracker/bin.html
• modified: ForgeTracker/forgetracker/templates/tracker/search.html
• modified: ForgeTracker/forgetracker/templates/tracker/ticket.html
• modified: ForgeTracker/forgetracker/tests/functional/test_root.py
• modified: ForgeTracker/forgetracker/tests/unit/__init__.py
• modified: ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
• modified: ForgeTracker/forgetracker/tracker_main.py
• modified: ForgeTracker/forgetracker/widgets/ticket_search.py
• modified: ForgeTracker/test.ini
• modified: ForgeWiki/forgewiki/model/wiki.py
• modified: ForgeWiki/forgewiki/templates/wiki/page_view.html
• modified: ForgeWiki/forgewiki/wiki_main.py
• modified: ForgeWiki/test.ini
• modified: README.markdown
• modified: requirements-common.txt
• modified: requirements-sf.txt
• delete: schema.xml
• modified: scripts/migrations/010-fix-home-permissions.py
• modified: scripts/migrations/011-fix-subroles.py
• modified: scripts/migrations/012-uninstall-home.py
• modified: scripts/migrations/013-update-ordinals.py
• add: scripts/migrations/023-add-new-trove-license-category.py
• add: scripts/migrations/023-migrate-custom-profile-text.py
• modified: scripts/refresh-all-repos.py
• add: vagrant/README
• add: vagrant/Vagrantfile
• add: vagrant/Vagrantfile.pkg
• add: vagrant/allura_setup.sh
• add: vagrant/manifests/ubuntu-1110-server-amd64.pp
• add: vagrant/start_allura