chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-17 16:42:44 +01:00
Code
16,676 Commits 4 Branches 173 Tags 91 MiB
v3.3.0-rc2
Commit Graph

16676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jocelyn Turcotte
b307f2b65c Revert "Fix a deadlock when shutting down during discovery" (#5100) 
Reverts commit 622017adcf

Could be the cause of #5092 and the cost is higher than the benefit if this is the case.
A network request taking more than 30 seconds isn't something unlikely in this world
and shouldn't be a good reason to abort. We should try to untangle the threads
dependencies to properly fix this if possible instead.
 2016-08-03 16:35:24 +02:00
Jenkins for ownCloud
6c94d56b53 [tx-robot] updated from transifex 2016-08-03 02:18:37 +02:00
Olivier Goffart
73a6939b70 ownsql: handle QByteArray without converting to QString (#5097) 
QByteArray is used for checksum
 2016-08-02 11:39:08 +02:00
Olivier Goffart
88e5a9411a SyncEngine: Reads the data-fingerprint property (#5056) 
When it changes, assume a backup was recovered, and keep conflict files.

Issues: #2325 and https://github.com/owncloud/enterprise/issues/966
 2016-08-02 10:30:49 +02:00
Jenkins for ownCloud
c51a80bffa [tx-robot] updated from transifex 2016-08-02 02:18:35 +02:00
Thomas Müller
87f4f70abb Merge pull request #5069 from owncloud/Jenkinsfile-2.2 
[2.2] Add Jenkinsfile (#5041)
 2016-08-01 12:41:04 +02:00
Olivier Goffart
19a52b9e6b Qt4: don't require a X server in the tests 
Issue #5069

(cherry picked from commit 927a8b5071 and
a4310f0f5c)
 2016-08-01 11:57:21 +02:00
Jenkins for ownCloud
4ea70ebd18 [tx-robot] updated from transifex 2016-08-01 02:48:18 +02:00
Jenkins for ownCloud
d58c392d93 [tx-robot] updated from transifex 2016-08-01 01:16:19 +02:00
Jenkins for ownCloud
b9a6970282 [tx-robot] updated from transifex 2016-07-31 02:50:05 +02:00
Jenkins for ownCloud
a58ef9c586 [tx-robot] updated from transifex 2016-07-30 02:39:29 +02:00
Thomas Müller
cef24da44c
Add Jenkinsfile (#5041) 2016-07-29 08:48:28 +02:00
Jenkins for ownCloud
23c7f10b79 [tx-robot] updated from transifex 2016-07-29 02:18:35 +02:00
Klaas Freitag
5ac434a740 Logs: Add the name of the platform we're running on to the log. (#5082) 2016-07-28 16:30:40 +02:00
Jenkins for ownCloud
9e514d6cc7 [tx-robot] updated from transifex 2016-07-28 02:18:39 +02:00
Jenkins for ownCloud
4d109e43fa [tx-robot] updated from transifex 2016-07-27 02:18:42 +02:00
Daniel Molkentin
b575ded464 More GmbH -> Inc Copyright header fixes 2016-07-26 16:53:11 +02:00
Daniel Molkentin
a83c5598e8 Update owner to be ownCloud GmbH 
Fixes #5079
 2016-07-26 16:48:08 +02:00
Jocelyn Turcotte
03a90bf03f shell/windows: Build 43, add missing 32 bit binaries 
Also include a minor change from #5025
 2016-07-26 14:54:27 +02:00
Jocelyn Turcotte
ff7b2381e9 shell/windows: Add missing Win32 configuration changes 
The changes in build location were only done on the x64 configuration.
 2016-07-26 14:53:14 +02:00
Markus Goetz
24cd8041a8 ChangeLog for 2.2.3 2016-07-26 12:14:00 +02:00
Jenkins for ownCloud
3eaadfe52f [tx-robot] updated from transifex 2016-07-26 02:43:40 +02:00
Klaas Freitag
ebcec44202 ShibbolethView: Open a debug windows that shows cipher info. (#5080) 
It opens a window and connects to a cipher test
page, showing the output from there, that helps for debugging.

The window is enabled by setting the environment variable
OWNCLOUD_SHIBBOLETH_DEBUG
 2016-07-25 17:47:23 +02:00
Jenkins for ownCloud
7b0b7fde51 [tx-robot] updated from transifex 2016-07-25 02:18:34 +02:00
Jenkins for ownCloud
fa9ec12ae7 [tx-robot] updated from transifex 2016-07-24 02:18:36 +02:00
Jenkins for ownCloud
54aa4dce46 [tx-robot] updated from transifex 2016-07-23 02:18:47 +02:00
Jenkins for ownCloud
7c19f748b7 [tx-robot] updated from transifex 2016-07-22 02:18:44 +02:00
Jenkins for ownCloud
5aa82944a4 [tx-robot] updated from transifex 2016-07-21 02:18:38 +02:00
Jenkins for ownCloud
0d9cf26890 [tx-robot] updated from transifex 2016-07-20 08:18:40 +02:00
Christian Kamm
eadecc5802 Excludes: Fix a Windows specific bug #5039 
It meant that almost nothing was being excluded.

Broken since 87b4693a9d
 2016-07-19 15:38:57 +02:00
Christian Kamm
39bde6f3e4 Revert "Add 'open in browser' to account menu #4824" 
This reverts commit 3c575a2f37.

One can already open the account in the browser by clicking the
link in the settings dialog!
 2016-07-19 11:19:40 +02:00
Jenkins for ownCloud
a4837e9291 [tx-robot] updated from transifex 2016-07-19 08:18:37 +02:00
Jenkins for ownCloud
5672557a84 [tx-robot] updated from transifex 2016-07-18 09:29:56 +02:00
Jenkins for ownCloud
0b31f2601d [tx-robot] updated from transifex 2016-07-18 08:18:44 +02:00
Klaas Freitag
f3cfd2b70b csync: Free statedb file member before realloc 2016-07-17 21:13:17 +02:00
Klaas Freitag
78caa1a712 Fix tests for syncjournaldb 2016-07-17 21:10:07 +02:00
Jenkins for ownCloud
a5850d4515 [tx-robot] updated from transifex 2016-07-17 08:18:34 +02:00
Jenkins for ownCloud
c39eb315dd [tx-robot] updated from transifex 2016-07-16 08:18:34 +02:00
Jenkins for ownCloud
6c8e88e2ed [tx-robot] updated from transifex 2016-07-15 08:18:36 +02:00
Olivier Goffart
3465024898 CleanupPollsJob: Fix possible leak 
Missing deleteLater when the CleanupPollsJob aborts.
This is only a problem if the SyncEngine is kept alive a long time. Which is
usually not the case in the configuration where poll jobs are used.
 2016-07-14 09:23:22 +02:00
Jenkins for ownCloud
eeea255104 [tx-robot] updated from transifex 2016-07-14 08:18:43 +02:00
Jenkins for ownCloud
8e2af57b57 [tx-robot] updated from transifex 2016-07-13 02:18:41 -04:00
Olivier Goffart
7c671756e6 Merge remote-tracking branch 'origin/2.2' 
Conflicts:
	src/libsync/syncfilestatustracker.cpp
 2016-07-12 17:38:15 +02:00
Olivier Goffart
f3f387c36b Merge pull request #5016 from owncloud/overrideurl 
AccountManager: Don't force the server URL while loading the config.
 2016-07-12 14:33:28 +02:00
Olivier Goffart
b53ce78eb6 Merge pull request #5025 from ArthurChiao/bugfix_#5015 
fix #5015 overlay icon not show: compare folder paths with no case-se…
 2016-07-12 14:32:54 +02:00
Markus Goetz
0c6788f03d conffile.rst #5052 2016-07-12 14:29:05 +02:00
ckamm
bc4753e938 Sharing: Fix bug with file names containing percent encodes #5042 (#5043) 2016-07-12 14:25:33 +02:00
Thomas Müller
6bd4de19a8 Add Jenkinsfile (#5041) 2016-07-12 13:24:35 +02:00
Olivier Goffart
927a8b5071 Qt4: don't require a X server in the tests 
Previous commit was not enough
 2016-07-12 11:07:12 +02:00
Jenkins for ownCloud
aefbca0787 [tx-robot] updated from transifex 2016-07-12 02:18:39 -04:00