Olivier Goffart
f3cb5f8a9d
Merge remote-tracking branch 'origin/1.8'
2015-04-09 14:24:26 +02:00
Jenkins for ownCloud
c805c5d6e9
[tx-robot] updated from transifex
2015-04-09 02:18:32 -04:00
Christian Kamm
adcf40afc3
Discovery: Speed up initial run. #2796
2015-04-08 15:43:49 +02:00
Christian Kamm
d986011067
Sync: Fix sync of deletions during 503. #2894
2015-04-08 10:50:08 +02:00
Roeland Jago Douma
5a83636f81
Only show share dialog if we are connected.
2015-04-08 09:53:57 +02:00
Jocelyn Turcotte
d475628c70
SyncEngine: Fix a crash in csync_vio_file_stat_copy #3051
...
In some cryptic cases where the getetag property wasn't returned by
the server, we might be trying to c_strdup a null pointer in
csync_vio_file_stat_copy.
At least avoid crashing in this case by looking for
CSYNC_VIO_FILE_STAT_FIELDS_ETAG, like csync_vio_file_stat_destroy
does.
2015-04-08 09:35:43 +02:00
Jocelyn Turcotte
4a890eae38
SyncEngine: Fix a crash caused by an invalid DiscoveryDirectoryResult::iterator #3051
...
The default constructor of the iterator points to NULL, which makes
it != end() but invalid to dereference.
Use an integer index instead to keep 0 as a valid default value that
can always correctly be checked against size().
Also make sure that no data is shared between threads by making the
csync_vio_file_stat_t copyable and passing it as const.
2015-04-08 09:35:43 +02:00
Christian Kamm
760e11bc5d
Sharedialog: Fix compiler warnings.
2015-04-08 08:59:36 +02:00
Jenkins for ownCloud
96ebf2b519
[tx-robot] updated from transifex
2015-04-08 02:18:30 -04:00
Klaas Freitag
4a6f4919d7
More GUI refinements.
2015-04-07 13:38:01 +02:00
Klaas Freitag
b98040c7d5
ShareDialog: handle resize properly with elided text
2015-04-07 13:38:01 +02:00
Klaas Freitag
1240a8163d
ShareDialog: Some GUI rework requested by Jan.
2015-04-07 13:38:01 +02:00
Olivier Goffart
e15b9b5358
Merge remote-tracking branch into 1.8
2015-04-07 10:42:27 +02:00
Olivier Goffart
1617c9d482
PropfindJob: fix xml parsing
...
It would only find the first property
2015-04-07 10:35:27 +02:00
Jenkins for ownCloud
16600fe86a
[tx-robot] updated from transifex
2015-04-07 02:18:46 -04:00
Olivier Goffart
50ba73860c
Merge remote-tracking branch into 1.8
2015-04-07 08:02:55 +02:00
Markus Goetz
750cdc1910
AbstractSslErrorHandler: Also give QSslConfiguration
2015-04-06 21:46:03 +02:00
Olivier Goffart
f4e2c84111
AccountState: Fix uninitialized memory access spotted by valgrind
...
QuotaInfo's constructor uses the AccountState's _state which is
initialized after
2015-04-06 16:21:05 +02:00
Jenkins for ownCloud
4f27750711
[tx-robot] updated from transifex
2015-04-04 02:18:40 -04:00
Olivier Goffart
71d9f23068
theme: fix compilation of libsync without QtGui
2015-04-03 11:27:06 +02:00
Jenkins for ownCloud
9f7aed7602
[tx-robot] updated from transifex
2015-04-03 02:18:33 -04:00
Markus Goetz
7f2213416a
Discovery: Add warning if returned etag is 0
...
There will be another bugfix which fixes
https://gist.github.com/jturcotte/3d5a7874d26bc27b1be9
directory.
2015-04-02 16:57:53 +02:00
Markus Goetz
9b9f0bdd4d
SyncEngine: Show more timing measurements #3064
2015-04-02 15:18:46 +02:00
Jenkins for ownCloud
ee0aec514f
[tx-robot] updated from transifex
2015-04-02 02:18:44 -04:00
Jocelyn Turcotte
c2fd7d6ebd
Clean up remains of SOCKETAPI_TCP
2015-04-01 15:03:42 +02:00
Jocelyn Turcotte
4a893c5267
Fix a crash on shutdown in ~SocketApi #3057
...
Deleting the QLocalSocket while iterating the QList with qDeleteAll
would trigger onLostConnection, which would modify the list mid-air
and leave dangling pointers in it.
2015-04-01 15:03:42 +02:00
Jocelyn Turcotte
2473183f19
Windows: Add version information for owncloud.exe
...
This should help us know what version or build number a crash report was generated with.
2015-04-01 15:03:41 +02:00
Jenkins for ownCloud
7d7142d7d8
[tx-robot] updated from transifex
2015-04-01 02:18:37 -04:00
Jenkins for ownCloud
cb57cda87a
[tx-robot] updated from transifex
2015-03-31 02:18:45 -04:00
Lukas Reschke
71e8910e02
Use 1.8 troubleshooting link
2015-03-30 17:32:19 +02:00
Daniel Molkentin
f2fa812b0b
Updater: Give context as to which app is about to be updated
...
Fixes #3040
2015-03-30 14:44:34 +02:00
Markus Goetz
ef89582d7e
Propagator: Fix compile
2015-03-30 08:41:53 +02:00
Jenkins for ownCloud
ae74a21305
[tx-robot] updated from transifex
2015-03-29 02:18:47 -04:00
Jenkins for ownCloud
32af63764c
[tx-robot] updated from transifex
2015-03-29 01:15:23 -04:00
Jenkins for ownCloud
61ff90409d
[tx-robot] updated from transifex
2015-03-28 02:18:42 -04:00
Christian Kamm
ba0c3256fa
Remove unused HttpConfigFile.
2015-03-27 13:20:10 +01:00
Markus Goetz
b6fe5d2cff
Propagator: Debug output regarding OC-ETag
...
We can remove this in some time, but currently it is interesting
to see for what server setup is no ETag but an OC-ETag.
2015-03-27 13:16:11 +01:00
Markus Goetz
9123fac545
owncloudcmd: Always trail path with /
...
Else the csync code vs the Qt code get confused.
2015-03-27 13:15:43 +01:00
Markus Goetz
c6bc388001
Proxy: More debug, always set returned system proxy
2015-03-27 11:53:58 +01:00
Christian Kamm
ea985a85af
ProtocolWidget: Always add seconds to the DateTime locale. #2535
2015-03-27 11:25:30 +01:00
Christian Kamm
dfd9d8725c
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
doc/installing.rst
2015-03-27 11:19:59 +01:00
Christian Kamm
2578832002
Fix clang warnings about deleting incomplete 'Account'.
2015-03-27 11:11:44 +01:00
Markus Goetz
cfada67aa6
Proxy: Fix compile harder
2015-03-27 11:02:19 +01:00
Christian Kamm
5483682281
CookieJar: Don't accidentally overwrite cookies. #2808
...
Calling save() in the CookieJar destructor was problematic. For instance
we sometimes create a new QNAM with a new CookieJar and then call
setCookieJar() on it to assign some other jar. That destroy the fresh
jar and potentially overwrite cookies.
Also explicitly saving the account's cookies when the account is saved
is more explicit and thus more reliable than counting on the Account
destructor to do it.
2015-03-27 10:49:24 +01:00
Christian Kamm
2a8c23aac3
Account: Destroy on exit.
...
During shutdown we want the account object to be deleted and
therefore we need to be able to remove the strong reference
in AccountManager.
2015-03-27 10:43:14 +01:00
Christian Kamm
88bc96fc4c
ConValidator: Delete instance if no credentials.
2015-03-27 10:43:14 +01:00
Christian Kamm
588129d852
HttpCreds: Delete password from old location. #2186
2015-03-27 10:40:19 +01:00
Jenkins for ownCloud
0889991c38
[tx-robot] updated from transifex
2015-03-27 02:18:47 -04:00
Markus Goetz
5c87a35fe4
Proxy: Fix compile
2015-03-26 18:36:37 +01:00
Markus Goetz
418185af9a
Qt4: Fix compile
2015-03-26 15:17:16 +01:00
