divio / django-cms

91%

develop: 78%

LAST BUILD ON BRANCH remerge_2

branch: remerge_2

CHANGE BRANCH

x

Reset

• remerge_2
• develop
• feature/makemsgs
• feature/travis_34
• feature/issue_3155
• feature/develop_py
• master
• 3.0.2
• feature/custom_template_dir
• test/selenium_py3
• kater169-develop
• feature/fix_plugin_rst
• feature/mptt_61
• feature/fix_view_url
• feature/reversion_tests
• feature/pin_reversion
• feature/fix_reversion_181
• feature/alt_shift
• feature/atomic
• feature/plugin_get_templates
• feature/django_1.7
• feature/issue_3245
• feature/issue_3142
• Fix_hover_effect_for_deeper_menus
• refactor_render_plugin_tag
• feature/fix_submit_buttons2
• force_text_for_AliasPluginModel
• feature/toolbar_py3_compat
• feature/migrate
• 3.0.3
• feature/PY2_PY3_support_cleanup
• requires-io-develop
• feature/urls
• feature/fix_buttons
• HEAD
• issues/3297
• feature/fix_form_selector
• revert-3300-toolbar_populate_ignore_anon
• feature/fix_docs
• feature/fix_docs_master
• feature/modal_class
• issues/3325
• issues/3326
• feature/django_17_migrations
• extension_docs_additions
• feature/remove_get_available_languages
• support/2.3.x
• feature/py34_dj15
• feature/fix_py3
• feature/app_setup_refactor
• feature/fix_1_7_migration
• feature/python_2_unicode_compatible
• feature/generic_static_analysis
• custom-admin-namespace
• fix_if
• 3.0.4
• django_17_take2
• feature/fix_language_changer
• 3.0.5
• feature/fix_3338
• feature/fix_current_app
• feature/no_toolbar_for_no_staff
• feature/plugin_discover
• feature/fix_requirements
• feature/south_version
• feature/doc_fix
• feature/extensions_toolbar
• feature/pyflakes_fix
• feature/model_placeholder_staff
• support/2.4.x
• feature/amp_quick_fix
• feature/fix_3466
• missing_migration
• feature/path_info
• feature/cricciuto_typo
• feature/fix_language_migration
• feature/fix_override_url
• feature/remerge_3410
• feature/fix_menu_hide_untranslated
• feature/fix_link_target
• feature/fix_maximize
• feature/messages
• feature/fix_toolbar_api_release
• 3.0.6
• feature/plugin_scrollbar
• support/3.0.x
• feature/fix_toolbar_api
• feature/fix_toolbar_api_31
• feature/doc_coverage
• feature/306_release_notes
• feature/306_release_notes_31
• feature/migrations_verbose_name_30
• feature/migrations_verbose_name_31
• feature/3_1_docs
• fix_1_8_warnings
• feature/fix_develop_migrations
• feature/fix_develop_migrations_30
• feature/drop_1.5
• feature/drop_mptt_docs
• feature/fix_migration_name
• feature/blueprint
• modal_redirect_experiment
• feature/rename_migrations
• feature/blueprint_rebased
• feature/modaljs
• feature/modal_js_31
• txt
• feature/remove_deprecations
• feature/306_release
• tmp_140929
• merge
• general_stash
• tmp_mysql
• feature/doc_ychouinard
• forwardport
• feature/frontend_admin_regexp
• feature/supported-apps_toolbar
• Add_RenderPluginBlock
• jrief-missing-media-types
• anvio-pagetree-nowrap
• feature/fix_3589
• fix_3604
• fix_migrations_in_develop
• feature/backport_3610
• release/3.0.7
• merge_307
• 3.0.7
• coverage
• render_placeholder_uncached
• fix_docs
• blueprint_unbundled
• feature/admin_removal
• feature/parent_id
• blueprint_unbundled_30
• merge/3534
• feature/appspaced_apphooks
• feature/page_row_overflow
• feature/fix_hvad
• mpttvers
• feature/south
• feature/fix_copy_plugins
• fix/doc_title
• fix/redirect_js
• reversion_30
• merge/3683
• feature/content_type_fix
• feature/fix_get_render_template
• feature/remove_migration_gettext
• merge/3720
• merge/3611
• future/reversion_30
• future/blueprint_30
• future/appspaced_apphooks
• future/integration
• 3.0.8
• 3.0.9
• remerge_3
• feature/fix_3672
• feature/render_placeholder_uncached
• feature/doc_installer_p
• feature/js_filter
• feature/compat
• feature/installer_docs
• sane-add-plugin
• issue/dumb_me
• feature/fix_3667
• circle
• feature/plugin_order_publish
• feature/fix_page_move
• feature/refactoring_circular_imports
• feature/fix_copy_page
• feature/cleanup_mptt
• feature/fix_changelog
• feature/merge_1558
• yakky-sane-add-plugin
• feature/py3_fix
• feature/remove_fr_fr
• feature/title_redirect_length
• feature/testapp_migrations
• feature/remove_width
• feature/mysqlclient
• feature/fix_title_reversion
• feature/fix_ext_toolbar
• mkoistinen-feature/fixes_3630
• feature/fix_3843
• feature/add_cache_param_to_render_placeholder
• feature/fix_placeholder_permission_check
• mkoistinen-feature/PR_3750_for_3_0_x
• future/toolbar_refactoring
• future/reversion_31
• 3.0.10
• feature/ajax_add
• feature/plugin_action_urls
• feature/structure_mode_permission
• feature/update_setup
• future/aldryn
• feature/develop_migrate
• feature/render_model_add_class
• feature/fix_use_structure
• feature/fix_dbtable
• feature/fix_redirections_30
• feature/js_string_subst
• feature/render_model_add_class_30
• feature/reorder_plugins
• feature/toolbar_api_revision
• feature/extensions_copy
• feature/fix_redirections
• feature/fix_copy_noperm
• feature/optional_south
• feature/parentless_slug_collisions
• feature/resize_sideframe
• feature/fix_pageselectwidget
• feature/issue-3674
• feature/issue-3112
• feature/fix_test_json_enc
• feature/coverage_cfg
• release/3.0.11
• merge/3.0.11
• feature/fix_docs_3011
• feature/render_placeholder_uncached_30
• feature/fix_apphook_namespace
• merge/3765
• feature/issue-3674b
• feature/fix_menu
• feature/more_checks
• feature/delete_plugin
• feature/fix_3952
• 3.1.0b1
• feature/circ_inclusion
• feature/delete_plugin_button
• feature/post_template_addons_31
• feature/31_upgrade_guide
• revert-3943-develop
• feature/update_po
• feature/revert_3943
• fix/docs-cms-permission-naming
• feature/mptt_ver
• feature/language_fallback_default
• feature/remerge_3013
• 3.1.0rc1
• feature/fix_tree_position
• feature/fix_appconfig_select
• feature/fix_4010
• feature/port_3999
• issues/fix_copy_extensions
• feature/fix_appconfig_select_30
• release/3.0.13
• 3.0.13
• remerge_3013
• feature/migration
• issues/fix_breadcrumbs
• feature/fix_migration_path
• feature/update_readme
• release/3.1
• feature/release_notes
• feature/django_18
• htmllib
• htmllib_30
• feature/copy_site
• issues/fix_plugin_sorting_in_py3
• feature/fix_languages
• feature/changelist_fixes
• feature/fix_4007
• feature/fix_3945
• feature/fix_languages_update
• bugfix/has_add_plugin_permission
• fix_eclisse
• issues/toolbar_save_as_draft
• future/integration_update
• tutorial_fix
• feature/custom-models
• tutorial_tests
• feature/add-import
• my_feature
• tutorial_fix_2
• require_post
• feature/fix_menus
• feature/fix_language_fallback
• feature/fix_delete_alng
• feature/fix_plugin_breadcrumbs
• feature/cast_watch_models
• feature/fix_position
• feature/fix_toolbar_items
• feature/backport_4142
• feature/backport_4121
• fix_assert_list
• feature/update-readme
• feature/merge_4107
• changelog_3014
• fix/console_log
• bugfixes/cms_modal_html5_error
• issues/merge_csrf_fix
• release/3.0.14
• 3.0.14
• test_bugfixes
• another_test
• feature/fix_coveralls
• support/3.1.x
• feature/19_deprecations
• feature/treebeard_fix
• feature/relax_html5lib
• feature/merge_4248
• feature/remove_scssc
• feature/fix_4214
• feature/remove_page
• merge/3.0.x
• feature/fix_page_extension_copy
• feature/fix_expired_ancestors
• feature/setupy
• feature/pin_text_plugin
• feature/fix_pagefield
• feature/setup_fix_4263
• merge/3.0.15
• mkoistinen/issue_4352
• feature/fix_4038
• feature/fix_page_ancestors_order
• feature/update_test_requirements
• feature/plugin_datamigrations_doc
• feature/ease_migration
• merge/4273
• feature/fix_18_requests
• fix/template_inheritance
• fix/4368
• merge/3.0.15-2
• merge/3.1.3
• feature/cleanup
• feature/fix_cms_menus_warning
• feature/django19
• feature/cache_version
• merge/4398
• changelog_313
• changelog_3015
• fix/coverage_config
• feature/testing-coveralls
• 3.0.15
• 3.1.3
• feature/fix_structure_migration
• feature/text_editor_button_icon
• feature/exclude_plugins
• feature/detect_migrations
• feature/django19_compat2
• merge/migrations_detect
• merge/3.1.x
• preview
• exp_tr
• feature/fix_clear_apphooks
• fix/simple_toolbar_setting
• merge/4458
• merge/4458_develop
• merge/4334
• feature/disable_fe_test
• use_new_frame_for_admin
• merge/3.0.16-pre
• merge/3.1.4-pre
• 3.2-release-notes
• feature/test_django19
• feature/fix_coverage
• aldrynised-tutorial
• fix_up_gitignore
• feature/fix_pagewidget
• move_a_copy
• mkoistinen/fix_tests
• CHANGLOG
• 3.2.0.rc1
• merge/4452
• merge/4383
• jsma-3776-list-apphooks-cleanup
• bugfix/adds-json-to-cms-frame-name
• merge/3.0.x_16
• merge/3.1_151015
• feature/fix_wizard_py3
• 3.2.0.rc2
• genti94-replace-images
• feature/fix_dates_test
• merge/4641
• merge/4641_develop
• test_dates
• merge/4466
• feature/use_migrate
• 3.2.0.rc3
• docs-spelling
• 3.2-docs
• bugfix/fixes-for-other-themes
• 3.2.0.rc4
• mkoistinen/update_translations
• fix_structureboard_paste
• bugfix/fixes-jquery-conflict-with-other-version
• wizards_tweaks
• feature/configurable_wizard_plugin
• 3.2.0.rc5
• typo
• feature/treebeard
• 3.2.0.rc6
• feature/change_migration
• merge/4329
• feature/fix_manage
• feature/move_plugin_discover
• feature/reversion_transaction
• feature/staticfiles
• 3.2.0.rc7
• wizard_forms
• add_jquery_to_wizards_base_form
• 3.2.0.rc8
• touch-docs
• merge/4716
• 3.2.0.rc9
• merge/3.1.4.pre
• fix_revert_to_live_30
• 3.2.0.rc10
• revert-4725-feature/change_migration
• merge/3.0.16.pre
• 3.2.0.rc11
• merge/3.1.4.pre2
• pin_djangocms_admin_style_31
• pin_djangocms_admin_style_30
• 3.2.0.rc14
• 3.2.0
• 3.2.0.rc13
• 3.2.0.rc12
• 3.1.4
• 3.0.16
• documentation-general
• feature/3_2_1_9
• feature/docs
• feature/unit-testing-setup
• bugfix/fix-user-settings-reload
• release/3.2.x
• feature/reload-plugin-urls
• feature/setupcfg
• integration-tests-setup
• feature/pages
• feature/placeholder-name-in-tooltip
• feature/breadcrumb
• add_slug_field_to_page_wizards
• use_slug_field
• wysiwyg_ify
• fix_get_description
• feature/flash
• feature/fix_redirect_toolbar_disable
• feature/pagetree_reviewed
• feature/pagtree_clean
• dont_assume_toolbar
• dont_assume_toolbar_is_present
• user-tutorial
• bugfix/foundation-clash
• mkoistinen/more_resilient_apphooks
• feature/add-query-param-to-bust-cache-on-static-assets
• restrict_toolbar_to_internal_ips
• bugfix/tooltip-fix
• feature/fix_reversion
• bugfix/bring-back-debug-version
• bugfix/sideframe-hide-duration
• Fix_3201
• merge/4858
• merge/3.0.16.pre2
• feature/namespace-icons
• feature/fix_toolbar_ext
• mkoistinen/restrict_toolbar_to_internal_ips
• feature/hide-structureboard-resize
• upstream-develop
• prevent_duplicate_slugs_via_wizard
• bugfix/publish-after-changing-slug
• feature/session_db
• merge/4865
• feature/remove_cms_app_name
• merge/4811
• feature/fix_file_test
• merge/3.1.5.pre3
• feature/allow_latest_cmsplugin_file
• bugfix/placeholders_list
• feature/fix_context
• merge/4949
• feature/fix_plugin_validation
• merge/4771
• feature/global_permission_raw_users
• feature/render_super
• merge/3.1.5.pre4
• feature/copy-paste-fixes
• feature/fix_wizard_template
• feature/prepare_315
• merge/3.2.1.pre1
• feature/update_release_notes
• 3.2.1
• feature/update_translations
• fix/use_configured_cache_settings
• feature/add_django_python_versions_to_debug_bar
• merge/3.2.1.final
• feature/refactor_commands
• feature/33_upgrade_docs
• 3.1.5
• feature/more_tests
• irc-notes
• feature/scrolling
• feature/fix_typo
• feature/fix_cache_settings
• merge/4975
• merge/3.0.17.pre1
• merge/3.1.6.pre1
• merge/3.2.2.pre1
• feature/fix_db_not_ready
• feature/deprecations
• feature/3_0_alma
• merge/4967
• feature/fix_uninstall_app
• feature/global_placeholder_conf
• fix/urlconf-during-startup
• update-board-core-devs
• feature/fix_5013
• release/3.2.2
• feature/fix_5011
• feature/pagetree-refresh-node
• feature/update_nodes_publish_state
• merge/3.2.2
• feature/fix_pagetree
• feature/fix-pagetree-for-language-codes-with-dashes
• feature/extend_app_urls
• merge/3.2.3
• feature/better_cache_control
• feature/favicon
• feature/fix_toolbar_order
• develop-3.4
• feature/integration-tests/screenshots
• feature/unit-tests/cms-navigation
• feature/unit-tests/cms-toolbar
• feature/better_cache_control_fixes
• feature/unit-tests/cms-sideframe
• feature/better_cache_control_cleanup
• feature/bump_hvad
• feature/readd_permission_checking
• merge/3.2.3.post1
• feature/pagetree-3.3
• feature/unit-tests/cms-structureboard
• merge/5108
• merge/3.2.3.post1b
• merge/sphinx_fix
• integration-tutorial-docs
• features/remove_deprecated_request_REQUEST
• new_placeholder_conf
• merge/5133_32
• feature/improve_i18n_support_in_wizards
• merge/5133
• merge/5904
• merge/5078_3.2
• feature/remove_line
• feature/position_fixes
• feature/add_test_migrations
• issue/removes_mark_safe
• issue/fix_bad_merge_in_test_requirements
• feature/fix_5138
• merge/5078_3.2b
• feature/improve_install
• issue/fix_conflicting_migration_name_3.2
• issue/fix_conflicting_migrations_3.2
• issue/removes_mark_safe_30
• feature/sanitize_pagefield_output
• feature/sanitize_pagefield_output_31
• feature/sanitize_pagefield_output_32
• feature/sanitize_appconfig_widget_30
• feature/sanitize_appconfig_widget_31
• feature/sanitize_appconfig_widget_32
• 3.0.17
• 3.1.6
• 3.2.4
• 3.2.5
• 3.1.7
• 3.0.18
• feature/page_wizard_placeholder_setting
• merge-documentation-commits-from-develop
• feature/rename_wizard_settings
• feature/fix_travis_errors
• feature/wizard_settings_33
• merge-325-forward-into-develop
• 3.3.0.rc2
• fixes/check_command_fix
• 3.3.0.rc3
• fix/fix_doc_link
• 3.3.0.rc4
• release/3.3.x
• 3.3.0
• release/3.0.x
• release/3.1.x
• feature/improve_plugin_related_names
• feature/update_tx
• fixes/fix_5344
• feature/global_placeholder_conf_original
• feature/no_perms_check_in_view_mode
• hotfix/deprecations_2
• fix/fix_failing_tests
• feature/apphook_config_multisite
• feature/test_failure_link
• feature/is_home_api
• feature/test_failure_link_31
• feature/test_failure_link_32
• docs-improve-reference
• feature/apphook_config_multisite_32
• feature/apphook_config_multisite_31
• feature/fix_5492
• 3.3.1
• 3.3.2
• feature/django_110
• feature/travis_pip
• version_bump
• release/3.4.0rc1
• 3.4.0rc1
• 3.4.0rc3
• 3.4.0
• release/3.4.x
• merge/5458
• 3.3.3
• 3.4.1
• bug/page_cache_and_messages
• feature/official_110
• bugfix/ff-for-mac-cmd-enter
• feature/cache_appresolver_per_site
• 3.4.2rc1
• 3.4.2
• feature/django_1_11
• bugfix/get-dist-path
• travis_env_vars_testing
• jessie/9393-fix-rb-ratio-math-fail
• fixStyleForjscs2.0
• 3.3.4
• 3.4.3
• integrate/experimental-v10
• patch-2
• integrate/experimental-v12
• 3.4.4
• feature/rename-draft-publish-buttons
• docs/3.4.x/wizards
• tutorial/people_app
• page-warning-stacklevel
• patch-1
• placeholderfield-migration
• 3.4.5
• tutorial/side_wide_content
• api-page-title
• placeholder-display
• deprecation-notes
• touch-dialog
• touch-selected
• 3.5.0rc1
• pyup-pin-sphinxcontrib-spelling-4.0.1
• pyup-pin-sphinx-autobuild-0.7.1
• pyup-pin-sphinx-1.6.6
• pyup-pin-djangocms-helper-1.0.0
• pyup-update-pyflakes-1.1.0-to-1.6.0
• pyup-pin-dj-database-url-0.4.2
• pyup-pin-iptools-0.6.1
• pyup-update-pillow-3.3-to-5.0.0
• pyup-pin-sphinx_rtd_theme-0.2.4
• pyup-update-coverage-4.2-to-4.4.2
• pyup-update-markupsafe-0.23-to-1.0
• pyup-update-python-coveralls-2.5.0-to-2.9.1
• pyup-update-sphinx-1.4.5-to-1.6.6
• pyup-pin-django-formtools-2.1
• pyup-pin-pyenchant-2.0.0
• pyup-update-pygments-2.0.2-to-2.2.0
• pyup-pin-argparse-1.4.0
• pyup-pin-django-2.0.1
• pyup-update-django-hvad-1.5-to-1.8.0
• pyup-update-unittest-xml-reporting-1.11.0-to-2.1.0
• pyup-pin-django-reversion-2.0.13
• release/3.5.x
• 3.5.0
• test-docs
• pyup-pin-django-2.0.2
• pyup-update-coverage-4.2-to-4.5
• pyup-pin-sphinx-1.6.7
• 3.5.0.1
• pyup-update-sphinx-1.4.5-to-1.6.7
• pyup-update-unittest-xml-reporting-1.11.0-to-2.1.1
• pyup-update-coverage-4.2-to-4.5.1
• pyup-update-sphinx-1.4.5-to-1.7.0
• pyup-pin-sphinx-1.7.0
• cms-placeholder
• pyup-pin-sphinxcontrib-spelling-4.1.0
• pyup-pin-djangocms-helper-1.1.0
• pyup-pin-sphinx-1.7.1
• pyup-update-sphinx-1.4.5-to-1.7.1
• pyup-pin-dj-database-url-0.5.0
• 3.5.1
• pyup-pin-django-2.0.3
• pyup-pin-sphinx-1.7.2
• pyup-update-sphinx-1.4.5-to-1.7.2
• divio-styling
• 3.4.6
• pyup-update-pillow-3.3-to-5.1.0
• pyup-pin-django-2.0.4
• pyup-pin-sphinx_rtd_theme-0.3.0
• 3.5.2
• pyup-pin-sphinx-1.7.3
• pyup-update-sphinx-1.4.5-to-1.7.3
• topic/circleci
• pyup-pin-sphinx-1.7.4
• pyup-update-sphinx-1.4.5-to-1.7.4
• pyup-pin-django-2.0.5
• bugfix/remove-extra-quoteation-mark-from-button-sideframe
• bugfix/remove-extra-quoteation-mark-from-button-sideframe-backport-3.5.x
• bugfix/remove-extra-quoteation-mark-from-button-sideframe-backport-3.4.x
• next
• dashboard-bugfixes
• pyup-pin-sphinx_rtd_theme-0.3.1
• pyup-update-unittest-xml-reporting-1.11.0-to-2.2.0
• pyup-update-pyflakes-1.1.0-to-2.0.0
• pyup-pin-divio-docs-theme-0.0.10
• pyup-pin-sphinx-1.7.5
• pyup-update-sphinx-1.4.5-to-1.7.5
• fix-intro-docs
• pyup-pin-django-2.0.6
• feature/django20comp
• docs-tutorials-small-fixes
• issue-6335
• issue-6383
• release/4.0.x
• pyup-pin-sphinxcontrib-spelling-4.2.0
• pyup-pin-divio-docs-theme-0.0.11
• pyup-pin-divio-docs-theme-0.0.12
• pyup-update-pillow-3.3-to-5.2.0
• pyup-pin-django-2.0.7
• provide-sqlite-compat
• pyup-pin-sphinx-1.7.6
• pyup-update-sphinx-1.4.5-to-1.7.6
• plugin-refactor-db-compat
• pyup-pin-django-2.1
• pyup-pin-sphinx-1.7.7
• pyup-update-sphinx-1.4.5-to-1.7.7
• pyup-pin-sphinx-1.7.8
• pyup-update-sphinx-1.4.5-to-1.7.8
• pyup-pin-django-2.1.1
• pyup-pin-divio-docs-theme-0.0.13
• pyup-pin-divio-docs-theme-0.0.14
• pyup-pin-sphinx-1.7.9
• pyup-update-sphinx-1.4.5-to-1.7.9
• pyup-update-sphinx-1.4.5-to-1.8.0
• pyup-pin-sphinx-1.8.0
• pyup-update-sphinx-1.4.5-to-1.8.1
• pyup-pin-sphinx-1.8.1
• pyup-pin-django-2.1.2
• pyup-update-pillow-3.3-to-5.3.0
• pyup-pin-django-2.1.3
• pyup-update-markupsafe-0.23-to-1.1.0
• release/3.6.x
• pyup-pin-sphinx-1.8.2
• pyup-update-sphinx-1.4.5-to-1.8.2
• 3.5.3rc1
• pyup-update-coverage-4.2-to-4.5.2
• pyup-pin-divio-docs-theme-0.0.15
• 3.5.3
• pyup-update-pygments-2.0.2-to-2.3.0
• divio/develop
• pr/accept_tel_and_mailto_uris
• pyup-pin-django-2.1.4
• pyup-pin-divio-docs-theme-0.0.16
• 3.6.0rc1
• pyup-update-pygments-2.0.2-to-2.3.1
• pyup-pin-sphinx-1.8.3
• pyup-update-sphinx-1.4.5-to-1.8.3
• pyup-update-pillow-3.3-to-5.4.0
• pyup-pin-django-2.1.5
• pyup-update-pillow-3.3-to-5.4.1
• pyup-pin-iptools-0.7.0
• pyup-update-unittest-xml-reporting-1.11.0-to-2.2.1
• 3.6.0rc2
• pyup-update-pyflakes-1.1.0-to-2.1.0
• 3.6.0rc3
• 3.6.0
• pyup-pin-sphinx-1.8.4
• pyup-update-sphinx-1.4.5-to-1.8.4
• pyup-pin-django-2.1.7
• pyup-update-markupsafe-0.23-to-1.1.1
• pyup-update-pyflakes-1.1.0-to-2.1.1
• fix-dev-travis
• pyup-update-coverage-4.2-to-4.5.3
• pyup-update-sphinx-1.4.5-to-1.8.5
• pyup-update-unittest-xml-reporting-1.11.0-to-2.3.1
• pyup-update-unittest-xml-reporting-1.11.0-to-2.3.2
• pyup-update-unittest-xml-reporting-1.11.0-to-2.4.0
• release/3.7.x
• pyup-update-unittest-xml-reporting-1.11.0-to-2.5.0
• pyup-pin-djangocms-helper-1.2.0
• pyup-update-unittest-xml-reporting-1.11.0-to-2.5.1
• pyup-update-sphinx-1.4.5-to-2.0.0
• pyup-pin-sphinx-2.0.0
• pyup-pin-sphinxcontrib-spelling-4.2.1
• release/4.0.0dev7
• pyup-pin-django-2.2
• pyup-update-pillow-3.3-to-6.0.0
• pyup-pin-sphinx-2.0.1
• pyup-update-sphinx-1.4.5-to-2.0.1
• pyup-pin-django-2.2.1
• pyup-update-pygments-2.0.2-to-2.4.0
• pyup-update-pygments-2.0.2-to-2.4.1
• pyup-update-pygments-2.0.2-to-2.4.2
• introduce-support-for-django220
• pyup-pin-sphinx-2.1.0
• pyup-update-sphinx-1.4.5-to-2.1.0
• pyup-pin-django-2.2.2
• feature/3.7.0
• pyup-pin-sphinx-2.1.1
• pyup-update-sphinx-1.4.5-to-2.1.1
• pyup-update-python-coveralls-2.5.0-to-2.9.2
• pyup-pin-sphinxcontrib-spelling-4.3.0
• pyup-pin-sphinx-2.1.2
• pyup-update-sphinx-1.4.5-to-2.1.2
• pyup-pin-divio-docs-theme-0.0.17
• backport/3.7.x/6677
• backport/3.7.x/6688
• release/3.7.0a1
• fix-plugin-js-loading
• pyup-pin-django-2.2.3
• pyup-update-pillow-3.3-to-6.1.0
• pyup-pin-djangocms-helper-1.2.1
• pyup-pin-djangocms-helper-1.2.2
• pyup-update-coverage-4.2-to-4.5.4
• pyup-pin-django-2.2.4
• pyup-update-python-coveralls-2.5.0-to-2.9.3
• pyup-pin-djangocms-helper-1.2.3
• feature/test
• pyup-pin-djangocms-helper-1.2.4
• rebase/6667
• backport/6667
• 3.7.0rc1
• pyup-pin-djangocms-helper-1.2.5
• pyup-pin-sphinx-2.2.0
• pyup-update-sphinx-1.4.5-to-2.2.0
• fix-6717
• 3.7.0rc2
• patch-9
• patch-10
• patch-11
• pyup-pin-django-2.2.5
• 3.7.0
• pyup-pin-django-2.2.6
• pyup-update-pillow-3.3-to-6.2.0
• pyup-update-pillow-3.3-to-6.2.1
• pyup-pin-sphinx-2.2.1
• pyup-update-sphinx-1.4.5-to-2.2.1
• pyup-pin-django-2.2.7
• feature/additions
• pyup-update-unittest-xml-reporting-1.11.0-to-2.5.2
• imgbot
• hotfix/docs-installer
• 3.7.1
• pyup-update-pygments-2.0.2-to-2.5.1
• pyup-pin-divio-docs-theme-0.0.19
• pyup-update-pygments-2.0.2-to-2.5.2
• pyup-pin-django-3.0
• pyup-pin-divio-docs-theme-0.0.20
• pyup-update-sphinx-1.4.5-to-2.2.2
• pyup-pin-sphinx-2.2.2
• pyup-pin-django-formtools-2.2
• ci-test-branch
• ci
• merge-test
• fixclone
• pyup-update-coverage-4.2-to-5.0
• pyup-pin-sphinx-2.3.0
• pyup-update-sphinx-1.4.5-to-2.3.0
• pyup-pin-django-3.0.1
• pyup-pin-sphinx-2.3.1
• pyup-update-coverage-4.2-to-5.0.1
• pyup-update-sphinx-1.4.5-to-2.3.1
• pyup-update-pillow-3.3-to-7.0.0
• pyup-pin-django-3.0.2
• pyup-update-coverage-4.2-to-5.0.2
• pyup-update-coverage-4.2-to-5.0.3
• pyup-pin-django-3.0.3
• pyup-update-sphinx-1.4.5-to-2.4.0
• pyup-pin-sphinx-2.4.0
• pyup-update-unittest-xml-reporting-1.11.0-to-3.0.0
• pyup-update-unittest-xml-reporting-1.11.0-to-3.0.1
• pyup-pin-sphinx-2.4.1
• pyup-update-sphinx-1.4.5-to-2.4.1
• pyup-update-sphinx-1.4.5-to-2.4.2
• pyup-pin-sphinx-2.4.2
• pyup-update-unittest-xml-reporting-1.11.0-to-3.0.2
• pyup-update-sphinx-1.4.5-to-2.4.3
• pyup-pin-sphinx-2.4.3
• pyup-pin-django-3.0.4
• pyup-pin-sphinx-2.4.4
• pyup-update-pygments-2.0.2-to-2.6.1
• pyup-update-coverage-4.2-to-5.0.4
• pyup-pin-divio-docs-theme-0.0.21
• travis-starting
• 404-on-draft-language
• pyup-update-pillow-3.3-to-7.1.0
• pyup-pin-django-3.0.5
• pyup-update-pillow-3.3-to-7.1.1
• pyup-update-sphinx-1.4.5-to-3.0.0
• pyup-pin-sphinx-3.0.0
• hotfix/sphinx-chec
• pyup-update-pyflakes-1.1.0-to-2.2.0
• pyup-pin-sphinxcontrib-spelling-5.0.0
• pyup-pin-sphinx-3.0.1
• pyup-update-sphinx-1.4.5-to-3.0.1
• pyup-update-coverage-4.2-to-5.1
• pyup-update-sphinx-1.4.5-to-3.0.2
• 3.7.2
• hotfix/urllib
• pyup-update-pillow-3.3-to-7.1.2
• pyup-update-sphinx-1.4.5-to-3.0.3
• pyup-pin-django-3.0.6
• i18n_fixes
• hotfix/issue-6853-apphook-config
• hotfix/python-2
• pyup-pin-pyenchant-3.1.0
• 3.7.3
• pyup-pin-sphinx-3.0.4
• pyup-update-sphinx-1.4.5-to-3.0.4

Merge remote-tracking branch 'upstream/develop' into remerge_2

Conflicts:
	CHANGELOG.txt
	cms/__init__.py
	cms/extensions/admin.py
	cms/locale/en/LC_MESSAGES/django.po
	cms/locale/en/LC_MESSAGES/djangojs.po
	cms/migrations_django/0001_initial.py
	cms/tests/admin.py
	cms/utils/copy_plugins.py
	docs/upgrade/index.rst
	setup.py