Klaas Freitag
82cd79c004
Add unify defines to header.
2013-10-01 13:58:00 +02:00
Klaas Freitag
74983af3b4
Make evaluateSync public, review pls.
2013-10-01 13:58:00 +02:00
Klaas Freitag
f5bcb11fe9
Add connected server to error message.
2013-10-01 13:58:00 +02:00
Klaas Freitag
f6f1c638a5
Allow Constructor to be public, for synclibrary
2013-10-01 13:58:00 +02:00
Klaas Freitag
ef9f0edd61
Ignore all csync journal files right at beginning.
2013-10-01 13:18:36 +02:00
Klaas Freitag
0c2f9177d1
For silently ignored files return immediately.
2013-10-01 13:18:06 +02:00
Daniel Molkentin
e250672e4a
CMake: libhttplib -> httplib
2013-09-30 23:16:04 +02:00
Jenkins for ownCloud
13093f5de3
[tx-robot] updated from transifex
2013-09-30 09:04:25 -04:00
Daniel Molkentin
9b62104f30
Add Folder column to Details sync protocol
...
Also fixes padding
Fixes #1037
2013-09-30 14:12:59 +02:00
Daniel Molkentin
df36ebf308
Merge branch '1.4'
...
Conflicts:
VERSION.cmake
2013-09-30 13:34:10 +02:00
Jenkins for ownCloud
0d0c6a15fb
[tx-robot] updated from transifex
2013-09-28 23:02:52 -04:00
Daniel Molkentin
86e42a9cf0
Fix possible endless loop in inotify
...
Fixes #1041
2013-09-27 20:10:12 +02:00
Jenkins for ownCloud
b4911cc5ce
[tx-robot] updated from transifex
2013-09-26 23:55:07 -04:00
Klaas Freitag
bae3838513
Nicer name for HTTP header for mtime.
2013-09-26 15:07:06 +02:00
Klaas Freitag
f3acf2447c
Remove duplicated code from merge.
2013-09-26 15:03:35 +02:00
Klaas Freitag
3e31d86596
Add missing trailing semicolon as nagged by rpmlint.
2013-09-26 11:13:19 +02:00
Klaas Freitag
8f1e318cde
Set version to 0.90.2
2013-09-26 10:30:36 +02:00
Klaas Freitag
532bc450fb
Added changelog entry.
2013-09-26 10:30:03 +02:00
Klaas Freitag
ab007e2bb2
Set version to 1.4.1
2013-09-26 10:29:14 +02:00
Klaas Freitag
de9dcbd231
Transmit the new mtime of the file with the PUT request.
...
If the server supports it already, we can save another request by
sending the mtime as a header value in the PUT request and check the
servers reply for a acknoledge header.
2013-09-25 14:26:13 +02:00
Klaas Freitag
8d14286bd3
Merge dav and transmit the mtime with the PUT request
2013-09-25 14:23:04 +02:00
Klaas Freitag
f1b4a7a0ae
Disable comparison of local inode values for the win32 platform.
...
Bug owncloud/mirall#779 reports about continous upload of files
even though nothing has changed. Logfiles show the fact that the
inode on windows is not reliable for this. Disabled as a result
to fix bug #779 .
2013-09-25 11:39:06 +02:00
Klaas Freitag
33d55c0757
Remove unused commented code.
2013-09-25 11:34:50 +02:00
Jenkins for ownCloud
00fff7f793
[tx-robot] updated from transifex
2013-09-24 11:58:13 -04:00
Klaas Freitag
5cf13dfa32
Make logging work again.
2013-09-24 15:56:03 +02:00
Klaas Freitag
27b9a5aed9
Merge branch '1.4', brings in the changes we did for 1.4.1
2013-09-24 14:18:25 +02:00
Klaas Freitag
c45d55b94b
Create a rc2.
2013-09-24 12:45:45 +02:00
Klaas Freitag
7048bd8cc9
Handle app icon names properly.
2013-09-24 12:19:29 +02:00
Klaas Freitag
cae6ca987f
Revert "Fix application shortname for proper icon"
...
We must not change the app short name for ownCloud. Too dangerous as it
is used all over.
This reverts commit 65171cfb3a
2013-09-24 11:48:19 +02:00
Klaas Freitag
65171cfb3a
Fix application shortname for proper icon
2013-09-23 18:23:21 +02:00
Klaas Freitag
740f0091f2
Updated version to 0.90.1
2013-09-23 16:37:31 +02:00
Klaas Freitag
ed636ffc9c
Added Changelog entries.
2013-09-23 16:37:18 +02:00
Klaas Freitag
7ec636aeb6
Added changelog entries.
2013-09-23 16:36:49 +02:00
Klaas Freitag
c96980a57d
Set version to 1.4.1rc1
2013-09-23 16:36:36 +02:00
Klaas Freitag
0959ceeff2
Disable delete of folder object temparily.
2013-09-23 15:10:42 +02:00
Klaas Freitag
1988c9d8c4
Do complete sync if network was disconnected.
...
This fixes owncloud/mirall#1007
2013-09-23 15:10:42 +02:00
Klaas Freitag
1eaa1e47fe
Be more careful with items in model when deleting rows.
2013-09-23 15:10:42 +02:00
Klaas Freitag
31923b314e
Removed left over stuff from refactoring.
2013-09-23 15:10:42 +02:00
Klaas Freitag
ee840b62e5
Fix syncEnable in folder and folderman.
2013-09-23 15:10:42 +02:00
Jenkins for ownCloud
4de99d2540
[tx-robot] updated from transifex
2013-09-22 11:52:39 -04:00
Daniel Molkentin
363efaa408
Theming build fix: Icons need shortname
2013-09-20 23:09:41 +02:00
Jenkins for ownCloud
5b60522e5e
[tx-robot] updated from transifex
2013-09-20 09:44:46 -04:00
Daniel Molkentin
b0beeea95f
More fixes related to object destruction on exit
...
- _logBrowser is not delete on close, call deleteLater
- move writing geometry out of dtor.
- _folderWizard was unused, remove it and all related noops
Hopefully solves #945
2013-09-20 14:18:28 +02:00
Daniel Molkentin
d0a4650d69
Settings: calculate sidebar width dynamically
...
Fixes #1020
2013-09-20 10:40:22 +02:00
Daniel Molkentin
ec5a84cf01
Pop up config wizard if no server url is configured.
...
Fixes #1018 .
2013-09-19 17:24:22 +02:00
Daniel Molkentin
a057eb8590
Fix focus issue during setup wizard
2013-09-19 14:52:41 +02:00
Klaas Freitag
0e17b00675
Added a new error code HBF_TRANSFER_NOT_ACKED.
...
If the server does not acknowledge the transfer with sending back an
ETag after the last missing chunk was uploaded, this is an error
which is now reported by this new error type.
2013-09-19 12:52:54 +02:00
Klaas Freitag
740a275836
Cleaned and added some debugging output.
2013-09-19 12:52:11 +02:00
Klaas Freitag
125a63bf8d
More descriptive error message.
2013-09-19 12:50:44 +02:00
Klaas Freitag
b4f14e086d
Added a new error code HBF_TRANSFER_NOT_ACKED.
...
If the server does not acknowledge the transfer with sending back an
ETag after the last missing chunk was uploaded, this is an error
which is now reported by this new error type.
2013-09-19 12:40:17 +02:00
