nextcloud-desktop.git
10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 2 Jul 2016 06:19:18 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 1 Jul 2016 06:18:37 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 30 Jun 2016 06:18:34 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 29 Jun 2016 06:18:33 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 28 Jun 2016 06:19:16 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #5007 from owncloud/rebuildWinShellIntegration
Jocelyn Turcotte [Mon, 27 Jun 2016 16:02:42 +0000 (18:02 +0200)]
Merge pull request #5007 from owncloud/rebuildWinShellIntegration

Rebuild win shell integration

10 years agoFix a QAction leak (#5008)
Jocelyn Turcotte [Mon, 27 Jun 2016 14:22:51 +0000 (16:22 +0200)]
Fix a QAction leak (#5008)

Attach the accout menu QAction to the menu rather than the
ownCloudGui since it should be destroyed when the context
menu is cleared.

10 years agoFix windows HiDPI #4994 (#4998)
ckamm [Mon, 27 Jun 2016 14:17:58 +0000 (16:17 +0200)]
Fix windows HiDPI #4994 (#4998)

This was removed in 0194ebb2229adc33f5b9790231a3384b46474bde
because it breaks on Linux. However, it looks like it is correct
for Windows. In the meantime the surrounding ifdef has changed
from !Q_OS_MAC to Q_OS_WIN, so reverting it makes sense.

10 years agoFix a deadlock when shutting down during discovery (#4993)
Jocelyn Turcotte [Mon, 27 Jun 2016 14:12:39 +0000 (16:12 +0200)]
Fix a deadlock when shutting down during discovery (#4993)

Since the SyncEngine now quits and waits for the discovery thread,
the main thread can enter a deadlock where the discovery thread waits
for its directory result.

Add a 2 seconds timer to the discovery thread wait condition
to limit the deadlock time.

10 years agobinaries: Update to build 42 owncloud/client#4977
Jocelyn Turcotte [Mon, 27 Jun 2016 13:30:03 +0000 (15:30 +0200)]
binaries: Update to build 42 owncloud/client#4977

10 years agoshell_integration/windows: Set VS output directory in the binary submodule
Jocelyn Turcotte [Mon, 27 Jun 2016 13:07:59 +0000 (15:07 +0200)]
shell_integration/windows: Set VS output directory in the binary submodule

This allows creating a new build simply by hitting F7 in visual studio
and then committing the changed files in the binary submodules without
having to know which files to move where.

10 years agoshell_integration/windows: Add a manually-increased build number
Jocelyn Turcotte [Mon, 27 Jun 2016 13:02:56 +0000 (15:02 +0200)]
shell_integration/windows: Add a manually-increased build number

Since this isn't yet built together with the rest, we can't reliably
use the client version without having to rebuilt the extension manually
on each release. But it would still be nice to be able to tell if a user
has the right version or not loaded, so instead just tag each update of
the DLLs with a separate release version.

This means that every time we update those binaries we'll have to manually
increment the number in the header, but worst case we'll forget from time
to time but we'll be able to know if we didn't, and know if we can rely on
the number or not.

10 years agoSocketAPI: Use different pipe name #4977 (#4997)
ckamm [Mon, 27 Jun 2016 13:13:08 +0000 (15:13 +0200)]
SocketAPI: Use different pipe name #4977 (#4997)

Named pipe names that contain backslashes sometimes lead to problems.

10 years agoShare: Permissions for federated shares on servers >=9.1 #4996 (#5001)
ckamm [Mon, 27 Jun 2016 09:09:51 +0000 (11:09 +0200)]
Share: Permissions for federated shares on servers >=9.1 #4996 (#5001)

This disables the workaround 487e1fdca5ee04fc98c1ed77898df70d740967c8
for servers that are new enough to support fine grained permissions
on federated shares.

The consequence is that the 'reshare' permission is now granted by
default and that users can edit permissions on the usual fine-grained
level again.

The way the client deals with servers <9.1 is unchanged.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 27 Jun 2016 06:18:35 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 26 Jun 2016 06:18:40 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 25 Jun 2016 06:18:39 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 24 Jun 2016 06:18:52 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years agoTray: Add minimal mode as workaround and testing tool #4985 #4990
Christian Kamm [Thu, 23 Jun 2016 08:22:43 +0000 (10:22 +0200)]
Tray: Add minimal mode as workaround and testing tool #4985 #4990

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 23 Jun 2016 06:18:31 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years agoFix Qt4 build
Christian Kamm [Wed, 22 Jun 2016 13:47:33 +0000 (15:47 +0200)]
Fix Qt4 build

10 years agoowncloudcmd: Fix --exclude regression
Christian Kamm [Wed, 22 Jun 2016 13:30:20 +0000 (15:30 +0200)]
owncloudcmd: Fix --exclude regression

It's ok if the system exclude file is missing when --exclude is
specified explicitly.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 22 Jun 2016 06:18:48 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years agocsync: Use the full file stat destructors (#4992)
ckamm [Tue, 21 Jun 2016 10:06:21 +0000 (12:06 +0200)]
csync: Use the full file stat destructors (#4992)

* For csync_file_stat_t and csync_vio_file_stat_t
* Add original_name to the vio file stat destructor

10 years agoFix the Qt4 build
Jocelyn Turcotte [Tue, 21 Jun 2016 10:03:52 +0000 (12:03 +0200)]
Fix the Qt4 build

QSharedPointer::reset doesn't exist in Qt4.

10 years agoMerge pull request #4979 from jturcotte/2.2
Markus Goetz [Tue, 21 Jun 2016 08:00:41 +0000 (10:00 +0200)]
Merge pull request #4979 from jturcotte/2.2

Memory improvements during propagation

10 years agoSetup csync logging earlier (#4991)
ckamm [Tue, 21 Jun 2016 07:58:53 +0000 (09:58 +0200)]
Setup csync logging earlier (#4991)

We were missing some csync related log output during startup.

Discovered in #4967

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 21 Jun 2016 06:18:36 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years agoThis branch is headed towards 2.2.3 now
Daniel Molkentin [Mon, 20 Jun 2016 15:42:19 +0000 (17:42 +0200)]
This branch is headed towards 2.2.3 now

10 years agoexcludes: Only log if the pattern was really logged. (#4989)
Klaas Freitag [Mon, 20 Jun 2016 13:50:20 +0000 (15:50 +0200)]
excludes: Only log if the pattern was really logged. (#4989)

10 years agoPerformance: Don't redundantly add the same exclude files #4967 (#4988)
ckamm [Mon, 20 Jun 2016 13:14:13 +0000 (15:14 +0200)]
Performance: Don't redundantly add the same exclude files #4967 (#4988)

Excludes: Don't redundantly add the same exclude files #4967, Never accept duplicate exclude patterns #4967

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 20 Jun 2016 06:18:29 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 19 Jun 2016 06:18:34 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 18 Jun 2016 06:18:33 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years agoReduce the memory usage of the StopWatch during propagation
Jocelyn Turcotte [Fri, 17 Jun 2016 17:09:37 +0000 (19:09 +0200)]
Reduce the memory usage of the StopWatch during propagation

Use a QMap to avoid using a full hashtable for only a few entries, and
clear the QMap once we're done with the measuring. This saves a few
hundred bytes per job during propagation that would otherwise only be
freed at the end of the sync.

10 years agoDelete the ComputeChecksum object when the job is finished
Jocelyn Turcotte [Fri, 17 Jun 2016 17:08:04 +0000 (19:08 +0200)]
Delete the ComputeChecksum object when the job is finished

Each object takes almost 1k and we don't need it once the propagation is
done.

10 years agoPrevent the sync protocol widget from over-using memory
Jocelyn Turcotte [Fri, 17 Jun 2016 17:06:39 +0000 (19:06 +0200)]
Prevent the sync protocol widget from over-using memory

During propagation, we create a line for each file, taking memory, but
we delete all lines passed 2000 right at the beginning of the next sync.
Since the user has little chances of being able to read past those 2000
lines in the log, we might as well keep it capped at 2000 also during
propagation to prevent it from eating memory.

10 years agoFix a crash on if shutting down during propagation
Jocelyn Turcotte [Fri, 17 Jun 2016 17:04:24 +0000 (19:04 +0200)]
Fix a crash on if shutting down during propagation

The SyncRunFileLog owned by the Folder must be destroyed after the
SyncEngine since the SyncEngine will abort during destruction, resulting
in all jobs being aborted.

It's possible that this crash only happens with a debug build.

10 years agoVERSION.cmake: This is 2.2.2
Markus Goetz [Fri, 17 Jun 2016 08:31:30 +0000 (10:31 +0200)]
VERSION.cmake: This is 2.2.2

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 17 Jun 2016 06:19:00 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years agoSocketAPI: Push new status of dirty files regardless when not synced (#4970)
Jocelyn Turcotte [Thu, 16 Jun 2016 13:27:10 +0000 (15:27 +0200)]
SocketAPI: Push new status of dirty files regardless when not synced (#4970)

The FolderWatcher inserts files to be marked as SYNC and we
currently assume that all file statuses will be updated by the
following sync. It's however possible that the FolderWatcher
notify us of a change that csync won't consider necessary to
propagate, in which case a new status wouldn't be pushed and
the file manager would continue showing this file as syncing.

Re-push the file status when emptying the dirty files list
before propagating to avoid this issue, most likely the OK
status.

10 years agoChecksum speedup. (#4968)
Olivier Goffart [Thu, 16 Jun 2016 06:28:30 +0000 (08:28 +0200)]
Checksum speedup. (#4968)

No need to allocate (and initialize to 0) a 10 MiB buffer for each files, even
when most files are much smaller than that.
So make sure the buffer that we allocate is not bigger than the file size.
And Also 10 MiB is a bit big for a buffer. 500 KiB should be more than enough.
(Too big allocations can cause problem because of memory fragmentation and such)

10 years agoSyncEngine: make abort and closing more robust
Olivier Goffart [Wed, 15 Jun 2016 15:01:00 +0000 (17:01 +0200)]
SyncEngine: make abort and closing more robust

We first need to set the abort flag to csync and then aborting the discovery
job, otherwise, the discovery thread could start a new job in the mean time.

We also need to make sure that the thread has existed before we destroy the
exclude list.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 16 Jun 2016 06:18:46 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #4971 from owncloud/fixAccountHandleSslErrorsCrash
Jocelyn Turcotte [Wed, 15 Jun 2016 16:53:47 +0000 (18:53 +0200)]
Merge pull request #4971 from owncloud/fixAccountHandleSslErrorsCrash

Attempt to fix the Account::slotHandleSslErrors crash

10 years agoAttempt to fix the Account::slotHandleSslErrors crash
Jocelyn Turcotte [Wed, 15 Jun 2016 16:05:56 +0000 (18:05 +0200)]
Attempt to fix the Account::slotHandleSslErrors crash

Events from the crash reporter suggest that the QNAM and its
child replies might get deleted before returning from this method
and the only possible cause we can see is that the inner event
loop has something to do with it.

Try keeping a ref on the QNAM while in this method to make sure
that it won't get deleted by the inner event loop.

10 years agoAccount: Use smart pointers to hold its credentials and QNAM objects
Jocelyn Turcotte [Wed, 15 Jun 2016 15:57:28 +0000 (17:57 +0200)]
Account: Use smart pointers to hold its credentials and QNAM objects

Also make sure that both use QObject::deleteLater as their delete
function.

10 years agoPropagateUpload: fix crash in PUTFileJob::slotTimeout
Olivier Goffart [Wed, 15 Jun 2016 12:32:25 +0000 (14:32 +0200)]
PropagateUpload: fix crash in PUTFileJob::slotTimeout

Same fix as in commit 60c101d9

From the crash reporter:

Crash
EXCEPTION_ACCESS_VIOLATION_READ at 0x4
qnetworkreply.cpp in QNetworkReply::request at line 476
propagateupload.cpp in OCC::PUTFileJob::slotTimeout at line 100
moc_abstractnetworkjob.cpp in OCC::AbstractNetworkJob::qt_static_metacall at line 98
qobject.cpp in QMetaObject::activate at line 3716
moc_qtimer.cpp in QTimer::timeout at line 192
qtimer.cpp in QTimer::timerEvent at line 247
qobject.cpp in QObject::event at line 1267
qapplication.cpp in QApplicationPrivate::notify_helper at line 3722
qapplication.cpp in QApplication::notify at line 3505
qcoreapplication.cpp in QCoreApplication::notifyInternal at line 932

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 15 Jun 2016 06:18:44 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 14 Jun 2016 06:18:36 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years agoFix docker build instruction for windows
Olivier Goffart [Mon, 13 Jun 2016 13:30:06 +0000 (15:30 +0200)]
Fix docker build instruction for windows

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 13 Jun 2016 06:18:35 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 12 Jun 2016 06:18:35 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 11 Jun 2016 06:18:33 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 10 Jun 2016 06:18:39 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 9 Jun 2016 06:26:12 +0000 (02:26 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 8 Jun 2016 06:19:30 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #4949 from owncloud/jnweiger-tray-patch-patch-patch
Jürgen Weigert [Tue, 7 Jun 2016 13:59:53 +0000 (15:59 +0200)]
Merge pull request #4949 from owncloud/jnweiger-tray-patch-patch-patch

Update accountsettings.cpp fixing the tray-patch

10 years agoUpdate accountsettings.cpp
Jürgen Weigert [Tue, 7 Jun 2016 12:21:50 +0000 (14:21 +0200)]
Update accountsettings.cpp

10 years agoWorkaround for Ubuntu 16.04 tray issue #4944 (#4947)
ckamm [Tue, 7 Jun 2016 09:48:25 +0000 (11:48 +0200)]
Workaround for Ubuntu 16.04 tray issue #4944 (#4947)

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 7 Jun 2016 06:19:44 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 6 Jun 2016 06:19:25 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years agofix win install instructions: build path and docker image name (#4901)
Carla Schroder [Sun, 5 Jun 2016 08:56:56 +0000 (01:56 -0700)]
fix win install instructions: build path and docker image name (#4901)

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 5 Jun 2016 06:18:37 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 4 Jun 2016 06:19:18 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years agoFix compilation on windows
Olivier Goffart [Fri, 3 Jun 2016 11:28:44 +0000 (13:28 +0200)]
Fix compilation on windows

10 years agoFolder: fix removing folder with escaped characters (#4943)
Olivier Goffart [Fri, 3 Jun 2016 11:10:01 +0000 (13:10 +0200)]
Folder: fix removing folder with escaped characters (#4943)

FolderDefinition::save and load escapes the alias. We also need to escape
it when we remove it.
New folder can't be created with alias that needs escaping, but old folder
from old config may still exist, and we must allow user to delete them.

10 years agoFolder: Ignore change from the watcher if the file has not changed its mtime or size...
Olivier Goffart [Fri, 3 Jun 2016 11:06:11 +0000 (13:06 +0200)]
Folder: Ignore change from the watcher if the file has not changed its mtime or size (#4942)

For issue #4927:
On Windows 10, we get a notification after the sync is finished for file that were
just downloaded. The guard we have against our "own changes" are only working when
the sync is running and the OwncloudPropagator still alive.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 3 Jun 2016 06:19:51 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #4939 from owncloud/osx_filewatcher_fix
Daniel Molkentin [Thu, 2 Jun 2016 16:37:38 +0000 (18:37 +0200)]
Merge pull request #4939 from owncloud/osx_filewatcher_fix

OS X filewatcher fix

10 years agoOS X: White-list the folder watcher enums
Markus Goetz [Thu, 2 Jun 2016 16:12:47 +0000 (18:12 +0200)]
OS X: White-list the folder watcher enums

I got syncs triggered for even opening a file by double clicking it in Finder
and having launched Preview.app (e.g. for JPEG files).

10 years agoMerge pull request #4938 from owncloud/fix_4840
Daniel Molkentin [Thu, 2 Jun 2016 16:13:25 +0000 (18:13 +0200)]
Merge pull request #4938 from owncloud/fix_4840

GUI: don't force the environment variable for high DPI on linux.

10 years agoGUI: don't force the environment variable for high DPI on linux.
Olivier Goffart [Thu, 2 Jun 2016 15:57:10 +0000 (17:57 +0200)]
GUI: don't force the environment variable for high DPI on linux.

Setting the Environment variable only for owncloud makes in inconsistant with
other Qt application running at the same time.

The users can still set it themself for the whole desktop if they wish.

Addresses #4840

10 years agoMerge pull request #4935 from owncloud/fix_updater_memleak
Daniel Molkentin [Thu, 2 Jun 2016 13:36:49 +0000 (15:36 +0200)]
Merge pull request #4935 from owncloud/fix_updater_memleak

Fix memleak in updater

10 years agoFix memleak in updater
Daniel Molkentin [Wed, 1 Jun 2016 22:51:24 +0000 (00:51 +0200)]
Fix memleak in updater

10 years agoFix link to the binary packages in README.md
Giovanni Capuano [Thu, 2 Jun 2016 08:18:01 +0000 (10:18 +0200)]
Fix link to the binary packages in README.md

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 2 Jun 2016 06:19:35 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 1 Jun 2016 06:19:17 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years agoQNAM: Try to workaround missing Qt patches #4720 #3888 #4051
Markus Goetz [Tue, 31 May 2016 08:20:29 +0000 (10:20 +0200)]
QNAM: Try to workaround missing Qt patches #4720 #3888 #4051

We try this on all platforms now so we have more consistent behaviour.

10 years agoSearch results are filtered by server. Don't filter a second time.
Stephen Colebrook [Wed, 25 May 2016 22:52:33 +0000 (18:52 -0400)]
Search results are filtered by server. Don't filter a second time.

Also allows searching on attributes other than displayname in ldap
configurations. Search results match web and mobile apps.

10 years agoConnectivity: Reduce ETag job timeout to 60 sec #4275
Markus Goetz [Tue, 31 May 2016 07:35:04 +0000 (09:35 +0200)]
Connectivity: Reduce ETag job timeout to 60 sec #4275

Before it used the default job timeout

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 31 May 2016 06:20:28 +0000 (02:20 -0400)]
[tx-robot] updated from transifex

10 years agoConnectivity: Delete job on timeout #4275
Markus Goetz [Mon, 30 May 2016 16:15:41 +0000 (18:15 +0200)]
Connectivity: Delete job on timeout #4275

This was not done if there was no reply

10 years agoUpdate changelog for 2.2.1
Klaas Freitag [Mon, 30 May 2016 15:19:40 +0000 (17:19 +0200)]
Update changelog for 2.2.1

10 years ago Remove stray file
Daniel Molkentin [Mon, 30 May 2016 10:05:22 +0000 (12:05 +0200)]
  Remove stray file

10 years agoMerge pull request #4923 from RobinGeuze/2.2
Daniel Molkentin [Mon, 30 May 2016 09:50:50 +0000 (11:50 +0200)]
Merge pull request #4923 from RobinGeuze/2.2

Fix Qt4 build

10 years agoFix Qt4 build
Robin Geuze [Mon, 30 May 2016 07:55:45 +0000 (09:55 +0200)]
Fix Qt4 build

10 years agoMerge pull request #4922 from owncloud/fix_4840
Daniel Molkentin [Mon, 30 May 2016 07:20:50 +0000 (09:20 +0200)]
Merge pull request #4922 from owncloud/fix_4840

Don't try to determine pixel ratio with Qt < 5.6.0

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 30 May 2016 06:41:51 +0000 (02:41 -0400)]
[tx-robot] updated from transifex

10 years agoDon't try to determine pixel ratio with Qt < 5.6.0
Daniel Molkentin [Mon, 30 May 2016 04:55:31 +0000 (06:55 +0200)]
Don't try to determine pixel ratio with Qt < 5.6.0

This seems to be broken. Worst case users can still
set it manually

Addresses #4840

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 29 May 2016 06:18:52 +0000 (02:18 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 28 May 2016 06:19:09 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #4913 from owncloud/normalize_name_in_filestatus
Daniel Molkentin [Fri, 27 May 2016 16:08:08 +0000 (18:08 +0200)]
Merge pull request #4913 from owncloud/normalize_name_in_filestatus

Undo regression caused by 727e73d

10 years agoUndo regression caused by 727e73d
Daniel Molkentin [Fri, 27 May 2016 14:03:59 +0000 (16:03 +0200)]
Undo regression caused by 727e73d

normalization to NFC is still required. Mac OS API will not take
care of that by default.

Resolves #4884

10 years agoCerts: Re-ask for different cert after rejection #4898 (#4911)
ckamm [Fri, 27 May 2016 10:08:42 +0000 (12:08 +0200)]
Certs: Re-ask for different cert after rejection #4898 (#4911)

Previously rejecting any kind of certificate meant that the user
was never asked again, even if the certificate changed.

Now we keep track of which certificates were rejected and ask again
if the ones mentioned in the ssl errors change.

mitmproxy is excellent for testing this.

10 years agoProgress: Don't count items without propagation jobs #4856 (#4910)
ckamm [Fri, 27 May 2016 08:52:00 +0000 (10:52 +0200)]
Progress: Don't count items without propagation jobs #4856 (#4910)

* Progress: Don't count dirs without propagation jobs #4856

These directory SyncFileItems are necessary for bookkeeping
but should not influence the progress display at all.

* Progress: Skip ignored files #4856

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 27 May 2016 06:19:21 +0000 (02:19 -0400)]
[tx-robot] updated from transifex

10 years agoUtility: Better fix for the translation of minutes, seconds, ...
Olivier Goffart [Thu, 26 May 2016 10:15:53 +0000 (12:15 +0200)]
Utility: Better fix for the translation of minutes, seconds, ...

The plural was not translated because of QTBUG-3945. Work around it.
Issue #4855

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 26 May 2016 06:33:30 +0000 (02:33 -0400)]
[tx-robot] updated from transifex

10 years agoSyncEngine: cleanup setting isDirectory
Olivier Goffart [Tue, 24 May 2016 13:17:35 +0000 (15:17 +0200)]
SyncEngine: cleanup setting isDirectory