Olivier Goffart
5ab20e64bf
AccountSettings: fix selective sync checking
...
We need to set the root item to partially checked in case there
is some folders in the blacklist
The root item do not have checkmark so it is good
2015-06-10 17:00:08 +02:00
Markus Goetz
827e07700d
Documentation: Mention the git submodules
2015-06-10 16:48:34 +02:00
Olivier Goffart
e9e11d251f
Fix compilation after merge of the confirm and the new-ui branch
2015-06-10 16:22:14 +02:00
Olivier Goffart
139b28b471
Merge branch 'master' into new-ui
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/gui/folderman.cpp
2015-06-10 15:57:55 +02:00
Olivier Goffart
16786eed54
Merge pull request #3281 from owncloud/confirm
...
Confirm feature (sync engine part only)
2015-06-10 13:39:52 +02:00
Olivier Goffart
e135d4cccf
Merge remote-tracking branch 'origin/1.8'
2015-06-10 13:42:02 +02:00
Jenkins for ownCloud
d142c554d1
[tx-robot] updated from transifex
2015-06-10 02:18:40 -04:00
Klaas Freitag
c8cb604c18
Updater: Do a tray notification if a new update is available.
2015-06-09 08:35:15 +02:00
Klaas Freitag
5b65bbf8e5
App: Do a regular check for updates, currently hardcoded every two hours.
2015-06-09 08:35:15 +02:00
Lukas Reschke
449aa275d4
Use true instead time since it is more clear
2015-06-08 19:12:49 +02:00
Lukas Reschke
9fd45761a8
Add travis file for coverity_scan branch
...
All things pushed to the "coverity_scan" branch will now get build by Travis and the resulting binary is pushed to Coverity and analyzed automatically.
Since Coverity has a fair usage policy which allows us up to 8 builds per week with a maximum of 2 builds per day we cannot run this automatedly on every push. Which also doesn't make that much sense.
Currently this can be used by reating a "coverity_scan" branch and force-pushing the new code to analyze. If all went well the Travis build should pass and Coverity should display the new information (give it some time to process the build though). In Coverity the SHA of the processed build will be used as version number as well as descriptive text.
(we can automate this though in the future as well if we want that too)
This will fail at the moment on master since Qt4 builds are failing as per https://ci.owncloud.org/job/client-build-matrix-linux/ - probably something that should get fixed. 1.8 branch worked fine though.
2015-06-08 18:51:48 +02:00
Olivier Goffart
67f7892958
SocketAPI: Do not leak open DB or query
...
We could leak it in case of errors. Or when the folder is removed.
Make use of QSharedPointer to avoid leaks
2015-06-08 15:49:37 +02:00
Olivier Goffart
6df7551bdd
DiscoveryPhase: Fix the unlikely case the server resturns utf-8 in permissions
...
UTF-8 size might be bigger than the size of the QString
In that case we would end up with a non-nill terminated permissions.
2015-06-08 15:40:06 +02:00
Olivier Goffart
5dcb276376
csync: fix a few possible leak in error cases
2015-06-08 15:31:14 +02:00
Olivier Goffart
1b9d82679c
OwnSQL: fix initialisation of variables
2015-06-08 15:30:39 +02:00
Daniel Molkentin
69f2b2da7c
Bump version to 1.8.2 final
2015-06-08 14:10:08 +02:00
Daniel Molkentin
4000993200
Finish 1.8.2 ChangeLog
2015-06-08 14:06:57 +02:00
Olivier Goffart
2c6c21d753
AccountState: do not change the state when we stay connected
...
This would cause a full sync every 30 seconds.
2015-06-08 12:14:37 +02:00
Jenkins for ownCloud
34384e3613
[tx-robot] updated from transifex
2015-06-08 02:18:37 -04:00
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
