Commit graph

6618 commits

Author SHA1 Message Date
Christian Kamm
3e3ca14b4c Print ssl library version only on Qt >=5.0.0. 2014-11-20 13:46:44 +01:00
Christian Kamm
d4e0941c27 Windows filewatcher: switch to ReadDirectoryChangesW.
Based on danimo's #2454 fix for #2455 and related to #2297.
2014-11-20 12:36:17 +01:00
Christian Kamm
9dc57359b9 csync db files: Hide after some commit/transactions. #2461
The shm and wal files are only created later.
2014-11-20 12:30:04 +01:00
Jenkins for ownCloud
06b31d7cf0 [tx-robot] updated from transifex 2014-11-20 01:25:20 -05:00
Christian Kamm
421a8cc6b7 Windows: Make unit tests compile. 2014-11-19 14:18:37 +01:00
Christian Kamm
3a448fda91 Windows mingw32: Fix finding of windres binary. 2014-11-19 14:16:56 +01:00
Markus Goetz
e890c4ae1b OS X: Move previous fix to proper location 2014-11-17 18:30:32 +01:00
Markus Goetz
7ada625161 OS X: Fix packages file 2014-11-17 17:48:29 +01:00
Olivier Goffart
7d8dd54b19 Merge pull request #2504 from owncloud/revert-2454-fswatcher_readdirectorychanges_port
Revert "WiP: switch to ReadDirectoryChangesW"
2014-11-17 11:11:39 +01:00
Olivier Goffart
0b275c4933 Revert "WiP: switch to ReadDirectoryChangesW" 2014-11-17 11:11:13 +01:00
Olivier Goffart
e529bbed90 Merge pull request #2454 from owncloud/fswatcher_readdirectorychanges_port
switch to ReadDirectoryChangesW
2014-11-17 09:43:29 +01:00
Jenkins for ownCloud
39e97779ec [tx-robot] updated from transifex 2014-11-17 01:25:22 -05:00
Jenkins for ownCloud
629d46ca25 [tx-robot] updated from transifex 2014-11-16 01:25:22 -05:00
Daniel Molkentin
c5a35ad56f Merge pull request #2499 from owncloud/revert-2412-nsis_shortcuts_all_users
Revert "Install shortcuts for all users"
2014-11-15 21:05:05 +01:00
Daniel Molkentin
1e94161ec1 Revert "Install shortcuts for all users" 2014-11-15 21:04:33 +01:00
Daniel Molkentin
6f78ff200c Merge pull request #2412 from owncloud/nsis_shortcuts_all_users
Install shortcuts for all users
2014-11-15 20:09:29 +01:00
Daniel Molkentin
02e96484a8 Install shortcuts for all users 2014-11-15 17:07:39 +01:00
Jenkins for ownCloud
67b0e4dd15 [tx-robot] updated from transifex 2014-11-15 01:25:23 -05:00
Markus Goetz
5b7ec19778 SyncEngine: Also output the neon version 2014-11-14 15:02:09 +01:00
Jenkins for ownCloud
e71c617bfd [tx-robot] updated from transifex 2014-11-14 01:25:20 -05:00
Jenkins for ownCloud
f1432992d3 [tx-robot] updated from transifex 2014-11-13 01:25:30 -05:00
Markus Goetz
348b7bf4eb SyncEngine: Output versions used 2014-11-12 09:21:37 +01:00
Markus Goetz
30479cc5a2 Wizard: Properly show error message 2014-11-12 09:21:37 +01:00
Jenkins for ownCloud
1ba1bdec2d [tx-robot] updated from transifex 2014-11-12 01:25:29 -05:00
Daniel Molkentin
8993af4378 Bump version in readme 2014-11-12 00:32:28 +01:00
Daniel Molkentin
9a58d0e559 Merge pull request #2469 from owncloud/fixing_indent
Fixing indent and make nautilus script python3 compatible.
2014-11-12 00:08:46 +01:00
Olivier Goffart
b04cb23ed5 t8.pl: fix the test for me
On localhost, the other file (the bigger one) was downloaded first
2014-11-11 16:38:20 +01:00
Jenkins for ownCloud
ced986e010 [tx-robot] updated from transifex 2014-11-11 01:25:22 -05:00
Jenkins for ownCloud
cde9b3ac85 [tx-robot] updated from transifex 2014-11-10 01:25:22 -05:00
hefee
f9dfdd58df Fixing indent and make nautilus script python3 compatible. 2014-11-09 16:59:01 +01:00
Jenkins for ownCloud
c9f9388ef6 [tx-robot] updated from transifex 2014-11-09 01:25:21 -05:00
Jenkins for ownCloud
b8cb180e4b [tx-robot] updated from transifex 2014-11-08 01:25:22 -05: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
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