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
Olivier Goffart
8f1494f8f2
Report an error if fetching the etag fails
...
Very important in case of renames, else, if the server did not perform
the rename, we may end up deleting the files
2014-02-06 17:56:27 +01:00
Daniel Molkentin
4ae66b8b20
ShibbolethCredetials: Try to avoid re-auth
...
...by storing the shib cookie in key chain
2014-02-06 13:02:01 +01:00
Daniel Molkentin
ccb45bfea6
Move code from HTTPCredentials to more generic locations
...
This is a preparation to make them usable from the Shibboleth
credentials class.
2014-02-06 13:02:01 +01:00
Daniel Molkentin
bee5940c42
Credentials: Remove unused fetchFromUser methods
2014-02-06 13:02:01 +01:00
Olivier Goffart
f67d2e6418
Start all the jobs in parallel
2014-02-06 12:11:45 +01:00
Olivier Goffart
9a6275a5e3
use QNAM for the PUT
...
Not yet supported:
- chunking
- if the file changes while uploading
- aborting
- owncloudcmd (because of the dependency to the account and the credidentials)
2014-02-06 11:50:16 +01:00
Olivier Goffart
2d9c0b6c31
Move CSyncThread in the main thread, and just do the neon jobs in a thread
...
It is important because then we can do assynchronious job that needs
QNAM in the main thread
2014-02-05 20:18:03 +01:00
Olivier Goffart
ee3df45fd8
remove csync_lock
...
It is not used anymore for a long time
2014-02-05 17:31:34 +01:00
Olivier Goffart
49562ca3b6
Remove unused members
2014-02-05 16:40:56 +01:00
Daniel Molkentin
33ab854922
SslErrorDialog: Ensure to run into a timeout while showing the dialog
2014-02-05 14:18:31 +01:00
Thomas Müller
fdf73fe539
- Replace undeclared variables:
...
- PageReinstall_OLD_MUI_HEADER_TEXT_SUBTITLE
- PageReinstall_OLD_Field_2
- PageReinstall_OLD_Field_3
- REVISION
- README.md updated - calling bin/l10n.sh was missing
This commit includes updated translations from transifex.
2014-02-05 12:01:36 +01:00
Jenkins for ownCloud
3480cb4432
[tx-robot] updated from transifex
2014-02-05 02:07:17 -05:00
Mr. Jenkins
25ee44dd69
[tx-robot] updated from transifex
2014-02-05 01:57:23 -05:00
