GitLab

create branch 'DRUPAL-6--1'.

Cherrypick from DRUPAL-7--3 2010-09-14 20:57:26 UTC Jeff Miccolis <jeff@miccolis.net> 'proper order of code and the context editor can do the block thingy one again.':
    context_ui/export_ui/context.inc
    context_ui/export_ui/context_export_ui.class.php
    context_ui/theme/context-ui-editor.tpl.php
    context_ui/theme/context-ui-form.tpl.php
    context_ui/theme/context-ui-plugins.tpl.php
    plugins/context_condition_bookroot.inc
    plugins/context_condition_menu.inc
    plugins/context_condition_node.inc
    plugins/context_reaction_block.inc
    plugins/context_reaction_block.js
    plugins/context_reaction_breadcrumb.inc
    plugins/context_reaction_menu.inc
    plugins/context_reaction_theme.inc
    tests/context.conditions.test
    tests/context.reactions.test
    theme/context-block-browser-item.tpl.php
    theme/context-block-browser.tpl.php
    theme/context_reaction_block.theme.inc

create branch 'DRUPAL-6--1'.

Cherrypick from DRUPAL-7--3 2010-08-23 18:19:19 UTC The Great Git Migration <tggm@no-reply.drupal.org> 'This commit was manufactured as part of Drupal's Great Git Migration to':
    API.txt
    README.txt
    context.api.php
    context.plugins.inc
    context_layouts/README.txt
    context_layouts/context_layouts.info
    context_layouts/context_layouts.module
    context_layouts/plugins/context_layouts_reaction_block.css
    context_layouts/plugins/context_layouts_reaction_block.inc
    context_layouts/plugins/context_layouts_reaction_block.js
    context_ui/jquery.pageEditor.js
    context_ui/json2.js
    context_ui/theme/theme.inc
    plugins/context_condition.inc
    plugins/context_condition_book.inc
    plugins/context_condition_context.inc
    plugins/context_condition_language.inc
    plugins/context_condition_node_taxonomy.inc
    plugins/context_condition_path.inc
    plugins/context_condition_sitewide.inc
    plugins/context_condition_user.inc
    plugins/context_condition_user_page.inc
    plugins/context_condition_views.inc
    plugins/context_reaction.inc
    plugins/context_reaction_block.css
    plugins/context_reaction_block.png
    plugins/context_reaction_block.svg
    plugins/context_reaction_css_injector.inc
    plugins/context_reaction_debug.inc
    theme/context-block-editable-block.tpl.php
    theme/context-block-editable-region.tpl.php

Adding a force param to context_set_by_condition() that allows previously written contexts to be overridden

- Adding context_active_values() API function for simpler reaction code.

- Using human-readable region names rather than identifiers.

- #393232: Renaming context_ui_admin.inc to context_ui.admin.inc.

#336469: Fixing sticky checkbox for hidden blocks and using more human-friendly labels in block UI. From dmitrig01.

#356960: Fix for context_ui_set() error where an array of IDs are passed. context_ui_set() no longer accepts arrays for the $id
parameter. Reported by loze.

#356626: Adding patch to improve performance and integration with memcache & aggressive caching. From m3avrck.

- #354882: Strict check between node objects when settings node context. From anantagati.