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
HTTP/1.1 200 OK | |
Accept-Ranges: bytes | |
Age: 96 | |
Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0 | |
Connection: keep-alive | |
Content-Encoding: gzip | |
Content-Length: 26 | |
Content-Security-Policy: frame-ancestors 'self' | |
Content-Type: text/html; charset=utf-8 | |
Date: Sat, 13 Feb 2016 11:06:49 GMT |
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
<?php | |
class Renderer { | |
… | |
// unchanged relative to HEAD | |
public function renderRoot(&$elements) { | |
return $this->render($elements, TRUE); | |
} |
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
11:27:10 berdir: WimLeers: ping | |
11:27:25 WimLeers: berdir: pong | |
11:28:38 berdir: WimLeers: did you see my e-mail? ;) | |
11:28:47 WimLeers: I did not | |
11:28:56 WimLeers: I'm very far behind on both personal and Acquia e-mail. | |
11:29:04 WimLeers: sorry :( | |
11:29:17 berdir: WimLeers: np, I just asked if I can ask you a question :p | |
11:29:28 WimLeers: haha | |
11:29:32 WimLeers: oh there it is | |
11:29:37 WimLeers: shoot! |
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
+--------------------------+ extends +-----------------------+ implements +------------------+ | |
+--------------------------------->| AssetCollectionInterface +---------->| AsseticAssetInterface |<------------ + AsseticBaseAsset | | |
ASSETIC | +--------------------------+ +-----------------------+ +------------------+ | |
| ^ ^ | |
+-----------------------------|---------------------------------------------------------------------------------------------|-------------------------|-----------------------------+ | |
+-----------------------------|---------------------------------------------------------------------------------------------|-------------------------|-----------------------------+ | |
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
#!/usr/bin/env python | |
# Retrieves the quota details of the given SSH hots and outputs JSON. | |
import os | |
import optparse | |
import subprocess | |
def calculate(hosts): | |
records = {} |
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
core/modules/edit/edit.module | 5 +++++ | |
1 file changed, 5 insertions(+) | |
diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module | |
index a7fbb5d..a174e4e 100644 | |
--- a/core/modules/edit/edit.module | |
+++ b/core/modules/edit/edit.module | |
@@ -162,6 +162,11 @@ function edit_field_formatter_info_alter(&$info) { | |
* Implements hook_preprocess_HOOK() for field.tpl.php. | |
*/ |
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/core/modules/edit/js/util.js b/core/modules/edit/js/util.js | |
index 3f2919e..02ad49e 100644 | |
--- a/core/modules/edit/js/util.js | |
+++ b/core/modules/edit/js/util.js | |
@@ -62,13 +62,17 @@ Drupal.edit.util.form = { | |
url: Drupal.edit.util.buildUrl(fieldID, drupalSettings.edit.fieldFormURL), | |
event: 'edit-internal.edit', | |
submit: { nocssjs : options.nocssjs, reset : options.reset }, | |
- progress: { type : null } // No progress indicator. | |
+ progress: { type : null }, // No progress indicator. |
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
public function aggregate(array $css_assets) { | |
// Group the assets. | |
$css_groups = $this->grouper->group($css_assets); | |
// Now optimize (concatenate + minify) and dump each asset group, unless | |
// that was already done, in which case it should appear in | |
// drupal_css_cache_files. | |
// Drupal contrib can override this default CSS aggregator to keep the same | |
// grouping, optimizing and dumping, but change the strategy that is used to | |
// determine when the aggregate should be rebuilt (e.g. mtime, HTTPS …). |
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
/** | |
* This is a huge hack to do ONE thing: to allow Drupal to fully mandate what | |
* CKEditor should allow by setting CKEditor's allowedContent setting. The | |
* problem is that allowedContent only allows for whitelisting, whereas | |
* Drupal's default HTML filtering (the filter_html filter) also blacklists | |
* the "style" and "on*" ("onClick" etc.) attributes. | |
* | |
* So this function hacks in explicit support for Drupal's filter_html's need | |
* to blacklisting specifically those attributes, until ACF supports | |
* blacklisting of properties: http://dev.ckeditor.com/ticket/10276. |
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/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php b/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php | |
index 5a45910..fd9b049 100644 | |
--- a/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php | |
+++ b/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php | |
@@ -33,13 +33,6 @@ class Editor extends Plugin { | |
public $label; | |
/** | |
- * The name of the module providing the editor plugin. | |
- * |