Adjustments after syncing with fork

.travis.yml

@@ -36,8 +36,6 @@ matrix:
       env: "DB=sqlite"
     - php: 5.6
       env: "DB=pgsql"
-    - php: 5.6
-      env: "DB=mysql CORE_BRANCH=stable9"
     - php: 5.6
       env: "DB=mysql CORE_BRANCH=stable9.1"
     - php: 5.6
@@ -46,15 +44,6 @@ matrix:
 
 
 before_install:
-  # we spawn in /home/travis/build/owncloud/calendar
-  # go to /home/travis/build/
-  - cd ../../
-  - wget https://phar.phpunit.de/phpunit-5.7.phar
-  - chmod +x phpunit-5.7.phar
-  - mkdir bin
-  - sudo mv phpunit-5.7.phar bin/phpunit
-  - export PATH="$PWD/bin:$PATH"
-  - phpunit --version
   # get a newer node.js version
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
@@ -66,7 +55,6 @@ before_install:
   - mv calendar owncloud/apps/
   - cd owncloud
   - if [ "$CORE_BRANCH" != 'stable9' ] && [ "$CORE_BRANCH" != 'stable9.1' ]; then make; fi
-  - cd apps/calendar/
 
 cache:
   directories:

Makefile

@@ -64,6 +64,7 @@ endif
 # * the private key is located in ~/.owncloud/calendar.key
 # * the certificate is located in ~/.owncloud/calendar.crt
 occ=$(CURDIR)/../../occ
+phpunit_oc10=$(CURDIR)/../../lib/composer/bin/phpunit
 configdir=$(CURDIR)/../../config
 private_key=$(HOME)/.owncloud/$(app_name).key
 certificate=$(HOME)/.owncloud/$(app_name).crt
@@ -164,12 +165,8 @@ endif
 .PHONY: test
 test:
 	cd js && $(yarn) run test
-ifeq (, $(shell which phpunit 2> /dev/null))
-	@echo "No phpunit command available, downloading a copy from the web"
-	mkdir -p $(build_tools_directory)
-	curl -sSL https://phar.phpunit.de/phpunit.phar -o $(build_tools_directory)/phpunit.phar
-	php $(build_tools_directory)/phpunit.phar -c phpunit.xml --coverage-clover coverage.clover
-	# php $(build_tools_directory)/phpunit.phar -c phpunit.integration.xml --coverage-clover build/php-integration.clover
+ifneq ("$(wildcard $(phpunit_oc10))","")
+	php $(phpunit_oc10) -c phpunit.xml --coverage-clover coverage.clover
 else
 	phpunit -c phpunit.xml --coverage-clover coverage.clover
 	# phpunit -c phpunit.integration.xml --coverage-clover build/php-unit.clover

appinfo/info.xml

@@ -13,7 +13,7 @@
 	<licence>AGPL</licence>
 	<author>Georg Ehrke, Raghu Nayyar, Bernhard Fröhler</author>
 	<dependencies>
-		<owncloud min-version="9.0" max-version="10.0" />
+		<owncloud min-version="9.1" max-version="10.0" />
 	</dependencies>
 	<description>Calendar GUI for the server-integrated CalDAV server</description>
 	<documentation>

controller/emailcontroller.php

@@ -114,7 +114,7 @@ private function sendEmail($target, $subject, $body, $textBody) {
 		}
 
 		$sendFromDomain = $this->config->getSystemValue('mail_domain', 'domain.org');
-		$sendFromAddress = $this->config->getSystemValue('mail_from_address', 'nextcloud');
+		$sendFromAddress = $this->config->getSystemValue('mail_from_address', 'owncloud');
 		$sendFrom = $sendFromAddress . '@' . $sendFromDomain;
 
 		$message = $this->mailer->createMessage();

controller/viewcontroller.php

@@ -196,24 +196,23 @@ private function getTemplateParams() {
 		$runningOnServer91OrLater = version_compare($runningOn, '9.1', '>=');
 
 		$supportsClass = $runningOnServer91OrLater;
-		$needsAutosize = false;
 
 		$shareeCanEditShares = false;
 		$shareeCanEditCalendarProperties = false;
 
 		$appVersion = $this->config->getAppValue($this->appName, 'installed_version');
 		$webCalWorkaround = $runningOnServer91OrLater ? 'no' : 'yes';
 		$isIE = $this->request->isUserAgent([Request::USER_AGENT_IE]);
-		$defaultColor = $this->config->getAppValue('theming', 'color', '#0082C9');
+//		$defaultColor = $this->config->getAppValue('theming', 'color', '#1d2d44');
 		$canSharePublicLink = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
 
 		return [
 			'appVersion' => $appVersion,
 			'supportsClass' => $supportsClass,
 			'isIE' => $isIE,
 			'webCalWorkaround' => $webCalWorkaround,
-			'needsAutosize' => $needsAutosize,
-			'defaultColor' => $defaultColor,
+			'needsAutosize' => true,
+			'defaultColor' => '#1d2d44',
 			'shareeCanEditShares' => $shareeCanEditShares ? 'yes' : 'no',
 			'shareeCanEditCalendarProperties' => $shareeCanEditCalendarProperties ? 'yes' : 'no',
 			'canSharePublicLink' => $canSharePublicLink,

templates/mail.publication.html.php

@@ -234,7 +234,6 @@
 				background-color: #34495e !important;
 				border-color: #34495e !important; } }
 
-		/* Fixes for NextCloud */
 		#nojavascript {
 			display: none !important;
 		}

templates/public.php

@@ -1,7 +1,7 @@
 <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
 		<div id="header-left">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
-			   title="" id="nextcloud">
+			   title="" id="owncloud">
 				<div class="logo-icon svg"></div>
 				<h1 class="header-appname">
 					<?php p($theme->getName()); ?>