Christian Kamm
f8b24ac34d
Fix reconnection after long network outage #2321
...
The problem was that StatusNotFound can indicate either a transient
network problem or a permanent server configuration problem.
2015-02-11 09:24:56 +01:00
Jenkins for ownCloud
4ff0d6635c
[tx-robot] updated from transifex
2015-02-11 02:18:26 -05:00
Christian Kamm
51b9ec30a9
Remove connect to removed slot.
...
This seems to have slipped back in, probably during a complex merge
in ba8b1bbe06
2015-02-11 08:12:09 +01:00
Jenkins for ownCloud
377887871c
[tx-robot] updated from transifex
2015-02-11 01:15:14 -05:00
Klaas Freitag
d45d3892cb
Account: Fix path assembling with QUrl, add query items separately.
...
Otherwise Qt does encode the delimiter between path and query items.
This fixes bug #2804
2015-02-10 17:13:27 +01:00
Klaas Freitag
0bf6a220ae
Merge pull request #2807 from rullzer/sharedialog_force_password_multshare
...
Reset _public_share_id after we delete the share, thanks
2015-02-10 12:18:10 +01:00
Klaas Freitag
04a4d7c2c9
Merge pull request #2805 from rullzer/sharedialog_thumbnail
...
Sharedialog: retrive thumbnail from server for shares - thanks!
2015-02-10 12:16:28 +01:00
Jenkins for ownCloud
209d93ac05
[tx-robot] updated from transifex
2015-02-10 02:18:25 -05:00
Roeland Jago Douma
c44abf4918
Reset _public_share_id after we delete the share
2015-02-10 07:53:35 +01:00
Roeland Jago Douma
d7f5e89a1d
Sharedialog: retrive thumbnail from server for shares
...
Initial patch for #2726 . Request a thumbnail from the server if files are to be
shared.
2015-02-09 22:17:37 +01:00
Daniel Molkentin
72ec7ccde2
FF binary to current master
2015-02-09 11:58:15 +01:00
Daniel Molkentin
13aaa46a55
OCContextMenu: Also export modules for x86
2015-02-09 11:56:52 +01:00
Jenkins for ownCloud
3121546fb6
[tx-robot] updated from transifex
2015-02-09 02:18:27 -05:00
Olivier Goffart
51337a10af
LSCOL job: Fix getting the list of folders when there are non-ascii
...
Task #2795
2015-02-08 12:23:47 +01:00
Jenkins for ownCloud
5f3104786a
[tx-robot] updated from transifex
2015-02-08 02:18:23 -05:00
Jenkins for ownCloud
faec7362fe
[tx-robot] updated from transifex
2015-02-08 01:15:15 -05:00
Daniel Molkentin
adfb216325
Merge pull request #2793 from glensc/patch-1
...
use touch from path
2015-02-08 00:43:03 +01:00
Elan Ruusamäe
e0656af1fc
use touch from path
...
on some systems touch(1) is in /bin, not /usr/bin.
instead hardcoding another path, take it from $PATH, like other commands used here (rm, echo)
2015-02-08 01:27:46 +02:00
Daniel Molkentin
07fe077f7f
More Mirall -> Client renaming to make l10n work again
2015-02-07 23:28:20 +01:00
Daniel Molkentin
d3103adbd8
Ship translations on Windows again after rename
2015-02-07 22:32:42 +01:00
Markus Goetz
d4132072d8
OS X: Send notification natively
...
For #2728
2015-02-07 18:23:40 +01:00
Jenkins for ownCloud
b8e9dd587d
[tx-robot] updated from transifex
2015-02-07 02:18:26 -05:00
Jenkins for ownCloud
c48ab4830d
[tx-robot] updated from transifex
2015-02-07 01:15:14 -05:00
Olivier Goffart
eedb5d0dae
Revert "cmake: Clearly Define qtmain.lib link policy on Windows"
...
It make jenkins fail with the error:
CMake Error at CMakeLists.txt:3 (cmake_policy):
Policy "CMP0020" is not known to this version of CMake.
This reverts commit 6d380c8548
2015-02-06 17:46:57 +01:00
Jocelyn Turcotte
07849537cf
Fix Windows building documentation issues
...
Add missing words and clear up why qtkeychain must be built in-source.
2015-02-06 17:10:35 +01:00
Klaas Freitag
4849c31add
Sharing: Handle "Enforce password" for public shares properly.
...
If a 403 is received from the attempt to create a public link, the
dialog shows the password field, as this is server enforced.
This fixes #2774
2015-02-06 16:27:11 +01:00
Daniel Molkentin
9a4f4854de
Some fixes for favlink manual test
2015-02-06 15:29:36 +01:00
Jenkins for ownCloud
9ff48e6bb5
[tx-robot] updated from transifex
2015-02-06 09:20:10 -05:00
Daniel Molkentin
01bca39138
s/mirall/client in transifex & translations
...
Last part of #2470
2015-02-06 15:16:55 +01:00
Olivier Goffart
6e8527e66d
Wizard: Show the remote folder name when the theme has one
...
Relates to issue #2788
2015-02-06 14:50:52 +01:00
Jocelyn Turcotte
0d2b7967bc
Windows: Fix opening activity entries with a space in the name
...
This fixes #2601
2015-02-06 13:44:06 +01:00
Olivier Goffart
70c8803a79
SelectiveSync: show a message in case of error or if there is no subfolder
...
Usefull when the folder does not exist (for example in case the theme
has a defaultServerFolder that does not yet exist, #2788 )
But also to avoid confusion (issue #2663 )
2015-02-06 12:27:54 +01:00
Olivier Goffart
0d2fb0754c
Wizard: Fix the advanced setup page when the theme has a defaultServerFolder
...
Especially the selective sync dialog
Task #2788
2015-02-06 12:27:54 +01:00
Klaas Freitag
dbca7469f2
Enable the SHA sum in linux when build from source tar.
2015-02-06 12:18:09 +01:00
Markus Goetz
1e57432aae
Propagator: Fix crash
...
This crash was uncovered when testing parallel chunks when one chunk
finished the upload. The propagate was then finished with the other
UploadDevices still being in-flight in the QNAM.
2015-02-06 11:19:41 +01:00
Markus Goetz
7c0d3b8485
Sharing: tr()s added
2015-02-06 11:11:09 +01:00
Daniel Molkentin
46abd47bfe
Merge pull request #2787 from cmeh/patch-1
...
Orthography: "an folder" corrected to "a folder"
2015-02-06 10:31:57 +01:00
Olivier Goffart
2a88f5083c
t6.pl: Add a test that re-upload a chunked file with lot of chunks
2015-02-06 10:23:20 +01:00
Olivier Goffart
5ec793e045
propagateupload: Save the mtime given by the server in the reply to GET
...
There could be a race condition if the file was updated on the server
between the discovery and the propagate phase. By taking the mtime from
the server, we make sure that we do not have a race.
This is tested by t6.pl with BIG3.file because the script was modifying
the file between the two phases
2015-02-06 10:23:20 +01:00
cmeh
1554f41441
Orthography: "an folder" corrected to "a folder"
2015-02-06 10:22:49 +01:00
Daniel Molkentin
9e945eb471
Settings dialog: better color for separator line
2015-02-06 08:30:51 +01:00
Jenkins for ownCloud
b5212c4467
[tx-robot] updated from transifex
2015-02-06 02:06:13 -05:00
Daniel Molkentin
c4dd1cfb69
Mac Settings Dialog: Native icons for account
2015-02-06 07:54:25 +01:00
Jenkins for ownCloud
00774b95a1
[tx-robot] updated from transifex
2015-02-06 01:25:20 -05:00
Jenkins for ownCloud
7de559f351
[tx-robot] updated from transifex
2015-02-05 19:11:07 -05:00
Volkan Gezer
eaa9c4fdf8
json capital
2015-02-05 20:41:08 +01:00
Jenkins for ownCloud
6050d5873c
[tx-robot] updated from transifex
2015-02-05 13:58:32 -05:00
Markus Goetz
94e61c3205
Notifications: Fix creation of notification (fixup2)
...
For #2728
2015-02-05 17:20:52 +01:00
Markus Goetz
c4cf13bd97
Notifications: Fix creation of notification (fixup)
...
For #2728
2015-02-05 16:55:32 +01:00
Markus Goetz
71e22ffe2c
Notifications: Fix creation of notification
...
For #2728
2015-02-05 16:46:40 +01:00
