Daniel Molkentin
393ac82c6a
Update documentation for 1.5.1
2014-02-13 17:04:51 +01:00
Markus Goetz
372f8b3426
OS X: Document how to disable the auto updater
2014-02-13 14:11:04 +01:00
Olivier Goffart
7b6269b4bf
Fix chunking
...
- Do not start them in parallel, start them in sequence instead, as they are quite
and there are already other jobs running in parallel normaly
- Do not load the fill into memory
- Support resuming
2014-02-13 14:02:05 +01:00
Markus Goetz
8b9cd432b5
OS X: Read system-wide plist in /Library
...
Needed for http://doc.owncloud.org/desktop/1.5/autoupdate.html#preventing-auto-updates
2014-02-13 12:52:57 +01:00
Jenkins for ownCloud
842c6c0e9e
[tx-robot] updated from transifex
2014-02-13 03:19:10 -05:00
Mr. Jenkins
a81d7823a9
[tx-robot] updated from transifex
2014-02-13 03:09:11 -05:00
Daniel Molkentin
aa26fc1e80
Bump version
2014-02-12 21:20:54 +01:00
Daniel Molkentin
beb9752f09
Merge remote-tracking branch 'origin/1.5'
2014-02-12 21:17:06 +01:00
Daniel Molkentin
1eb6e163de
Add documentation on auto update feature
2014-02-12 21:08:28 +01:00
Daniel Molkentin
1875a93a48
RC2
2014-02-12 18:17:57 +01:00
Daniel Molkentin
fd40a25030
Use the appName (which is the short name) instead of the full length name
...
The full length name is allowed to change (or should be)
2014-02-12 18:06:01 +01:00
Daniel Molkentin
05ae467cd5
Remove debug
2014-02-12 18:05:28 +01:00
Daniel Molkentin
4db7b5f2a7
NSIS: accept /noautoupdate
2014-02-12 17:57:50 +01:00
Daniel Molkentin
958253bb2b
Respect skipUpdate policy from global config files and windows policy.
2014-02-12 17:55:05 +01:00
Daniel Molkentin
bcf73cfc40
SSLButton: Omit arrow on Windows which can't display it
2014-02-12 17:55:05 +01:00
Daniel Molkentin
f79ecfe001
more verbose ssl error logging
2014-02-12 17:54:45 +01:00
Olivier Goffart
a4442ebb40
Merge branch 'master' into parallel_upload
...
Conflicts:
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
2014-02-12 16:50:45 +01:00
Olivier Goffart
93f31fa9d7
Merge branch '1.5'
2014-02-12 16:44:24 +01:00
Olivier Goffart
f35b1f8a2b
Only starts 6 jobs in parallel
2014-02-12 16:33:55 +01:00
Olivier Goffart
6db8daabf7
Make abort work even when there are parallel uploads
2014-02-12 16:33:55 +01:00
Olivier Goffart
a677f97b7f
Fix removing and renaming directories from the Shared directory
2014-02-12 13:44:55 +01:00
Olivier Goffart
1a9a14bdec
Fix problems if a file is moved, and another file is created with the same name
2014-02-12 13:44:32 +01:00
Olivier Goffart
7ae40e13ec
Update the docs now that csync is included
2014-02-12 11:32:19 +01:00
Olivier Goffart
a5379ef2aa
make BUILD_WITH_QT4 off by default
...
Rationale:
When Qt5 is not found, the script will automatically use Qt4.
However, without this change, when Qt4 is not found, it will not
try to find Qt5 because BUILD_WITH_QT4 is ON by default forbidding the
use of Qt5 even if it is installed.
Also, other packages default to Qt5 including qtkeychain
See also issue #1418
2014-02-12 11:25:08 +01:00
Olivier Goffart
01c0a3c099
use Utility::sleep
2014-02-12 11:16:27 +01:00
Markus Goetz
153aa31da2
OS X: Workaround Qt5 QNAM bug
...
This made the sign out/sign in handling not work.
(cherry picked from commit 104cf680a6
2014-02-12 11:14:43 +01:00
Jenkins for ownCloud
9815ccb760
[tx-robot] updated from transifex
2014-02-12 02:14:56 -05:00
Mr. Jenkins
814f40c1c7
[tx-robot] updated from transifex
2014-02-12 02:05:48 -05:00
Markus Goetz
19c128ba12
Update building.rst
2014-02-11 11:45:00 +01:00
Thomas Müller
0322a44be5
Adding quotes - necessary for themes containing spaces in APPLICATION_NAME
2014-02-11 11:24:10 +01:00
Thomas Müller
60ca442728
Adding quotes - necessary for themes containing spaces in APPLICATION_NAME
2014-02-11 11:23:34 +01:00
Jenkins for ownCloud
3ffd7034c9
[tx-robot] updated from transifex
2014-02-11 02:07:14 -05:00
Mr. Jenkins
95469a9886
[tx-robot] updated from transifex
2014-02-11 01:26:45 -05:00
Markus Goetz
8c9a65635f
Propagator: Fix compilation
...
It is still protected on Qt4
2014-02-10 15:46:09 +01:00
Markus Goetz
104cf680a6
OS X: Workaround Qt5 QNAM bug
...
This made the sign out/sign in handling not work.
2014-02-10 15:42:46 +01:00
Klaas Freitag
b84253054a
Read configuration from /etc/ownCloud/t1.cfg
2014-02-10 15:08:40 +01:00
Markus Goetz
43345dc236
Icon: Make png2ico / windres failure non-fatal
2014-02-10 14:36:32 +01:00
Markus Goetz
79d14f0760
Propagator: Use cross platform sleep function
2014-02-10 14:34:48 +01:00
Klaas Freitag
6387777c18
Added chunking for the new uploading.
2014-02-10 13:00:22 +01:00
Mr. Jenkins
1e9c508c92
[tx-robot] updated from transifex
2014-02-10 06:17:19 -05:00
Jenkins for ownCloud
88e9014dad
[tx-robot] updated from transifex
2014-02-09 04:30:28 -05:00
Mr. Jenkins
313ad56d11
[tx-robot] updated from transifex
2014-02-09 04:20:08 -05:00
Jenkins for ownCloud
8152b7ebcf
[tx-robot] updated from transifex
2014-02-08 02:21:31 -05:00
Mr. Jenkins
e36d314218
[tx-robot] updated from transifex
2014-02-08 01:26:49 -05:00
Klaas Freitag
593d528b6a
Removed unused function.
2014-02-07 11:57:10 +01:00
Klaas Freitag
3649869650
Optimize restoring of the remote tree from database.
...
If the etag of a directory hasn't changed, the content for the csync
tree can be restored from database. The code doing that is now optimized
so that this does not take so long any more.
2014-02-07 11:53:58 +01:00
Klaas Freitag
41a4f1fc37
Only wait half a second before the next folder sync is started.
2014-02-07 11:53:58 +01:00
Daniel Molkentin
5a6a8b504c
Mac OS: Build fix
2014-02-06 22:32:17 +01:00
Daniel Molkentin
97345447ab
Updater: Unify Sparkle&non-Sparkle URLs
...
...now that we have the support on the server-side.
2014-02-06 18:56:33 +01:00
Olivier Goffart
bb378902ae
Also force an update of the etag in case of renames
...
Imagine we have a file:
foo/bar/moo
if we do mv 'foo' 'foo2' and that we issue a MOVE on the server
and will update the entry 'foo' in the database with the new etag
If we write the etag of foo but not the etag of the sub item, when
we read from db on the next sync, we will miss them and beleive they
have been removed on the server
2014-02-06 17:56:27 +01:00
