Commit graph

7590 commits

Author SHA1 Message Date
Daniel Molkentin
5fba476076 1.8.0 RC2 2015-05-04 13:43:56 +02:00
Klaas Freitag
d63abef718 SyncEngine: Handle upgrade case from 1.8.0
If 1.8.0 caused missing data in the local tree, this patch gets it
back. For that, the usage of the journal for remote repository is
disabled at the first start.
2015-05-04 13:40:25 +02:00
Jenkins for ownCloud
cdba8a7f2f [tx-robot] updated from transifex 2015-05-04 02:18:49 -04:00
Jenkins for ownCloud
21967a130b [tx-robot] updated from transifex 2015-05-03 02:18:47 -04:00
Jenkins for ownCloud
08e78d5d6f [tx-robot] updated from transifex 2015-05-02 02:18:47 -04:00
Jenkins for ownCloud
fe68e1e82c [tx-robot] updated from transifex 2015-05-01 02:18:22 -04:00
Jenkins for ownCloud
25ac3bfdb7 [tx-robot] updated from transifex 2015-04-30 03:27:54 -04:00
Markus Goetz
4700c604b1 Proxy: Register meta type #3170 2015-04-29 14:54:08 +02:00
Jenkins for ownCloud
356fa737c5 [tx-robot] updated from transifex 2015-04-29 02:18:49 -04:00
Klaas Freitag
520e2eb392 Updated version tag rc1 2015-04-27 11:58:56 +02:00
Klaas Freitag
e0d2bd4830 Updated changelog for 1.8.1 2015-04-27 11:58:18 +02:00
Jenkins for ownCloud
1dc05f99bf [tx-robot] updated from transifex 2015-04-27 02:18:46 -04:00
Jenkins for ownCloud
b2b176bcd0 [tx-robot] updated from transifex 2015-04-26 02:18:48 -04:00
Jenkins for ownCloud
fde5ccd0df [tx-robot] updated from transifex 2015-04-25 02:18:46 -04:00
Carla Schroder
d1fe25cc31 Update owncloudcmd.rst 2015-04-24 11:44:38 -07:00
Carla Schroder
60c18f75b5 update owncloud and owncloudcmd docs
Conflicts:
	doc/owncloudcmd.rst
2015-04-24 11:42:10 -07:00
Carla Schroder
c7f3791f3d Update autoupdate.rst 2015-04-24 10:03:51 -07:00
Carla Schroder
ee9d5e6bf0 Update introduction.rst 2015-04-24 10:03:06 -07:00
Carla Schroder
96fa3a3a1a Merge pull request #3160 from owncloud/blockoldclient
add more warning that 1.7 clients and older are blocked
2015-04-24 09:56:17 -07:00
Carla Schroder
7c4deec800 add more warning that 1.7 clients and older are blocked 2015-04-24 09:54:05 -07:00
Christian Kamm
78e82eb920 AccountWizard: Fix auth error handling. #3155
The problem was that on network error the networkError() and
finishedWithError() signals both fired. To fix it, I collapse all
error handing into a slot triggered by finishedWithError().

I tested the redirection case and the invalid credentials case.
2015-04-24 16:03:28 +02:00
Jenkins for ownCloud
3c91a1ace4 [tx-robot] updated from transifex 2015-04-24 02:18:46 -04:00
Markus Goetz
3a52db46ad Discovery: Fix another empty-local-directory bug 2015-04-23 16:15:13 +02:00
Markus Goetz
137bce6dd0 Folder: Clear _syncResult better
I had a situation here where we were showing stale desktop notifications when a remote folder
errored out and then sync finished with _syncResult data from previous sync.
2015-04-23 13:30:30 +02:00
Jenkins for ownCloud
f000e6ce6a [tx-robot] updated from transifex 2015-04-23 02:18:48 -04:00
Christian Kamm
7c1281dd06 Windows: Fix rename of finished file. #3073
The file was still open and therefore couldn't be renamed...
2015-04-22 14:46:04 +02:00
Jenkins for ownCloud
60729f2bbd [tx-robot] updated from transifex 2015-04-22 02:18:36 -04:00
Jenkins for ownCloud
0b0ecfcbe4 [tx-robot] updated from transifex 2015-04-22 01:15:19 -04:00
Carla Schroder
1fe86bced2 note that linux users need password manager 2015-04-21 13:05:09 -07:00
Carla Schroder
c6a62a497d Merge pull request #3139 from owncloud/updates
add note to restart windows after update
2015-04-21 12:58:22 -07:00
Carla Schroder
8be6881093 add note to restart windows after update 2015-04-21 10:10:16 -07:00
Daniel Molkentin
99c8118229 create_mac_pkg.sh.cmake: increase space-in-filename resiliance 2015-04-21 15:42:51 +02:00
Markus Goetz
6c5ca055c4 ShareDialog: Unused/invalid forward declaration 2015-04-21 10:33:38 +02:00
Jenkins for ownCloud
a6ec8f3090 [tx-robot] updated from transifex 2015-04-21 02:18:33 -04:00
Olivier Goffart
b039c2ce86 More change to compile with 5.5
The problem is again that QStringList no longer include QDataStream
2015-04-20 09:47:25 +02:00
Jenkins for ownCloud
5a6d286c41 [tx-robot] updated from transifex 2015-04-20 02:18:49 -04:00
Olivier Goffart
ba65187ad3 Fix compilation with Qt 5.5
Because of commit 90e7cc172a7521396bb2d49720ee4ceb9a9390b3 in qtbase,
we now need to explicitly include QDataStream

Fixes #2809
2015-04-19 11:02:43 +02:00
Jenkins for ownCloud
a91f54f0a8 [tx-robot] updated from transifex 2015-04-19 02:18:31 -04:00
Jenkins for ownCloud
d77c1f3e4a [tx-robot] updated from transifex 2015-04-18 02:18:24 -04:00
Daniel Molkentin
7390ddbd98 Mac OS: The Resource/ folder in Qt frameworks might not exist
Make sure to create it
2015-04-17 13:31:05 +02:00
Daniel Molkentin
32a4b40f0a Remove wrongly-commited file 2015-04-17 12:50:08 +02:00
Jenkins for ownCloud
bc1bc2a4f8 [tx-robot] updated from transifex 2015-04-17 06:49:42 -04:00
Jocelyn Turcotte
155c965866 Prevent another crash in ~SocketApi #3118
Since the QLocalServer parent of the QLocalSockets gets destroyed
after the _listeners QList, onLostConnection might try to update
an already destroyed list.

Fix the issue by simply making sure that _localServer is destroyed
first.
2015-04-17 12:42:40 +02:00
Olivier Goffart
6c73f25747 HTTP creds: Fix translation of the password input dialog
tr() needs Q_OBJECT
2015-04-17 12:19:37 +02:00
Daniel Molkentin
2518fd7059 Merge pull request #3126 from owncloud/equal_user_agents
Use identical User Agents for csync and the Qt parts
2015-04-17 10:16:09 +02:00
Jenkins for ownCloud
56edae6958 [tx-robot] updated from transifex 2015-04-17 02:18:43 -04:00
Daniel Molkentin
d8275cd4e1 Use identical User Agents for csync and the Qt parts
Also, use the mirall version for ocsync.

Currently, the csync engine part and the Qt part have different UAs,
and this makes debugging (i.e. reading access logs) difficult. On
top, we haven't increased the ocsync version number in ages. So
as a consequence, I think it would be the best to have ocsync
and the rest share the same version number, and make them identify
with the same user agent.

To ease debugging for our side, we'll still append "(csyncoC)"
for calls made by csync.
2015-04-16 20:58:51 +02:00
Daniel Molkentin
c3dca7a288 OS X: Actually Make the signing script fail on failure
Addresses #3114
2015-04-16 16:35:09 +02:00
Daniel Molkentin
96ff0076c7 Fix mac deployment again 2015-04-16 16:35:09 +02:00
Olivier Goffart
8bb4af067a Propagate download: Fix restoring files for which the conflict file exists
For issue #3106

1) Always use the actual timestamp from the file in the file system
to create the conflict file.  This is important because if one edit a
file several time, they should have different name. Also it makes more
sens to have the mtime of the modified file.

2) Give the correct size to the job so we know when the temporary file
is complete in case of resuming.
2015-04-16 11:36:01 +02:00