Markus Goetz
3b59960fb3
Fix Qt4 build (SSL sessionTicket())
2015-08-11 13:53:21 +02:00
Markus Goetz
bd71fdc388
SslButton: Fix harder #3534 #3536
2015-08-11 12:18:25 +02:00
Markus Goetz
6110a99afc
SyncEngine: Fix previous cherry-pick
2015-08-11 11:35:12 +02:00
Christian Kamm
0dd20ccf3b
Remove deleted accounts from tool bar #3583
2015-08-11 11:33:04 +02:00
Daniel Molkentin
9698324c4e
More color scheme adjustments
2015-08-11 11:32:00 +02:00
Olivier Goffart
9dcce01e54
csync: ignore files/folder for which stat fails
...
instead of pretending it suicceed and not recursing in it.
This fixes a bug in which a folder with a too long name would be properly
created, then removed on the server in the next sync.
(cherry picked from commit 4bbf7669091cde7ec726b1708d8c54427b68f016)
Conflicts:
csync/src/csync.h
csync/src/csync_exclude.h
csync/src/csync_update.c
2015-08-11 11:17:20 +02:00
Christian Kamm
e0cf5c3920
Progress: Robust against bad 'completed' values #3579
...
Increasing the 'total' for bogus values of 'completed' is a bad idea.
2015-08-11 10:44:27 +02:00
Christian Kamm
3ab49143e1
Progress: Guard against decreasing progress #3579
...
Ensure that progress going backwards won't lead to outrageous
transfer speeds.
2015-08-11 10:38:04 +02:00
Jenkins for ownCloud
cfb16a6eef
[tx-robot] updated from transifex
2015-08-11 02:18:58 -04:00
Daniel Molkentin
fad9a3056c
Settings dialog: Try to improve adherance to high contrast schemes
...
Adresses #3582
2015-08-11 07:42:52 +02:00
Christian Kamm
0176ffd25d
FolderWatcher win: Skip unneeded notifications #3353
2015-08-10 14:59:05 +02:00
Daniel Molkentin
385c3882a7
Fix regression in PassiveUpdateNotifier
...
When overriding backgroundCheckForUpdates(), also call the original
implementation.
2015-08-10 14:26:57 +02:00
Christian Kamm
85f5424a13
SocketAPI: Show excluded hidden files as ignored #2086
2015-08-10 13:41:19 +02:00
Christian Kamm
3c82f66219
Windows: Limit tray tooltip length #3412
2015-08-10 13:23:31 +02:00
Lukas Reschke
9bbf9b86b7
Use HTTPS links
...
No need to have an additional redirect
2015-08-10 12:30:33 +02:00
Daniel Molkentin
3ce210f298
Merge pull request #3578 from owncloud/LukasReschke-patch-1
...
Use HTTPS links
2015-08-10 12:29:23 +02:00
Lukas Reschke
f74053f8ed
Use HTTPS links
...
No need to have an additional redirect
2015-08-10 12:15:45 +02:00
Jocelyn Turcotte
854bfb870d
Revert "Silence verbose cmake policy warnings on Windows"
...
This causes an error since those policies aren't known by
2.8.12, so better seeing those warnings on Windows for now.
This reverts commit 4441d3b342
2015-08-10 11:57:05 +02:00
Christian Kamm
a6d70c9c63
IgnoreEditor: Rename confusing checkbox
...
The label was the negation of its name.
2015-08-10 11:15:39 +02:00
Christian Kamm
c2c924931b
Ignore hidden: Default to enabled #2086
...
It was 'false' for migrated folders and folders created by the OC
setup wizard.
2015-08-10 11:15:39 +02:00
Daniel Molkentin
6b4a9d9cd9
Settings dialog: improve layout a bit
2015-08-10 10:51:05 +02:00
Jocelyn Turcotte
55e55b0806
Windows: Fix the progress bar with high contrast themes #2654
...
Setting the palette seems to interfere with Qt's Windows Vista theme
and this isn't set on the QStyleOptionProgressBarV2 by QProgressBar.
2015-08-10 09:55:31 +02:00
Jocelyn Turcotte
4441d3b342
Silence verbose cmake policy warnings on Windows
2015-08-10 09:55:29 +02:00
Jenkins for ownCloud
147c59c6d8
[tx-robot] updated from transifex
2015-08-10 02:18:43 -04:00
Jenkins for ownCloud
f36b95d6b0
[tx-robot] updated from transifex
2015-08-10 01:15:25 -04:00
Jenkins for ownCloud
0ca5f4a382
[tx-robot] updated from transifex
2015-08-09 02:18:46 -04:00
Jenkins for ownCloud
60863b14bb
[tx-robot] updated from transifex
2015-08-08 02:18:35 -04:00
Jenkins for ownCloud
06515d4e96
[tx-robot] updated from transifex
2015-08-08 01:15:24 -04:00
Olivier Goffart
b967359a74
Account setting: properly disable the 'add account' button #3571
...
When upgrading from 1.8 and syncing the whole account, then the
remote folder is empty
2015-08-07 14:32:51 +02:00
Olivier Goffart
ae7b2509a5
Selective sync: When applying selective sync, put new folder that were just checked in the white list
...
Issue #3560
Otherwise the just checked folder will be chacked again for their size.
We do not want that.
2015-08-07 13:37:52 +02:00
Olivier Goffart
8b52a121bb
AccountSettings: Show the wizard to add an account when the last account was deleted #3564
2015-08-07 13:15:02 +02:00
Daniel Molkentin
df625f0d49
Make version check test conditional for now
2015-08-07 12:42:18 +02:00
Olivier Goffart
68cff5cd10
Merge branch '2.0'
2015-08-07 11:31:44 +02:00
Daniel Molkentin
b906c70a86
ownSql: Do not use sqlite3 method not present in older version
...
Was only used for debug output anyway and broke RHEL/CentOS6
2015-08-07 11:14:14 +02:00
Olivier Goffart
2a4396fbdb
Fixup ce5be89a18
2015-08-07 11:05:04 +02:00
Daniel Molkentin
9ecd892a48
Editorial changes to Changelog
2015-08-07 09:29:55 +02:00
Daniel Molkentin
c7353fc382
Revert "win32: libwebp has been bumped to version 5"
...
This reverts commit 18efb21157
2015-08-07 09:21:08 +02:00
Jenkins for ownCloud
b8b4e2c094
[tx-robot] updated from transifex
2015-08-07 09:03:56 +02:00
Jenkins for ownCloud
ee75d37983
[tx-robot] updated from transifex
2015-08-07 02:18:51 -04:00
Daniel Molkentin
ecf545a0b9
Updater: update Linux updater code to work with changes in master
...
master moved much of the responsibility of the updating process
to the updater class.
This also fixes a build failure
2015-08-06 19:34:23 +02:00
Daniel Molkentin
aade9111d4
ownCloud Client 2.0 beta1
2015-08-06 18:20:07 +02:00
Markus Goetz
7c52e925b9
Propagator: Use fetchAndAddAcquire to get parallelism
2015-08-06 18:13:48 +02:00
Markus Goetz
b5edc635a1
Windows: Don't use UTF-8 arrows #3095
2015-08-06 18:08:05 +02:00
Daniel Molkentin
6a20ea5e73
Merge pull request #3472 from owncloud/linux_restart_on_new_version
...
On Linux restart if new version is found on disk
2015-08-06 17:47:10 +02:00
Jenkins for ownCloud
cad2d639af
[tx-robot] updated from transifex
2015-08-06 11:37:16 -04:00
Daniel Molkentin
5657d4ec1b
NSIS: Remove (almost untranslated) Slovak tr for now
2015-08-06 17:36:53 +02:00
Daniel Molkentin
4b9352f291
Fix codepages for Czech and Slovak
2015-08-06 17:36:53 +02:00
Markus Goetz
2d49f4c844
AbstractNetworkJob: Make sure to print URL on timeout
2015-08-06 17:33:33 +02:00
Markus Goetz
71c9e4da16
Update ChangeLog for 2.0
...
Info taken from commits
(danimo's taken from github issues)
2015-08-06 17:28:52 +02:00
Daniel Molkentin
50195ce4be
Revert "Update NSIS translations"
...
This reverts commit 47a8fbb07e
2015-08-06 17:19:37 +02:00
