Olivier Goffart
|
7ae6712d56
|
Add a few Q_DECL_OVERRIDE
|
2014-11-08 11:21:48 +01:00 |
|
Olivier Goffart
|
98a283b4ec
|
Fix clang warnings
|
2014-11-08 11:21:48 +01:00 |
|
Olivier Goffart
|
d524f6b395
|
Fix compilation errors after merge
|
2014-11-08 11:11:05 +01:00 |
|
Olivier Goffart
|
6b716683e2
|
Merge the long PUT Poll URL feature with the new sql backend
|
2014-11-08 11:09:50 +01:00 |
|
Olivier Goffart
|
ba2c33af0b
|
Fix the il branch merge: Move the bandwidthmanager to libsync
|
2014-11-08 10:52:14 +01:00 |
|
Olivier Goffart
|
de11f602d5
|
Merge remote-tracking branch 'origin/il'
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
|
2014-11-08 10:48:36 +01:00 |
|
Jenkins for ownCloud
|
b8cb180e4b
|
[tx-robot] updated from transifex
|
2014-11-08 01:25:22 -05:00 |
|
Volkan Gezer
|
260c8e0227
|
fix typo
|
2014-11-07 17:51:15 +01:00 |
|
Daniel Molkentin
|
e579504181
|
Merge pull request #2370 from owncloud/icons-overlay-doc
Add section on Overlay Icons to 'Using the Synchronization Client'
|
2014-11-07 16:52:26 +01:00 |
|
Daniel Molkentin
|
7c034b427e
|
Handle invalid handle & fix an issue found during code review
|
2014-11-07 14:52:31 +01:00 |
|
Jenkins for ownCloud
|
08868594ae
|
[tx-robot] updated from transifex
|
2014-11-07 01:25:32 -05:00 |
|
Daniel Molkentin
|
f25d175b5d
|
Merge remote-tracking branch 'origin/1.7'
|
2014-11-06 19:54:20 +01:00 |
|
Daniel Molkentin
|
cc6e548a78
|
Merge pull request #2419 from owncloud/updater
Update and correct doc/autoupdate.rst
|
2014-11-06 19:53:33 +01:00 |
|
Daniel Molkentin
|
17a4299f74
|
Fix nautilus python integration
|
2014-11-06 19:26:43 +01:00 |
|
Daniel Molkentin
|
776f4dc316
|
v1.7.0
|
2014-11-06 15:53:17 +01:00 |
|
Daniel Molkentin
|
5db55d9e29
|
Prettify Changelog
|
2014-11-06 15:41:23 +01:00 |
|
Christian Kamm
|
5c9564ac08
|
Add to 1.7 changelog.
|
2014-11-06 15:31:09 +01:00 |
|
Daniel Molkentin
|
5c5a89c1a4
|
Revert "Bump binary directory to current master"
This reverts commit af4e9c30f5.
This is consistent with 176413d312.
|
2014-11-06 15:21:39 +01:00 |
|
Daniel Molkentin
|
176413d312
|
Revert "Windows Shell Integration: Show status icon for root folder"
This reverts commit 5805ffebec.
There is no good way to fix this on the Mirall side without risk.
Delay until after 1.7.0
|
2014-11-06 15:18:54 +01:00 |
|
Olivier Goffart
|
b70ecc3dd3
|
Never overwrite the mtime from the local file system in the db when updating the metadata
Attempt to fix #2431
|
2014-11-06 15:13:10 +01:00 |
|
Daniel Molkentin
|
89670e5ce4
|
Folderwatcher_win: handle conversion error
|
2014-11-06 12:54:33 +01:00 |
|
Christian Kamm
|
174e1acbc7
|
Folder::wipe(): Remove partial downloads and -shm,-wal db files.
|
2014-11-06 12:49:02 +01:00 |
|
Christian Kamm
|
1f09a24a72
|
Resync button: Remove partial downloads too. #2445
|
2014-11-06 12:17:04 +01:00 |
|
Christian Kamm
|
eed91ddf46
|
Legacy propagator: Don't use mtime retrieved via _fstat64.
May be the cause of #2431
|
2014-11-06 12:16:55 +01:00 |
|
Daniel Molkentin
|
96a7118d05
|
WiP: switch to ReadDirectoryChangesW
|
2014-11-06 12:04:33 +01:00 |
|
Klaas Freitag
|
6eec896282
|
FolderWatcher: Check for hidden outside of loop
|
2014-11-06 09:23:30 +01:00 |
|
Klaas Freitag
|
a78bb252de
|
Nautilus shell: Remove some useless logging.
|
2014-11-06 09:23:30 +01:00 |
|
Jenkins for ownCloud
|
0ba07f19f7
|
[tx-robot] updated from transifex
|
2014-11-06 01:25:24 -05:00 |
|
Christian Kamm
|
a49a6bfd88
|
Logging: Report setModTime failures.
Ths may be helpful for #2252 and maybe even #2431.
|
2014-11-05 13:20:19 +01:00 |
|
Christian Kamm
|
b87931c0a9
|
Logging: Print etags, not just result of comparison.
|
2014-11-05 13:08:53 +01:00 |
|
Christian Kamm
|
9b640d586b
|
Wizard: Fix local folder warning in advanced setup wizard. #2362
The _oldLocalFolder should always be the previously configured
folder, not the one that was most recently chosen on the wizard
page.
|
2014-11-05 12:10:41 +01:00 |
|
Christian Kamm
|
7440ffc0e6
|
Download: Fix data loss when rename fails. #2428
|
2014-11-05 11:00:46 +01:00 |
|
Jenkins for ownCloud
|
63e901cd0b
|
[tx-robot] updated from transifex
|
2014-11-05 01:25:23 -05:00 |
|
Daniel Molkentin
|
af4e9c30f5
|
Bump binary directory to current master
|
2014-11-04 09:33:04 +01:00 |
|
Daniel Molkentin
|
5805ffebec
|
Windows Shell Integration: Show status icon for root folder
|
2014-11-04 09:30:29 +01:00 |
|
Jenkins for ownCloud
|
39bfacf1d5
|
[tx-robot] updated from transifex
|
2014-11-04 01:25:23 -05:00 |
|
Daniel Molkentin
|
8d30fc2718
|
Update binary subrepo to master
|
2014-11-03 22:51:55 +01:00 |
|
Daniel Molkentin
|
19daff36b0
|
Windows Overlay: Fix icon refresh
The condition for the refresh was inverse of what it should have been.
|
2014-11-03 20:46:35 +01:00 |
|
Daniel Molkentin
|
c34c8ff358
|
Windows Overlay: Use FLUSHNOW everywhere to speed up updates
|
2014-11-03 20:45:38 +01:00 |
|
Daniel Molkentin
|
af68cb6029
|
Move binary submodule to current master
|
2014-11-03 11:17:04 +01:00 |
|
Jenkins for ownCloud
|
6b6b212643
|
[tx-robot] updated from transifex
|
2014-11-03 01:25:21 -05:00 |
|
Jenkins for ownCloud
|
dd2a71fa8f
|
[tx-robot] updated from transifex
|
2014-11-02 01:25:21 -04:00 |
|
Jenkins for ownCloud
|
cd72d133a3
|
[tx-robot] updated from transifex
|
2014-11-01 01:25:22 -04:00 |
|
Jenkins for ownCloud
|
d3662d0e34
|
[tx-robot] updated from transifex
|
2014-10-31 01:25:27 -04:00 |
|
Markus Goetz
|
cf6219bb6f
|
NetworkJobs: Improve timeout handling and increase timeout by 5 sec
|
2014-10-30 11:54:58 +01:00 |
|
Christian Kamm
|
45eeb5065f
|
Download: Avoid overwriting file with case conflict. #1914
|
2014-10-30 09:06:53 +01:00 |
|
Jenkins for ownCloud
|
f563eb1f63
|
[tx-robot] updated from transifex
|
2014-10-30 01:25:30 -04:00 |
|
Carla Schroder
|
2c1f31cecb
|
Update autoupdate.rst
Corrected configuration file location
|
2014-10-29 09:56:17 -07:00 |
|
Klaas Freitag
|
ef16c409ef
|
Merge pull request #2393 from svkurowski/issue-2215
Switch monochrome systray icon color depending on systray brightness
|
2014-10-29 14:54:33 +01:00 |
|
Klaas Freitag
|
1029f9521c
|
tests: exit t5.pl if running against ownCloud 6
t5.pl checks the environment variable SERVER_VERSION and if that equals
"owncloud6" it bails out after a check of the sharing ocs api.
|
2014-10-29 14:24:36 +01:00 |
|