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
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
Olivier Goffart
a4310f0f5c
Qt4: don't require a X server in the tests
2016-07-11 14:04:58 +02:00
Olivier Goffart
cb64ba22b3
Fix Qt4 build
2016-07-11 12:27:59 +02:00
Jenkins for ownCloud
653b42216f
[tx-robot] updated from transifex
2016-07-11 02:18:33 -04:00
Klaas Freitag
0884ad6517
owncloudcmd: Adopt to new syncJournalDb MD5 based name schema.
2016-07-10 13:05:09 +02:00
Klaas Freitag
37fc4e4332
SyncJournalDb: Cleanup of Constructor interface.
...
The parameter path is not longer needed.
2016-07-10 13:04:29 +02:00
Klaas Freitag
9cc90159f1
FolderMan: ensureJournalGone needs to know the exact journal name, WIP
2016-07-10 12:57:35 +02:00
Klaas Freitag
4ceee86c66
SyncEngine: Calculate a uniq journal name using the remote account.
...
That should allow to sync the same local folder to multiple remote destinations.
see #3764
2016-07-10 12:56:43 +02:00
Klaas Freitag
b9ea7c3414
csync: Do not compute the journal name in csync_update any more.
...
Rely on the name that was passed to csync_init()
2016-07-10 12:54:33 +02:00
Klaas Freitag
3033e693be
Folder: For wipe reuse the journal name from SyncEngine.
...
Do not compute on its own any more.
2016-07-10 12:52:47 +02:00
Klaas Freitag
a1bc01d3b1
SyncJournalDb: Add a method to set the name of the db file.
2016-07-10 12:51:42 +02:00
Jenkins for ownCloud
3ec9cd1d9e
[tx-robot] updated from transifex
2016-07-10 02:18:47 -04:00
Jenkins for ownCloud
b21e3e0fdc
[tx-robot] updated from transifex
2016-07-10 01:15:58 -04:00
Jenkins for ownCloud
20d0c835b6
[tx-robot] updated from transifex
2016-07-09 02:18:51 -04:00
arthurchiao
3335c733d7
be case insensitive for MacOSX, too
2016-07-08 15:53:11 +08:00
arthurchiao
4da55b69df
ignore case-sensitivity only on windows
2016-07-08 15:12:37 +08:00
Jenkins for ownCloud
b7085987b8
[tx-robot] updated from transifex
2016-07-08 02:18:52 -04:00
Jenkins for ownCloud
a1b44cd82a
[tx-robot] updated from transifex
2016-07-07 02:18:42 -04:00
ckamm
11b44358f6
Windows: Skip symlinks and junctions again #5019 ( #5036 )
...
Fixes an accidental behavior change introduced in
055c2ef73f#4056 and owncloud/enterprise#1225 .
2016-07-07 08:07:19 +02:00
Jenkins for ownCloud
4979181e85
[tx-robot] updated from transifex
2016-07-07 01:15:57 -04:00
Jenkins for ownCloud
651cc25e3f
[tx-robot] updated from transifex
2016-07-06 02:19:04 -04:00
Christian Kamm
699d1ba13b
owncloudcmd: Make source_dir absolute #5035
...
Fixes a problem with relative paths on Windows.
2016-07-05 15:40:32 +02:00
Christian Kamm
3c575a2f37
Add 'open in browser' to account menu #4824
2016-07-05 14:48:51 +02:00
Christian Kamm
bd7ec19644
Set discovery thread priority to low #5017
2016-07-05 13:53:57 +02:00
Daniel Molkentin
a338b9f269
Merge pull request #5034 from owncloud/fix-5033
...
Only accept notification API Capability if endpoint is OCS-enabled
2016-07-05 12:46:20 +02:00
Jenkins for ownCloud
81ff4e02c5
[tx-robot] updated from transifex
2016-07-05 02:18:32 -04:00
Daniel Molkentin
8a1a2eb5b3
Only accept notification API Capability if endpoint is OCS-enabled
...
Fixes #5033
2016-07-04 18:33:02 +02:00
Jenkins for ownCloud
0c646b974f
[tx-robot] updated from transifex
2016-07-04 02:18:34 -04:00
Jenkins for ownCloud
e661bf2324
[tx-robot] updated from transifex
2016-07-03 02:18:29 -04:00
Jenkins for ownCloud
2abb5c95bb
[tx-robot] updated from transifex
2016-07-02 02:19:18 -04:00
Jenkins for ownCloud
c3ef1a996f
[tx-robot] updated from transifex
2016-07-01 02:18:37 -04:00
