Skip to content

Commit

Permalink
Merge in fixes and additions from the latest openoutreach code. Main …
Browse files Browse the repository at this point in the history 
…changes are in image field--type changed from 'media', name changed to 'field_content_image'.
  • Loading branch information
Nedjo Rogers committed Sep 28, 2011
1 parent 6a693d3 commit 7a1dc52
Show file tree
Hide file tree
Showing 75 changed files with 2,498 additions and 1,091 deletions.
339 changes: 339 additions & 0 deletions profiles/openoutreach/LICENSE.txt
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut/debut.info
View file
Expand Up @@ -10,9 +10,9 @@ name = "Debut"
package = "Features"
php = "5.2.0"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta3"
core = "7.x"
project = "debut"
datestamp = "1316823139"
datestamp = "1317236802"

2 changes: 1 addition & 1 deletion profiles/openoutreach/modules/contrib/debut/debut.make.inc
View file
Expand Up @@ -5,6 +5,6 @@ api = 2

; Contrib modules
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[features][subdir] = contrib
projects[features][version] = 1.0-beta4
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_article/debut_article.info
View file
Expand Up @@ -39,9 +39,9 @@ name = "Debut Article"
package = "Features"
php = "5.2.4"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta3"
core = "7.x"
project = "debut_article"
datestamp = "1316823141"
datestamp = "1317237102"

6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_article/debut_article.make.inc
View file
Expand Up @@ -14,11 +14,11 @@ projects[context][version] = 3.0-beta2
projects[ctools][subdir] = contrib
projects[ctools][version] = 1.x-dev
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_article][subdir] = contrib
projects[debut_article][version] = 1.x-dev
projects[debut_article][version] = 1.0-beta3
projects[debut_media][subdir] = contrib
projects[debut_media][version] = 1.x-dev
projects[debut_media][version] = 1.0-beta4
projects[features][subdir] = contrib
projects[features][version] = 1.0-beta4
projects[file_entity][subdir] = contrib
Expand Down
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_blog/debut_blog.info
View file
Expand Up @@ -39,9 +39,9 @@ name = "Debut Blog"
package = "Features"
php = "5.2.4"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta3"
core = "7.x"
project = "debut_blog"
datestamp = "1316823143"
datestamp = "1317240101"

6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_blog/debut_blog.make.inc
View file
Expand Up @@ -14,11 +14,11 @@ projects[context][version] = 3.0-beta2
projects[ctools][subdir] = contrib
projects[ctools][version] = 1.x-dev
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_blog][subdir] = contrib
projects[debut_blog][version] = 1.x-dev
projects[debut_blog][version] = 1.0-beta3
projects[debut_media][subdir] = contrib
projects[debut_media][version] = 1.x-dev
projects[debut_media][version] = 1.0-beta4
projects[features][subdir] = contrib
projects[features][version] = 1.0-beta4
projects[file_entity][subdir] = contrib
Expand Down
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_comment/debut_comment.info
View file
Expand Up @@ -30,9 +30,9 @@ name = "Debut Comment"
package = "Features"
php = "5.2.4"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta3"
core = "7.x"
project = "debut_comment"
datestamp = "1316823144"
datestamp = "1317240102"

4 changes: 2 additions & 2 deletions profiles/openoutreach/modules/contrib/debut_comment/debut_comment.make.inc
View file
Expand Up @@ -14,9 +14,9 @@ projects[context][version] = 3.0-beta2
projects[ctools][subdir] = contrib
projects[ctools][version] = 1.x-dev
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_comment][subdir] = contrib
projects[debut_comment][version] = 1.x-dev
projects[debut_comment][version] = 1.0-beta3
projects[features][subdir] = contrib
projects[features][version] = 1.0-beta4
projects[logintoboggan][subdir] = contrib
Expand Down
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_event/debut_event.info
View file
Expand Up @@ -40,9 +40,9 @@ name = "Debut Event"
package = "Features"
php = "5.2.4"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta3"
core = "7.x"
project = "debut_event"
datestamp = "1316823146"
datestamp = "1317240402"

6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_event/debut_event.make.inc
View file
Expand Up @@ -18,11 +18,11 @@ projects[ctools][version] = 1.x-dev
projects[date][subdir] = contrib
projects[date][version] = 2.x-dev
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_event][subdir] = contrib
projects[debut_event][version] = 1.x-dev
projects[debut_event][version] = 1.0-beta3
projects[debut_media][subdir] = contrib
projects[debut_media][version] = 1.x-dev
projects[debut_media][version] = 1.0-beta4
projects[features][subdir] = contrib
projects[features][version] = 1.0-beta4
projects[file_entity][subdir] = contrib
Expand Down
14 changes: 1 addition & 13 deletions profiles/openoutreach/modules/contrib/debut_event/debut_event.views_default.inc
View file
Expand Up @@ -5,7 +5,7 @@
*/

/**
* Implementation of hook_views_default_views().
* Implements hook_views_default_views().
*/
function debut_event_views_default_views() {
$export = array();
Expand Down Expand Up @@ -493,18 +493,6 @@ function debut_event_views_default_views() {
$handler->display->display_options['sorts']['field_event_date_value']['table'] = 'field_data_field_event_date';
$handler->display->display_options['sorts']['field_event_date_value']['field'] = 'field_event_date_value';
$handler->display->display_options['defaults']['arguments'] = FALSE;
/* Contextual filter: Date: Date (node) */
$handler->display->display_options['arguments']['date_argument']['id'] = 'date_argument';
$handler->display->display_options['arguments']['date_argument']['table'] = 'node';
$handler->display->display_options['arguments']['date_argument']['field'] = 'date_argument';
$handler->display->display_options['arguments']['date_argument']['default_action'] = 'default';
$handler->display->display_options['arguments']['date_argument']['default_argument_skip_url'] = 0;
$handler->display->display_options['arguments']['date_argument']['summary']['format'] = 'default_summary';
$handler->display->display_options['arguments']['date_argument']['add_delta'] = 'yes';
$handler->display->display_options['arguments']['date_argument']['date_fields'] = array(
'field_data_field_event_date.field_event_date_value' => 'field_data_field_event_date.field_event_date_value',
);
$handler->display->display_options['arguments']['date_argument']['date_method'] = 'AND';
$handler->display->display_options['defaults']['filters'] = FALSE;
/* Filter criterion: Content: Published */
$handler->display->display_options['filters']['status']['id'] = 'status';
Expand Down
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_forum/debut_forum.info
View file
Expand Up @@ -20,9 +20,9 @@ name = "Debut Forum"
package = "Features"
php = "5.2.4"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta2"
core = "7.x"
project = "debut_forum"
datestamp = "1316823147"
datestamp = "1317240402"

6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_forum/debut_forum.make.inc
View file
Expand Up @@ -13,11 +13,11 @@ projects[captcha][patch][http://drupal.org/files/issues/825088-19-captcha_ctools
projects[ctools][subdir] = contrib
projects[ctools][version] = 1.x-dev
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_comment][subdir] = contrib
projects[debut_comment][version] = 1.x-dev
projects[debut_comment][version] = 1.0-beta3
projects[debut_forum][subdir] = contrib
projects[debut_forum][version] = 1.x-dev
projects[debut_forum][version] = 1.0-beta2
projects[features][subdir] = contrib
projects[features][version] = 1.0-beta4
projects[pathauto][subdir] = contrib
Expand Down
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_link/debut_link.info
View file
Expand Up @@ -34,9 +34,9 @@ name = "Debut Link"
package = "Features"
php = "5.2.4"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta1"
core = "7.x"
project = "debut_link"
datestamp = "1316823148"
datestamp = "1317240404"

8 changes: 4 additions & 4 deletions profiles/openoutreach/modules/contrib/debut_link/debut_link.make.inc
View file
Expand Up @@ -13,19 +13,19 @@ projects[context][version] = 3.0-beta2
projects[ctools][subdir] = contrib
projects[ctools][version] = 1.x-dev
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_link][subdir] = contrib
projects[debut_link][version] = 1.x-dev
projects[debut_link][version] = 1.0-beta1
projects[debut_media][subdir] = contrib
projects[debut_media][version] = 1.x-dev
projects[debut_media][version] = 1.0-beta4
projects[features][subdir] = contrib
projects[features][version] = 1.0-beta4
projects[file_entity][subdir] = contrib
projects[file_entity][version] = 1.x-dev
projects[file_entity][patch][http://drupal.org/files/issues/views-field-file-rendered-1215712-33.patch] = http://drupal.org/files/issues/views-field-file-rendered-1215712-33.patch
projects[file_entity][patch][http://drupal.org/files/issues/views-field-file-rendered-1215712-33.patch] = http://drupal.org/files/issues/views-field-file-rendered-1215712-33.patch
projects[link][subdir] = contrib
projects[link][version] = 1.0-alpha3
projects[link][version] = 1.0-beta1
projects[media][subdir] = contrib
projects[media][version] = 2.0-unstable1
projects[media_youtube][subdir] = contrib
Expand Down
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_media/debut_media.info
View file
Expand Up @@ -39,9 +39,9 @@ recommends[] = "media_browser_plus"
recommends[] = "styles_ui"
recommends[] = "transliteration"

; Information added by drupal.org packaging script on 2011-09-27
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta4"
core = "7.x"
project = "debut_media"
datestamp = "1317082103"
datestamp = "1317240702"

4 changes: 2 additions & 2 deletions profiles/openoutreach/modules/contrib/debut_media/debut_media.make.inc
View file
Expand Up @@ -9,9 +9,9 @@ projects[context][version] = 3.0-beta2
projects[ctools][subdir] = contrib
projects[ctools][version] = 1.x-dev
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_media][subdir] = contrib
projects[debut_media][version] = 1.x-dev
projects[debut_media][version] = 1.0-beta4
projects[features][subdir] = contrib
projects[features][version] = 1.0-beta4
projects[file_admin][download][type] = "git"
Expand Down
1 change: 1 addition & 0 deletions profiles/openoutreach/modules/contrib/debut_media/debut_media.views_default.inc
View file
Expand Up @@ -224,6 +224,7 @@ function debut_media_views_default_views() {
$handler->display->display_options['defaults']['style_plugin'] = FALSE;
$handler->display->display_options['style_plugin'] = 'jcarousel';
$handler->display->display_options['style_options']['wrap'] = '0';
$handler->display->display_options['style_options']['skin'] = 'default';
$handler->display->display_options['style_options']['visible'] = '';
$handler->display->display_options['style_options']['auto'] = '0';
$handler->display->display_options['style_options']['autoPause'] = 1;
Expand Down
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_section/debut_section.info
View file
Expand Up @@ -36,9 +36,9 @@ name = "Debut Section"
package = "Features"
php = "5.2.4"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta3"
core = "7.x"
project = "debut_section"
datestamp = "1316823152"
datestamp = "1317240702"

6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_section/debut_section.make.inc
View file
Expand Up @@ -9,11 +9,11 @@ projects[context][version] = 3.0-beta2
projects[ctools][subdir] = contrib
projects[ctools][version] = 1.x-dev
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_media][subdir] = contrib
projects[debut_media][version] = 1.x-dev
projects[debut_media][version] = 1.0-beta4
projects[debut_section][subdir] = contrib
projects[debut_section][version] = 1.x-dev
projects[debut_section][version] = 1.0-beta3
projects[eva][subdir] = contrib
projects[eva][version] = 1.1
projects[features][subdir] = contrib
Expand Down
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_social/debut_social.info
View file
Expand Up @@ -33,9 +33,9 @@ name = "Debut Social"
package = "Features"
php = "5.2.4"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta3"
core = "7.x"
project = "debut_social"
datestamp = "1316823153"
datestamp = "1317241002"

4 changes: 2 additions & 2 deletions profiles/openoutreach/modules/contrib/debut_social/debut_social.make.inc
View file
Expand Up @@ -14,9 +14,9 @@ projects[context][version] = 3.0-beta2
projects[ctools][subdir] = contrib
projects[ctools][version] = 1.x-dev
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_social][subdir] = contrib
projects[debut_social][version] = 1.x-dev
projects[debut_social][version] = 1.0-beta3
projects[features][subdir] = contrib
projects[features][version] = 1.0-beta4
projects[follow][subdir] = contrib
Expand Down
6 changes: 3 additions & 3 deletions profiles/openoutreach/modules/contrib/debut_wysiwyg/debut_wysiwyg.info
View file
Expand Up @@ -18,9 +18,9 @@ name = "Debut Wysiwyg"
package = "Features"
php = "5.2.4"

; Information added by drupal.org packaging script on 2011-09-24
version = "7.x-1.x-dev"
; Information added by drupal.org packaging script on 2011-09-28
version = "7.x-1.0-beta3"
core = "7.x"
project = "debut_wysiwyg"
datestamp = "1316823155"
datestamp = "1317241003"

4 changes: 2 additions & 2 deletions profiles/openoutreach/modules/contrib/debut_wysiwyg/debut_wysiwyg.make.inc
View file
Expand Up @@ -7,9 +7,9 @@ api = 2
projects[advanced_help][subdir] = contrib
projects[advanced_help][version] = 1.0-beta1
projects[debut][subdir] = contrib
projects[debut][version] = 1.x-dev
projects[debut][version] = 1.0-beta3
projects[debut_wysiwyg][subdir] = contrib
projects[debut_wysiwyg][version] = 1.x-dev
projects[debut_wysiwyg][version] = 1.0-beta3
projects[entity][subdir] = contrib
projects[entity][version] = 1.0-beta10
projects[features][subdir] = contrib
Expand Down
2 changes: 1 addition & 1 deletion profiles/openoutreach/modules/contrib/file_entity/PATCHES.txt
View file
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/views-field-file-rendered-1215712-33.patch
- http://drupal.org/files/views-field-file-rendered-1215712-36.patch

This file was automatically generated by Drush Make (http://drupal.org/project/drush_make).

0 comments on commit 7a1dc52

Please sign in to comment.