Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Kopano-dev/kopano-ol-extension
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Kopano-dev/kopano-ol-extension
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release_1_4
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 29 files changed
  • 2 contributors

Commits on Jun 30, 2017

  1. Merge translations from branch 'master' into release_1_4

    @pndsimpson
    pndsimpson committed Jun 30, 2017
    Copy the full SHA
    7efbde3 View commit details

  2. Fixed escaped quotes in translations

    @pndsimpson
    pndsimpson committed Jun 30, 2017
    Copy the full SHA
    af6c8af View commit details

  3. [KOE-115] Enabled sync stall detection by default

    @pndsimpson
    pndsimpson committed Jun 30, 2017
    Copy the full SHA
    f005d8b View commit details

  4. Commit strings #203

    @pndsimpson
    KOE_Export_Strings_Commit authored and pndsimpson committed Jun 30, 2017
    Copy the full SHA
    6dcc9b1 View commit details

  5. Commit strings #204

    @pndsimpson
    KOE_Export_Strings_Commit authored and pndsimpson committed Jun 30, 2017
    Copy the full SHA
    3476bcd View commit details

  6. Translated using Weblate (Dutch) 

    Currently translated at 100.0% (200 of 200 strings)
    @pndsimpson
    pndsimpson committed Jun 30, 2017
    Copy the full SHA
    de89c81 View commit details
Showing with 9,370 additions and 11,536 deletions.
  1. +0 −17 src/AcaciaZPushPlugin/AcaciaZPushPlugin/AcaciaZPushPlugin.csproj
  2. +0 −457 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KAbstractComboBox.cs
  3. +0 −397 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KComboBox.cs
  4. +0 −85 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KComboBoxCustomDraw.cs
  5. +0 −85 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KDataSource.cs
  6. +0 −100 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KTextBox.cs
  7. +1 −57 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KUIUtil.cs
  8. +0 −341 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KVisualStateTracker.cs
  9. +0 −141 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KVisualStyle.cs
  10. +37 −30 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/SharedFoldersDialog.Designer.cs
  11. +1 −5 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/SharedFoldersDialog.cs
  12. +149 −113 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/SharedFoldersDialog.resx
  13. +1 −1 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SyncState/FeatureSyncState.cs
  14. +0 −24 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Native/UXTheme.cs
  15. +0 −22 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Native/User32.cs
  16. +0 −405 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Native/VirtualKeys.cs
  17. +0 −23 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Native/WM.cs
  18. +146 −163 src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/GABLookupControl.cs
  19. +0 −10 src/AcaciaZPushPlugin/AcaciaZPushPlugin/Utils/Util.cs
  20. +3 −12 src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/GABUser.cs
  21. +943 −943 translations/KOE.pot
  22. +1,211 −1,215 translations/de.po
  23. +943 −943 translations/en.po
  24. +1,210 −1,210 translations/fr.po
  25. +1,211 −1,223 translations/hu.po
  26. +1,174 −1,174 translations/it.po
  27. +964 −964 translations/nb.po
  28. +412 −412 translations/nl.po
  29. +964 −964 translations/pt_br.po
17 changes: 0 additions & 17 deletions src/AcaciaZPushPlugin/AcaciaZPushPlugin/AcaciaZPushPlugin.csproj
View file
Original file line number Diff line number Diff line change
@@ -207,9 +207,6 @@
<Compile Include="AcaciaOptionAttribute.cs" />
<Compile Include="Config.cs" />
<Compile Include="Constants.cs" />
<Compile Include="Controls\KAbstractComboBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\KAnimator.cs">
<SubType>Component</SubType>
</Compile>
@@ -223,16 +220,9 @@
<DependentUpon>KBusyIndicator.cs</DependentUpon>
</Compile>
<Compile Include="Controls\KCheckManager.cs" />
<Compile Include="Controls\KComboBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\KComboBoxCustomDraw.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\KCopyLabel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\KDataSource.cs" />
<Compile Include="Controls\KDialogButtons.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -249,9 +239,6 @@
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\KSelectionManager.cs" />
<Compile Include="Controls\KTextBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\KTreeNode.cs" />
<Compile Include="Controls\KTreeNodeLoader.cs" />
<Compile Include="Controls\KTreeNodes.cs" />
@@ -264,8 +251,6 @@
<Compile Include="Controls\KTreeRendererVisualStyles.cs" />
<Compile Include="Controls\KUITask.cs" />
<Compile Include="Controls\KUIUtil.cs" />
<Compile Include="Controls\KVisualStateTracker.cs" />
<Compile Include="Controls\KVisualStyle.cs" />
<Compile Include="DebugOptions.cs" />
<Compile Include="Features\BCC\FeatureBCC.cs" />
<Compile Include="Features\DeliveryReceipts\FeatureDeliveryReceipts.cs" />
@@ -334,8 +319,6 @@
<Compile Include="Native\MAPI\Property.cs" />
<Compile Include="Native\MAPI\Restriction.cs" />
<Compile Include="Native\MAPI\RestrictionEncoder.cs" />
<Compile Include="Native\UXTheme.cs" />
<Compile Include="Native\VirtualKeys.cs" />
<Compile Include="OutlookConstants.cs" />
<Compile Include="SearchQuery.cs" />
<Compile Include="Stubs\Enums.cs" />
Loading