sharidas

<?php
/**
 * @author Joas Schilling <nickvergessen@owncloud.com>
 *
 * @copyright Copyright (c) 2018, ownCloud GmbH
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, version 3,
 * as published by the Free Software Foundation.

sharidas

<?php
/**
 * @author Sujith Haridasan <sharidasan@owncloud.com>
 *
 * @copyright Copyright (c) 2018, ownCloud GmbH
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, version 3,
 * as published by the Free Software Foundation.

sharidas

From 7aaae388c9f89c0153638949e7cacc6e6ec63fef Mon Sep 17 00:00:00 2001
From: Sujith H <sharidasan@owncloud.com>
Date: Wed, 12 Dec 2018 22:29:51 +0530
Subject: [PATCH] Add user alert option when apps are upgraded.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
---
 core/Command/Upgrade.php    | 28 ++++++++++++++++++++++++++--
 core/register_command.php   |  2 +-
 lib/private/Repair/Apps.php | 17 +++++++++++++++++

sharidas

From 9a27c4b0b0937edb532ecafaad64a01a6b8b296c Mon Sep 17 00:00:00 2001
From: Sujith H <sharidasan@owncloud.com>
Date: Tue, 27 Jun 2017 12:18:31 +0530
Subject: [PATCH] Add customgroup logs

Adding customgroup logs to the admin_audit
app.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
---

sharidas

From eaf219e9a294ecac5dab15c287ef05184e544596 Mon Sep 17 00:00:00 2001
From: Sujith H <sharidasan@owncloud.com>
Date: Tue, 27 Jun 2017 12:40:28 +0530
Subject: [PATCH] Add dispatcher events for audit log

Adding dispatcher events for audit log

Signed-off-by: Sujith H <sharidasan@owncloud.com>
---
 lib/Dav/GroupMembershipCollection.php            | 14 ++++++++++++++

sharidas

diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index b662586..16762ca 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -91,10 +91,36 @@ class SettingsController extends Controller {
                                'message' => "Cannot impersonate user " . '"' . $userid . '"' . " who hasn't logged in yet.",
                        ], http::STATUS_NOT_FOUND);
                } else {
-                       $this->logger->info("User $oldUserId impersonated user $userid", ['app' => 'impersonate']);
-                       $this->userSession->setUser($user);

sharidas

diff --git a/tests/enterprisekeytest.php b/tests/enterprisekeytest.php
index 0cf45a8..36bcff0 100644
--- a/tests/enterprisekeytest.php
+++ b/tests/enterprisekeytest.php
@@ -3,6 +3,7 @@
 namespace OCA\Enterprise_Key\Tests;
 
 use OCA\Enterprise_Key\EnterpriseKey;
+use OCA\ConfigReport\OrderPlacedEvent;
 

sharidas

diff --git a/js/admin.js b/js/admin.js
index 0aae187..d9f817e 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -17,7 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
+var ConfigureReport = {
+       getLicenseInfo: function() {

sharidas

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index cec9bb2..1616bf6 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -33,7 +33,6 @@ class Application extends App {
                                \OC::$server->getIntegrityCodeChecker(),
                                \OC_User::getUsers(),
                                \OC::$server->getUserManager(),
-                               \OC::$server->getConfig()->getSystemValue('license-key'),
                                \OC_Util::getVersion(),

sharidas

SHELL := /bin/bash                                                                                                                                                                           
                                                                                                                                                                                             
appname=$(notdir $(CURDIR))                                                                                                                                                                  
occ=$(CURDIR)/../../occ                                                                                                                                                                      
private_key=$(CURDIR)/$(appname).key
certificate=$(CURDIR)/$(appname).crt
sign=php -f $(occ) integrity:sign-app --privateKey="$(private_key)" --certificate="$(certificate)"

#
# Catch-all rules