Thomas Müller
94c9a2cca1
Jenkinsfile: Add win32 build ( #5091 )
2016-08-09 15:06:17 +02:00
Jenkins for ownCloud
3187a22300
[tx-robot] updated from transifex
2016-08-09 02:18:41 +02:00
Markus Goetz
9626021a63
Update ChangeLog for 2.2.3 final
2016-08-08 15:39:49 +02:00
Jenkins for ownCloud
b72a19ad64
[tx-robot] updated from transifex
2016-08-08 02:18:35 +02:00
Markus Goetz
2ae37c6beb
Update ChangeLog
2016-08-07 22:51:16 +02:00
Jenkins for ownCloud
f8f376ac03
[tx-robot] updated from transifex
2016-08-07 02:18:30 +02:00
Jenkins for ownCloud
632d231435
[tx-robot] updated from transifex
2016-08-06 02:18:34 +02:00
Markus Goetz
fc868d89f3
Merge pull request #5108 from owncloud/limit_library_path
...
Limit Qt and OpenSSL Library pathes to the install directory
2016-08-05 16:39:04 +02:00
Daniel Molkentin
5a57e4a7a6
Ensure OpenSSL config file is only read from app dir
2016-08-05 16:38:08 +02:00
Jenkins for ownCloud
70a1671dc1
[tx-robot] updated from transifex
2016-08-05 14:23:25 +02:00
Daniel Molkentin
7de70516f1
Fix module loading
2016-08-05 12:35:52 +02:00
Jenkins for ownCloud
50bd4b8f4f
[tx-robot] updated from transifex
2016-08-05 02:18:30 +02:00
Olivier Goffart
4a7f3cb486
SyncEngine: Fix detection of backup ( #5104 )
...
Once upon a time, the SyncEngine was instantiated once per sync. But now that
the SyncEngine is kept between sync, we need to reset all these variable between
syncs.
2016-08-04 16:06:10 +02:00
Jenkins for ownCloud
b7663d00b9
[tx-robot] updated from transifex
2016-08-04 02:18:35 +02:00
Jocelyn Turcotte
b307f2b65c
Revert "Fix a deadlock when shutting down during discovery" ( #5100 )
...
Reverts commit 622017adcf#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 927a8b5071a4310f0f5c
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
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
