gielfeldt

<?php

namespace SimpleSwagger;

use Silex\Application;
use Silex\Api\ControllerProviderInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;

class SwaggerControllerProvider implements ControllerProviderInterface

gielfeldt

<?php

namespace SwaggerService\RestService\MyService1\v1;

use Silex\Application;
use Symfony\Component\HttpFoundation\Request;

/**
 * @SWG\Swagger(
 *     @SWG\Info(

gielfeldt

diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index 2002e9e..c3b0d7e 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -1092,6 +1092,10 @@ public function rollback($savepoint_name = 'drupal_transaction') {
         if ($rolled_back_other_active_savepoints) {
           throw new TransactionOutOfOrderException();
         }
+
+        // Dispatch event for transaction rollback.

gielfeldt

From b654bc13e0044710968297281ba8e826ed0ed6df Mon Sep 17 00:00:00 2001
From: Lisa Felder <lisa@reload.dk>
Date: Mon, 6 Jul 2015 13:25:37 +0200
Subject: [PATCH 1/5] Updated tags taxonomy features export

The hierarchy value depends on the state of the content and not on the configuration for the taxonomy itself. The content has changed and thus the value should be updated as well.

This has little to do with the purpose of this branch but we need to update the feature so we fix this as well.
---
 ding_content.features.taxonomy.inc | 2 +-

gielfeldt

diff --git a/ding_user_frontend.make b/ding_user_frontend.make
index 1b2e9a1..a409da1 100644
--- a/ding_user_frontend.make
+++ b/ding_user_frontend.make
@@ -30,6 +30,8 @@ projects[ding_bookmark][type] = "module"
 projects[ding_bookmark][download][type] = "git"
 projects[ding_bookmark][download][url] = "git@github.com:ding2/ding_bookmark.git"
 projects[ding_bookmark][download][tag] = "7.x-2.3.0"
+; Add paginator to bookmarks list.
+projects[ding_bookmark][patch][] = "https://github.com/kdb/ding_bookmark/pull/1.patch"

gielfeldt

diff --git a/bpi.make b/bpi.make
index 9c33d74..09f6b02 100644
--- a/bpi.make
+++ b/bpi.make
@@ -24,6 +24,8 @@ libraries[bpi-client][destination] = "modules/bpi/lib"
 libraries[bpi-client][download][type] = "git"
 libraries[bpi-client][download][url] = "git@github.com:ding2/bpi-client.git"
 libraries[bpi-client][download][tag] = "7.x-2.0.0"
+; Issue #1161 - Fix BPI publishing.
+libraries[bpi-client][patch][] = "https://github.com/ding2/bpi-client/pull/1.patch"

gielfeldt

diff --git a/ding_frontend.make b/ding_frontend.make
index c983852..a49d4f7 100644
--- a/ding_frontend.make
+++ b/ding_frontend.make
@@ -91,3 +91,5 @@ projects[ding_page][type] = "module"
 projects[ding_page][download][type] = "git"
 projects[ding_page][download][url] = "git@github.com:ding2/ding_page.git"
 projects[ding_page][download][tag] = "7.x-2.0.0"
+; Add pseudo-delta support for ting_reference.
+projects[ding_page][patch][] = "https://gist.githubusercontent.com/gielfeldt/a5a35f1823ddf3286c6d/raw/a73314d790265c050359b17137f8f78973788378/pseudo-delta-meta-page"

gielfeldt

diff --git a/ding_content.make b/ding_content.make
index 97c2f6e..e7160bb 100644
--- a/ding_content.make
+++ b/ding_content.make
@@ -79,4 +79,6 @@ projects[ding_page][type] = "module"
 projects[ding_page][download][type] = "git"
 projects[ding_page][download][url] = "git@github.com:ding2/ding_page.git"
 projects[ding_page][download][tag] = "7.x-2.0.0"
+; Add pseudo-delta support for ting_reference.
+projects[ding_page][patch][] = "https://gist.githubusercontent.com/gielfeldt/a5a35f1823ddf3286c6d/raw/a3f9f091d26cae748336c188cf39f684ee782d01/pseudo-delta-meta-page"

gielfeldt

diff --git a/ding_page.make b/ding_page.make
index e08e7f7..1658291 100644
--- a/ding_page.make
+++ b/ding_page.make
@@ -11,6 +11,8 @@ projects[ting_reference][type] = "module"
 projects[ting_reference][download][type] = "git"
 projects[ting_reference][download][url] = "git@github.com:ding2/ting_reference.git"
 projects[ting_reference][download][tag] = "7.x-2.0.0"
+; Add pseudo-delta-support for ting references.
+projects[ting_reference][patch][] = "https://github.com/kdb/ting_reference/pull/1.patch"

gielfeldt

diff --git a/ding_news.make b/ding_news.make
index 1720c12..13429d8 100644
--- a/ding_news.make
+++ b/ding_news.make
@@ -16,6 +16,8 @@ projects[ting_reference][type] = "module"
 projects[ting_reference][download][type] = "git"
 projects[ting_reference][download][url] = "git@github.com:ding2/ting_reference.git"
 projects[ting_reference][download][tag] = "7.x-2.0.0"
+; Add pseudo-delta-support for ting references.
+projects[ting_reference][patch][] = "https://gist.githubusercontent.com/gielfeldt/53f5b5c624d691b652c9/raw/e57a63c4fa11611edaae4aec49a263425b62ef2a/pseudo-delta-support"