Daniel Molkentin
95c04e59fe
Merge pull request #3314 from owncloud/typo
...
from translators on transifex
2015-06-07 14:21:49 +02:00
Volkan Gezer
03eb11b927
from translators on transifex
2015-06-07 14:19:59 +02:00
Jenkins for ownCloud
a42856ef84
[tx-robot] updated from transifex
2015-06-07 02:18:54 -04:00
Jenkins for ownCloud
e7f01b9a95
[tx-robot] updated from transifex
2015-06-07 01:15:27 -04:00
Klaas Freitag
fc2ceb88fb
Rename thread to SyncEngine Thread to avoid confusion about Neon.
2015-06-06 10:49:47 +02:00
Jenkins for ownCloud
36f62f7fd4
[tx-robot] updated from transifex
2015-06-06 02:18:54 -04:00
Christian Kamm
ee08b3759d
SyncScheduling: Avoid new resyncs on local mkdir.
...
(cherry picked from commit bacf6166c1
2015-06-05 10:27:28 +02:00
Klaas Freitag
c73110e3c7
Added changes between beta1 and rc1 to Changelog.
2015-06-05 09:39:56 +02:00
Klaas Freitag
9ced5fb9a3
Set version postfix to RC1
2015-06-05 09:26:22 +02:00
Daniel Molkentin
f9659d80c9
Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin"
...
This reverts commit e1a36b53dc
2015-06-05 09:17:46 +02:00
Daniel Molkentin
553e831121
Revert "Adjust to new version of NSIS UAC"
...
This reverts commit 1d600ceecc
2015-06-05 09:17:39 +02:00
Daniel Molkentin
e9ff471e1c
Revert "NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true."
...
This reverts commit 0f7773ff99
2015-06-05 09:16:14 +02:00
Daniel Molkentin
eb6d29a223
Revert "NSIS: Fix NSIS error handling"
...
This reverts commit 3df26ef189
2015-06-05 09:15:14 +02:00
Daniel Molkentin
3df26ef189
NSIS: Fix NSIS error handling
2015-06-05 08:45:23 +02:00
Jenkins for ownCloud
25767bee0b
[tx-robot] updated from transifex
2015-06-05 02:18:54 -04:00
Christian Kamm
bacf6166c1
SyncScheduling: Avoid new resyncs on local mkdir.
2015-06-04 15:02:24 +02:00
Daniel Molkentin
0f7773ff99
NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true.
2015-06-04 12:53:42 +02:00
Christian Kamm
2ed329e025
Improve reporting of server error messages. #3220
...
In particular the 'unsupported client version' error message
is now visible to the user when trying to connect to a
server that no longer supports the current client version.
2015-06-04 10:07:24 +02:00
Christian Kamm
e04882cc7c
Discovery: Ignore folders with any 503. #3113
2015-06-04 09:24:53 +02:00
Jenkins for ownCloud
40818920d1
[tx-robot] updated from transifex
2015-06-04 02:18:53 -04:00
Daniel Molkentin
1bec652822
Merge pull request #3303 from owncloud/new_nsis_modules
...
NSIS installer module updates
2015-06-03 21:05:47 +02:00
Christian Kamm
4c10f1e40c
Wizard: Show server error message if possible. #3220
2015-06-03 16:33:09 +02:00
Olivier Goffart
02ffbf8989
confirm feature: fix typos spotted by ckamm
2015-06-03 15:20:42 +02:00
Christian Kamm
89376e14d6
Nicer fix for the security issue #3283 .
2015-06-03 11:37:26 +02:00
Christian Kamm
e32bd5a59f
Merge remote-tracking branch 'origin/1.8'
2015-06-03 11:36:52 +02:00
Klaas Freitag
53154bcd1e
Merge pull request #3301 from owncloud/fix_3283
...
Abort the request and reset the QNAM if user does not ACK a new cert.
2015-06-03 10:22:13 +02:00
Daniel Molkentin
1d600ceecc
Adjust to new version of NSIS UAC
2015-06-03 08:21:10 +02:00
Daniel Molkentin
e1a36b53dc
NSIS: depend on nsProcess instead of Processes NSIS plugin
...
The Processes plugin is no longer maintained, and OBS
compiles an up-to-date version of nsProcess for us.
2015-06-03 08:21:10 +02:00
Jenkins for ownCloud
5f91abd7c6
[tx-robot] updated from transifex
2015-06-03 02:18:34 -04:00
Olivier Goffart
12f760535d
Fix folder concatenation with Qt4
...
QUrl in Qt4 do not simplify double slashes like Qt5 does, so we have
to take in account different slashes possibilities
2015-06-02 20:47:06 +02:00
Olivier Goffart
e1f94cea4f
FolderStatusModel: handle network error in the LSCol
2015-06-02 20:47:06 +02:00
Olivier Goffart
fc23e810fd
folderstatusmodel: clean includes
2015-06-02 20:01:13 +02:00
Olivier Goffart
e587c8e2dc
multi-account: compile with Qt4
2015-06-02 19:57:41 +02:00
Olivier Goffart
984434c728
AccountSettings: move the progress handling in FolderStatusModel
...
This is required to compile with Qt4 because signals were protected.
And the logic anyway belongs to the model
2015-06-02 19:45:23 +02:00
Klaas Freitag
75b38d1a2f
Abort the request and reset the QNAM if user does not ACK a new cert.
...
This is supposed to fix bug #3283
2015-06-02 12:21:49 +02:00
Jenkins for ownCloud
7f597e5dd2
[tx-robot] updated from transifex
2015-06-01 02:18:41 -04:00
Jenkins for ownCloud
e3be1a176d
[tx-robot] updated from transifex
2015-05-30 02:18:51 -04:00
Lukas Reschke
7880f4da94
Add information how to report security bugs
2015-05-29 19:28:13 +02:00
Daniel Molkentin
b1658cb1cf
Merge pull request #3291 from RealRancor/backport_3004_2978_1.8
...
Backport #3004 and #2978 to 1.8
2015-05-28 17:22:06 +02:00
RealRancor
6ba3324035
Backport #3004 and #2978 to 1.8
2015-05-28 17:11:03 +02:00
Daniel Molkentin
e2a26f0eaf
Merge pull request #3289 from RealRancor/backport_3279_1.8
...
Backport #3279 to 1.8
2015-05-28 17:03:27 +02:00
RealRancor
8cfb17bca6
Backport #3279 to 1.8
2015-05-28 17:00:59 +02:00
Carla Schroder
524aa507e6
Merge pull request #3279 from RealRancor/fix_docs
...
Fix syntax issues in troubleshooting docs
2015-05-28 07:32:03 -07:00
Jenkins for ownCloud
211e5ec82e
[tx-robot] updated from transifex
2015-05-28 02:18:51 -04:00
Christian Kamm
2435ba7e7d
Windows: Fix unit test build.
2015-05-27 14:59:28 +02:00
Jenkins for ownCloud
be77e4f57e
[tx-robot] updated from transifex
2015-05-27 02:18:51 -04:00
Olivier Goffart
28a66cb393
SettingsDialogMac: adapt to multi-account
2015-05-26 17:37:15 +02:00
Olivier Goffart
507206367f
Merge branch 'master' into new-ui
2015-05-26 14:56:08 +02:00
Olivier Goffart
9e17ddffae
Confirm feature: document the white/black/unconfirmed lists
2015-05-26 14:41:29 +02:00
Olivier Goffart
a621223cc8
SyncEngine: add an api to set the maximum size of new shared folder that do not require confirmation
2015-05-26 14:41:01 +02:00
