Projet

Général

Profil

Révision f2fc85df

Ajouté par Assos Assos il y a presque 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/media/js/media.popups.js
128 128
  var options = e.data;
129 129

  
130 130
  // Ensure that the iFrame is defined.
131
  if (this.contentWindow.Drupal.media.browser == undefined) {
131
  if (this.contentWindow.Drupal.media == undefined) {
132 132
    return;
133 133
  }
134 134

  
drupal7/sites/all/modules/media/media.info
24 24
; We have to add a fake version so Git checkouts do not fail Media dependencies
25 25
version = 7.x-2.x-dev
26 26

  
27
; Information added by Drupal.org packaging script on 2017-07-04
28
version = "7.x-2.9"
27
; Information added by Drupal.org packaging script on 2017-08-05
28
version = "7.x-2.10"
29 29
core = "7.x"
30 30
project = "media"
31
datestamp = "1499174646"
31
datestamp = "1501961348"
32 32

  
drupal7/sites/all/modules/media/modules/media_bulk_upload/media_bulk_upload.info
15 15
files[] = includes/MediaBrowserBulkUpload.inc
16 16
files[] = tests/media_bulk_upload.test
17 17

  
18
; Information added by Drupal.org packaging script on 2017-07-04
19
version = "7.x-2.9"
18
; Information added by Drupal.org packaging script on 2017-08-05
19
version = "7.x-2.10"
20 20
core = "7.x"
21 21
project = "media"
22
datestamp = "1499174646"
22
datestamp = "1501961348"
23 23

  
drupal7/sites/all/modules/media/modules/media_internet/media_internet.info
12 12
files[] = includes/MediaInternetValidationException.inc
13 13
files[] = tests/media_internet.test
14 14

  
15
; Information added by Drupal.org packaging script on 2017-07-04
16
version = "7.x-2.9"
15
; Information added by Drupal.org packaging script on 2017-08-05
16
version = "7.x-2.10"
17 17
core = "7.x"
18 18
project = "media"
19
datestamp = "1499174646"
19
datestamp = "1501961348"
20 20

  
drupal7/sites/all/modules/media/modules/media_internet/tests/media_internet_test.info
7 7
files[] = includes/MediaInternetTestStreamWrapper.inc
8 8
files[] = includes/MediaInternetTestHandler.inc
9 9

  
10
; Information added by Drupal.org packaging script on 2017-07-04
11
version = "7.x-2.9"
10
; Information added by Drupal.org packaging script on 2017-08-05
11
version = "7.x-2.10"
12 12
core = "7.x"
13 13
project = "media"
14
datestamp = "1499174646"
14
datestamp = "1501961348"
15 15

  
drupal7/sites/all/modules/media/modules/media_migrate_file_types/media_migrate_file_types.info
8 8

  
9 9
configure = admin/structure/file-types/upgrade
10 10

  
11
; Information added by Drupal.org packaging script on 2017-07-04
12
version = "7.x-2.9"
11
; Information added by Drupal.org packaging script on 2017-08-05
12
version = "7.x-2.10"
13 13
core = "7.x"
14 14
project = "media"
15
datestamp = "1499174646"
15
datestamp = "1501961348"
16 16

  
drupal7/sites/all/modules/media/modules/media_wysiwyg/includes/media_wysiwyg.filter.inc
455 455
  // between function calls. Since media_process_form is multiple times
456 456
  // with same form, this function is also called multiple times.
457 457
  static $tagmap = array();
458
  preg_match_all("/\[\[.*?\]\]/s", $text, $matches, PREG_SET_ORDER);
458
  preg_match_all("/\[\[(?!nid:).*?\]\]/s", $text, $matches, PREG_SET_ORDER);
459 459
  foreach ($matches as $match) {
460 460
    // We see if tagContent is already in $tagMap, if not we add it
461 461
    // to $tagmap.  If we return an empty array, we break embeddings of the same
drupal7/sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.info
16 16

  
17 17
configure = admin/config/media/browser
18 18

  
19
; Information added by Drupal.org packaging script on 2017-07-04
20
version = "7.x-2.9"
19
; Information added by Drupal.org packaging script on 2017-08-05
20
version = "7.x-2.10"
21 21
core = "7.x"
22 22
project = "media"
23
datestamp = "1499174646"
23
datestamp = "1501961348"
24 24

  
drupal7/sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.install
249 249
 * Notify upgraders that there's optional media linking functionality that needs to be enabled.
250 250
 */
251 251
function media_wysiwyg_update_7207() {
252
  $message = t('If you would like to be able to link images to a page got o /admin/config/media/browser and check "Provide the ability to link media to pages", and save the settings.');
252
  $message = t('If you would like to be able to link images to a page, go to /admin/config/media/browser, check "Provide the ability to link media to pages", and save the settings.');
253 253
  drupal_set_message($message, 'warning', TRUE);
254 254
}
drupal7/sites/all/modules/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
3 3
package = Media
4 4
core = 7.x
5 5

  
6
; Information added by Drupal.org packaging script on 2017-07-04
7
version = "7.x-2.9"
6
; Information added by Drupal.org packaging script on 2017-08-05
7
version = "7.x-2.10"
8 8
core = "7.x"
9 9
project = "media"
10
datestamp = "1499174646"
10
datestamp = "1501961348"
11 11

  
drupal7/sites/all/modules/media/modules/mediafield/mediafield.info
4 4
core = 7.x
5 5
dependencies[] = media
6 6

  
7
; Information added by Drupal.org packaging script on 2017-07-04
8
version = "7.x-2.9"
7
; Information added by Drupal.org packaging script on 2017-08-05
8
version = "7.x-2.10"
9 9
core = "7.x"
10 10
project = "media"
11
datestamp = "1499174646"
11
datestamp = "1501961348"
12 12

  
drupal7/sites/all/modules/media/tests/media_module_test.info
6 6

  
7 7
files[] = includes/MediaModuleTest.inc
8 8

  
9
; Information added by Drupal.org packaging script on 2017-07-04
10
version = "7.x-2.9"
9
; Information added by Drupal.org packaging script on 2017-08-05
10
version = "7.x-2.10"
11 11
core = "7.x"
12 12
project = "media"
13
datestamp = "1499174646"
13
datestamp = "1501961348"
14 14

  
drupal7/sites/all/modules/media_ckeditor/README.txt
10 10
------------
11 11

  
12 12
Current Maintainers:
13
 * Joseph Olstad <http://drupal.org/user/1321830>
13 14

  
15
Previous Maintainers:
14 16
 * Devin Carlson <http://drupal.org/user/290182>
15 17

  
16 18
Media CKEditor provides a bridge between Media and the stand-alone CKEditor
......
33 35
   http://ckeditor.com/download
34 36

  
35 37
CKEditor Library Plugins
36
 * CKEditor Line Utilities plugin - Compatible with the installed version of CKEditor.
38
 * CKEditor Line Utilities plugin - Compatible with CKEditor.
37 39
   http://ckeditor.com/addon/lineutils
38 40
 * CKEditor Widget plugin - Compatible with the installed version of CKEditor.
39 41
   http://ckeditor.com/addon/widget
......
65 67
  plugin for the desired text formats from the CKEditor configuration
66 68
  page: '/admin/config/content/ckeditor'.
67 69
* Disable CKEditor's Advanced Content Filter for each of the text formats.
68

  
drupal7/sites/all/modules/media_ckeditor/includes/media_ckeditor.pages.inc
10 10
 */
11 11
function media_ckeditor_rendered_file_in_wysiwyg() {
12 12

  
13
  // If you would like to see how the $tag_info variable below is built, please
13
  // If you would like to see how the $tag_info variable below is built, please:
14 14
  // @see media_ckeditor/js/plugins/media/library.js.
15 15
  $tag_info = drupal_get_query_parameters();
16 16

  
drupal7/sites/all/modules/media_ckeditor/media_ckeditor.info
15 15
test_dependencies[] = views
16 16
test_dependencies[] = ctools
17 17

  
18
; Information added by Drupal.org packaging script on 2017-05-24
19
version = "7.x-2.1"
18
; Information added by Drupal.org packaging script on 2017-08-06
19
version = "7.x-2.5"
20 20
core = "7.x"
21 21
project = "media_ckeditor"
22
datestamp = "1495629657"
22
datestamp = "1502029146"
23 23

  
drupal7/sites/all/modules/media_ckeditor/media_ckeditor.install
29 29
        if ($i === 'media') {
30 30
          // Update the path variable to the new path.
31 31
          $plugin['path'] = '%base_path%' . $mod_path . '/js/plugins/media/';
32
          // Update the plugin with the new path overriding anything that was there before.
32
          // Update the plugin with the new path.
33 33
          $profile_settings['loadPlugins'][$i] = $plugin;
34 34
        }
35 35
      }
......
69 69
        if ($i === 'media') {
70 70
          // Update the path variable to the new path.
71 71
          $plugin['path'] = '%base_path%' . $mod_path . '/js/plugins/media/';
72
          // Update the plugin with the new path overriding anything that was there before.
72
          // Update the plugin with the new path.
73 73
          $profile_settings['loadPlugins'][$i] = $plugin;
74 74
        }
75 75
      }
drupal7/sites/all/modules/media_ckeditor/media_ckeditor.module
81 81
        'audio',
82 82
        'image',
83 83
        'video',
84
        'document'
84
        'document',
85 85
      ));
86 86
    }
87 87
  }
......
110 110
function media_ckeditor_pre_render_media($element) {
111 111
  // If the media widget has been configured to have an Insert button, we'll
112 112
  // communicate that information through javascript settings.
113
  $instance = field_info_instance($element['#entity_type'], $element['#field_name'], $element['#bundle']);
113
  if (!isset($element['#entity_type']) && !isset($element['#field_name']) && !isset($element['#bundle'])) {
114
    $instance = FALSE;
115
  }
116
  else {
117
    $instance = field_info_instance($element['#entity_type'], $element['#field_name'], $element['#bundle']);
118
  }
114 119
  if (!empty($instance['settings']['wysiwyg_insert'])) {
115 120
    $element['#attached']['js'][] = array(
116 121
      'type' => 'setting',
drupal7/sites/all/modules/media_ckeditor/tests/media_ckeditor_test.info
4 4
core = 7.x
5 5
hidden = FALSE
6 6

  
7
; Information added by Drupal.org packaging script on 2017-05-24
8
version = "7.x-2.1"
7
; Information added by Drupal.org packaging script on 2017-08-06
8
version = "7.x-2.5"
9 9
core = "7.x"
10 10
project = "media_ckeditor"
11
datestamp = "1495629657"
11
datestamp = "1502029146"
12 12

  

Formats disponibles : Unified diff