This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/foundation.make b/foundation.make | |
index 9ac33e4..7a9eae2 100755 | |
--- a/foundation.make | |
+++ b/foundation.make | |
@@ -353,6 +353,28 @@ projects[migrate_extras][subdir] = "contrib" | |
; Add support for bean migrate; see http://drupal.org/node/1977058 | |
projects[migrate_extras][patch][] = "http://drupal.org/files/migrate_extras_entity_api_entity_keys_name.patch" | |
+projects[job_scheduler][version] = 2.0-alpha3 | |
+projects[job_scheduler][subdir] = "contrib" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/custom/arte_afp/arte_afp.feeds_importer_default.inc b/modules/custom/arte_afp/arte_afp.feeds_importer_default.inc | |
index 3eceb92..a15c977 100644 | |
--- a/modules/custom/arte_afp/arte_afp.feeds_importer_default.inc | |
+++ b/modules/custom/arte_afp/arte_afp.feeds_importer_default.inc | |
@@ -7,7 +7,7 @@ | |
/** | |
* Implements hook_feeds_importer_default(). | |
*/ | |
-function arte_feeds_afp_importer_default() { | |
+function arte_afp_feeds_importer_default() { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/foundation.make b/foundation.make | |
index 1f7243f..7f13d74 100755 | |
--- a/foundation.make | |
+++ b/foundation.make | |
@@ -329,12 +329,8 @@ projects[fast_404][subdir] = "contrib" | |
projects[cdn][version] = 2.7-beta1 | |
projects[cdn][subdir] = "contrib" | |
-projects[expire_nodequeues][type] = "module" | |
+projects[expire_nodequeues][version] = 1.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/custom/scald_atoms_arte_fields/scald_atoms_arte_fields.features.field_base.inc b/modules/custom/scald_atoms_arte_fields/scald_atoms_arte_fields.features.field_base.inc | |
index d4ea8f3..9f0586c 100644 | |
--- a/modules/custom/scald_atoms_arte_fields/scald_atoms_arte_fields.features.field_base.inc | |
+++ b/modules/custom/scald_atoms_arte_fields/scald_atoms_arte_fields.features.field_base.inc | |
@@ -253,6 +253,39 @@ function scald_atoms_arte_fields_field_default_field_bases() { | |
'type' => 'text', | |
); | |
+ // Exported field_base: 'field_image_rights_until'. | |
+ $field_bases['field_image_rights_until'] = array( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/foundation.make b/foundation.make | |
index 071878f..f06dab9 100755 | |
--- a/foundation.make | |
+++ b/foundation.make | |
@@ -197,6 +197,9 @@ projects[scald][version] = 1.6 | |
projects[scald][subdir] = "contrib" | |
; See http://gist.github.com/pvhee/7326203. Can be removed once the APIOS mapping is fully defined and organized within the $data variable | |
projects[scald][patch][] = "http://gist.github.com/pvhee/7326203/raw/1df3dbe78e25b998d5663fcd20db6f7355c6d8f4/output_data_variables_with_vardump.patch" | |
+; See http://jira.newtech.arte.tv/browse/AFOUND-501 ; will be in 1.7 | |
+projects[scald][patch][] = "https://www.drupal.org/files/issues/2684143-2-pluggable-default-data.patch" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/features/foundation_editorial/foundation_editorial.module b/modules/features/foundation_editorial/foundation_editorial.module | |
index 9cfda1f..28a3645 100644 | |
--- a/modules/features/foundation_editorial/foundation_editorial.module | |
+++ b/modules/features/foundation_editorial/foundation_editorial.module | |
@@ -14,10 +14,12 @@ include_once 'foundation_editorial.features.inc'; | |
function foundation_editorial_permission() { | |
return array( | |
'foundation view unpublished nodes' => array( | |
- 'title' => t('Access unpublished content created by other users'), | |
+ 'title' => t('View unpublished nodes'), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/custom/arte_apios_player/css/arte-apios-player.css b/modules/custom/arte_apios_player/css/arte-apios-player.css | |
index 09effd0..75d629d 100644 | |
--- a/modules/custom/arte_apios_player/css/arte-apios-player.css | |
+++ b/modules/custom/arte_apios_player/css/arte-apios-player.css | |
@@ -92,6 +92,10 @@ | |
z-index: 10; | |
} | |
+.dnd-atom-wrapper.type-video { | |
+ display: block; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/features/scald_sitemap/README.md b/modules/features/scald_sitemap/README.md | |
index 8ba2b5d..5b98a94 100644 | |
--- a/modules/features/scald_sitemap/README.md | |
+++ b/modules/features/scald_sitemap/README.md | |
@@ -1,12 +1,25 @@ | |
-The Video Sitemaps are located at (Google and ARTE formats): | |
+# Scald Sitemap | |
- http://example.com/LANGCODE/sitemaps/video.xml | |
- http://example.com/LANGCODE/sitemaps/video-arte.xml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/custom/arte_language/arte_language.module b/modules/custom/arte_language/arte_language.module | |
index 7c64efd..d610555 100755 | |
--- a/modules/custom/arte_language/arte_language.module | |
+++ b/modules/custom/arte_language/arte_language.module | |
@@ -388,6 +388,7 @@ function _arte_language_http_request($url, array $options = array()) { | |
*/ | |
function arte_language_node_access($node, $node_op, $account) { | |
global $language; | |
+ $langcode = $language->language; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/foundation.make b/foundation.make | |
index 30266e6..1ec3c3c 100755 | |
--- a/foundation.make | |
+++ b/foundation.make | |
@@ -373,7 +373,10 @@ projects[ldap][patch][] = "https://www.drupal.org/files/issues/ldap_servers-nest | |
projects[jquery_update][version] = 3.0-alpha2 | |
projects[jquery_update][subdir] = "contrib" | |
-projects[arte_opa][version] = 1.4 | |
+; Using a specific latest version waiting for a tagged release. |