frodovdr/kopano-ol-extension
1
0
Fork 0
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into release_1_2

Browse Source
This commit is contained in:
Patrick Simpson 2017-02-15 15:16:43 +01:00
commit eb9c2b0890
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/AboutDialog.cs
View File

@ -46,14 +46,15 @@ namespace Acacia.Features.DebugSupport
labelDateValue.Text = LibUtils.BuildTime.ToString(); labelDateValue.Text = LibUtils.BuildTime.ToString();
// Hardcoded to prevent translations // Hardcoded to prevent translations
textLicense.Text = textLicense.Text = string.Format(
@"Copyright 2016 Kopano b.v. @"Copyright 2016-{0} Kopano b.v.
This program 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. This program 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.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>"; You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>",
LibUtils.BuildTime.Year);
} }
private void linkKopano_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) private void linkKopano_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

4
src/AcaciaZPushPlugin/AcaciaZPushPlugin/ThisAddIn.cs
View File

@ -27,10 +27,6 @@ using Acacia.UI;
using Acacia.ZPush; using Acacia.ZPush;
using System.Globalization; using System.Globalization;
using Acacia.UI.Outlook; using Acacia.UI.Outlook;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Reflection;
using Acacia.Native;
using Acacia.Stubs; using Acacia.Stubs;
using Acacia.Stubs.OutlookWrappers; using Acacia.Stubs.OutlookWrappers;