Skip to content
Snippets Groups Projects
Commit 81efc3f0 authored by Melissa Miller's avatar Melissa Miller
Browse files

daily build 2 

updates to theme 4, base theme, and main menu feature
parent 0797492f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 21 additions and 51 deletions
CHANGELOG.txt
+ 4
− 0
View file @ 81efc3f0
Drupal 7.38, 2015-06-17
-----------------------
- Fixed security issues (multiple vulnerabilities). See SA-CORE-2015-002.
Drupal 7.37, 2015-05-07
-----------------------
- Fixed a regression in Drupal 7.36 which caused certain kinds of content types
......
profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
+ 1
− 1
View file @ 81efc3f0
......@@ -9,5 +9,5 @@ dependencies[] = date_popup
version = "7.x-1.1+2-dev"
core = "7.x"
project = "date_popup_authored"
datestamp = "1434591579"
datestamp = "1434596314"
profiles/wcm_base/modules/contrib/file_entity/file_entity.info
+ 1
− 1
View file @ 81efc3f0
......@@ -30,5 +30,5 @@ version = 7.x-2.x-dev
version = "7.x-2.0-alpha3+29-dev"
core = "7.x"
project = "file_entity"
datestamp = "1434591575"
datestamp = "1434596310"
profiles/wcm_base/modules/contrib/file_entity/tests/file_entity_test.info
+ 1
− 1
View file @ 81efc3f0
......@@ -10,5 +10,5 @@ hidden = TRUE
version = "7.x-2.0-alpha3+29-dev"
core = "7.x"
project = "file_entity"
datestamp = "1434591575"
datestamp = "1434596310"
profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
+ 1
− 1
View file @ 81efc3f0
......@@ -13,5 +13,5 @@ files[] = includes/views/manualcrop.views.inc
version = "7.x-1.4+109-dev"
core = "7.x"
project = "manualcrop"
datestamp = "1434591450"
datestamp = "1434596194"
profiles/wcm_base/modules/contrib/media/media.info
+ 1
− 1
View file @ 81efc3f0
......@@ -29,5 +29,5 @@ version = 7.x-2.x-dev
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
datestamp = "1434591396"
datestamp = "1434596149"
profiles/wcm_base/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
+ 1
− 1
View file @ 81efc3f0
......@@ -14,5 +14,5 @@ files[] = includes/MediaBrowserBulkUpload.inc
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
datestamp = "1434591396"
datestamp = "1434596149"
profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.info
+ 1
− 1
View file @ 81efc3f0
......@@ -16,5 +16,5 @@ files[] = includes/MediaInternetValidationException.inc
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
datestamp = "1434591396"
datestamp = "1434596149"
profiles/wcm_base/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
+ 1
− 1
View file @ 81efc3f0
......@@ -13,5 +13,5 @@ configure = admin/structure/file-types/upgrade
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
datestamp = "1434591396"
datestamp = "1434596149"
profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
+ 1
− 1
View file @ 81efc3f0
......@@ -20,5 +20,5 @@ configure = admin/config/media/browser
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
datestamp = "1434591396"
datestamp = "1434596149"
profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
+ 1
− 1
View file @ 81efc3f0
......@@ -14,5 +14,5 @@ files[] = media_wysiwyg_view_mode.test
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
datestamp = "1434591396"
datestamp = "1434596149"
profiles/wcm_base/modules/contrib/media/modules/mediafield/mediafield.info
+ 1
− 1
View file @ 81efc3f0
......@@ -9,5 +9,5 @@ dependencies[] = media
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
datestamp = "1434591396"
datestamp = "1434596149"
profiles/wcm_base/modules/contrib/media/tests/media_module_test.info
+ 1
− 1
View file @ 81efc3f0
......@@ -9,5 +9,5 @@ hidden = TRUE
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
datestamp = "1434591396"
datestamp = "1434596149"
profiles/wcm_base/modules/contrib/media_youtube/media_youtube.info
+ 1
− 1
View file @ 81efc3f0
......@@ -14,5 +14,5 @@ files[] = includes/MediaYouTubeBrowser.inc
version = "7.x-2.0-rc4+9-dev"
core = "7.x"
project = "media_youtube"
datestamp = "1434591575"
datestamp = "1434596311"
profiles/wcm_base/modules/contrib/workbench/workbench.info
+ 1
− 1
View file @ 81efc3f0
......@@ -10,5 +10,5 @@ dependencies[] = views
version = "7.x-1.2"
core = "7.x"
project = "workbench"
datestamp = "1434591526"
datestamp = "1434596253"
profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
+ 1
− 1
View file @ 81efc3f0
......@@ -10,5 +10,5 @@ dependencies[] = media
version = "7.x-2.1"
core = "7.x"
project = "workbench_media"
datestamp = "1434591526"
datestamp = "1434596254"
profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
+ 1
− 1
View file @ 81efc3f0
......@@ -9,5 +9,5 @@ hidden = TRUE
version = "7.x-1.4+6-dev"
core = "7.x"
project = "workbench_moderation"
datestamp = "1434591527"
datestamp = "1434596255"
profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
+ 1
− 1
View file @ 81efc3f0
......@@ -22,5 +22,5 @@ files[] = tests/workbench_moderation.files.test
version = "7.x-1.4+6-dev"
core = "7.x"
project = "workbench_moderation"
datestamp = "1434591527"
datestamp = "1434596255"
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.context.inc
+ 0
− 32
View file @ 81efc3f0
......@@ -42,37 +42,5 @@ function ocio_main_menu_context_default_contexts() {
t('OCIO Main Menu');
$export['main-menu'] = $context;
$context = new stdClass();
$context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
$context->api_version = 3;
$context->name = 'side-menu';
$context->description = '';
$context->tag = 'OCIO Main Menu';
$context->conditions = array(
'sitewide' => array(
'values' => array(
1 => 1,
),
),
);
$context->reactions = array(
'block' => array(
'blocks' => array(
'menu_block-custom-1' => array(
'module' => 'menu_block',
'delta' => 'custom-1',
'region' => 'sidebar_1',
'weight' => '-10',
),
),
),
);
$context->condition_mode = 0;
// Translatables
// Included for use with string extractors like potx.
t('OCIO Main Menu');
$export['side-menu'] = $context;
return $export;
}
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info
+ 0
− 2
View file @ 81efc3f0
......@@ -15,10 +15,8 @@ dependencies[] = responsive_menus
dependencies[] = strongarm
dependencies[] = superfish
features[context][] = main-menu
features[context][] = side-menu
features[ctools][] = context:context:3
features[ctools][] = strongarm:strongarm:1
features[fe_block_settings][] = menu_block-custom-1
features[features_api][] = api:2
features[menu_custom][] = main-menu
features[variable][] = custom_breadcrumb_home
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment