Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [4.1.0] - 2026-08-04

### New

- Add support for nc 35

### Fixed

- Update dependencies
- Update translations from Transifex

## [4.0.4] - 2026-05-26

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<summary>Integration of Zammad user support/ticketing solution</summary>
<description><![CDATA[Zammad integration provides a dashboard widget displaying your important notifications,
a search provider for tickets and notifications for new open tickets.]]></description>
<version>4.0.4</version>
<version>4.1.0</version>
<licence>agpl</licence>
<author>Julien Veyssier</author>
<namespace>Zammad</namespace>
Expand All @@ -18,7 +18,7 @@
<bugs>https://github.com/nextcloud/integration_zammad/issues</bugs>
<screenshot>https://github.com/nextcloud/integration_zammad/raw/main/img/screenshot1.jpg</screenshot>
<dependencies>
<nextcloud min-version="32" max-version="34"/>
<nextcloud min-version="32" max-version="35"/>
</dependencies>
<background-jobs>
<job>OCA\Zammad\BackgroundJob\CheckOpenTickets</job>
Expand Down
2 changes: 0 additions & 2 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;

use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\Collaboration\Reference\RenderReferenceEvent;
use OCP\Config\IUserConfig;
use OCP\IL10N;
use OCP\INavigationManager;

use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\Notification\IManager as INotificationManager;
Expand Down
1 change: 0 additions & 1 deletion lib/BackgroundJob/CheckOpenTickets.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
use OCA\Zammad\Service\ZammadAPIService;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;

use Psr\Log\LoggerInterface;

class CheckOpenTickets extends TimedJob {
Expand Down
9 changes: 4 additions & 5 deletions lib/Controller/ConfigController.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
use OCP\IAppConfig;
use OCP\IL10N;
use OCP\IRequest;

use OCP\IURLGenerator;
use OCP\PreConditionNotMetException;
use OCP\Security\ICrypto;
Expand Down Expand Up @@ -191,17 +190,17 @@ public function oauthRedirect(string $code = '', string $state = ''): RedirectRe
// get user info
$this->storeUserInfo();
return new RedirectResponse(
$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']) .
'?zammadToken=success'
$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts'])
. '?zammadToken=success'
);
}
$result = $this->l->t('Error getting OAuth access token.') . ' ' . $result['error'];
} else {
$result = $this->l->t('Error during OAuth exchanges');
}
return new RedirectResponse(
$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']) .
'?zammadToken=error&message=' . urlencode($result)
$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts'])
. '?zammadToken=error&message=' . urlencode($result)
);
}

Expand Down
1 change: 0 additions & 1 deletion lib/Controller/ZammadAPIController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\AppFramework\Http\DataResponse;

use OCP\Config\IUserConfig;
use OCP\IRequest;
use OCP\PreConditionNotMetException;
Expand Down
1 change: 0 additions & 1 deletion lib/Dashboard/ZammadWidget.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
use OCP\Dashboard\IWidget;
use OCP\IL10N;
use OCP\IURLGenerator;

use OCP\Util;

class ZammadWidget implements IWidget {
Expand Down
1 change: 1 addition & 0 deletions lib/Migration/Version030000Date20241003141518.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Zammad\Migration;

use Closure;
Expand Down
1 change: 1 addition & 0 deletions lib/Migration/Version030200Date20251230225956.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Zammad\Migration;

use Closure;
Expand Down
1 change: 1 addition & 0 deletions lib/Migration/Version040000Date20260129225956.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Zammad\Migration;

use Closure;
Expand Down
1 change: 0 additions & 1 deletion lib/Notification/Notifier.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ public function prepare(INotification $notification, string $languageCode): INot
);
//->setIcon($this->url->getAbsoluteURL($iconUrl));
return $notification;

default:
// Unknown subject => Unknown notification => throw
throw new UnknownNotificationException();
Expand Down
1 change: 0 additions & 1 deletion lib/Reference/ZammadReferenceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ public function getSupportedSearchProviderIds(): array {
return $ids;
}
return ['zammad-search'];

}

private function isMatching(string $referenceText, string $url): bool {
Expand Down
1 change: 1 addition & 0 deletions lib/Search/ZammadSearchProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

namespace OCA\Zammad\Search;

use DateTime;
Expand Down
1 change: 1 addition & 0 deletions lib/Search/ZammadSearchResultEntry.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

namespace OCA\Zammad\Search;

use OCP\Search\SearchResultEntry;
Expand Down
1 change: 0 additions & 1 deletion lib/Service/ZammadAPIService.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
use OCP\IUserManager;
use OCP\Notification\IManager as INotificationManager;
use OCP\PreConditionNotMetException;

use OCP\Security\ICrypto;
use Psr\Log\LoggerInterface;

Expand Down
1 change: 0 additions & 1 deletion lib/Settings/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
use OCP\IAppConfig;

use OCP\Settings\ISettings;

class Admin implements ISettings {
Expand Down
1 change: 0 additions & 1 deletion lib/Settings/Personal.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use OCP\AppFramework\Services\IInitialState;
use OCP\Config\IUserConfig;
use OCP\IAppConfig;

use OCP\Security\ICrypto;
use OCP\Settings\ISettings;

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "integration_zammad",
"version": "4.0.4",
"version": "4.1.0",
"description": "Zammad integration",
"main": "index.js",
"directories": {
Expand Down
Loading