Jenkins for ownCloud
ad917d038f
[tx-robot] updated from transifex
2018-04-29 02:18:35 +02:00
Jenkins for ownCloud
7710b66498
[tx-robot] updated from transifex
2018-04-28 02:18:31 +02:00
Jenkins for ownCloud
0a14fce639
[tx-robot] updated from transifex
2018-04-27 02:18:33 +02:00
Christian Kamm
642ed1bb70
Merge remote-tracking branch 'origin/master' into 2.5
2018-04-26 10:16:45 +02:00
Christian Kamm
3f9c10e641
Proxy settings: Fix bad behavior with empty host
...
Fixes f6a075ef54#5885
When no host is given it shouldn't just *appear* that there is no
proxy, there actually shouldn't be a proxy set then.
2018-04-26 10:07:05 +02:00
Jenkins for ownCloud
4327fede32
[tx-robot] updated from transifex
2018-04-26 02:18:37 +02:00
Markus Goetz
8b45fbfdab
Share Dialog: Disable workaround for macOS too #6185
2018-04-25 19:32:01 +02:00
Olivier Goffart
2696c520bd
Wizard: fix a layout glitch
2018-04-25 14:47:56 +02:00
Olivier Goffart
1ab3a9fc13
Nautilus: Fix Python3 and remove many debug
...
Use b'\n' in the call to rfind, as the _remainder is bytes, not a string.
Remove most of the debug message which happens during normal operation.
They are mostly spamming the nautilus console, and can also cause bug
as they may throw exception in case of wrong encoding.
Relates to issue: #6406
2018-04-25 13:58:45 +02:00
Markus Goetz
9d4ece4b3a
ShareDialog: macOS grey odditiy #5774
2018-04-25 13:56:19 +02:00
Christian Kamm
e9db52a378
Issues: Show link to conflicts doc if there are some #6396
...
The link url is themed.
2018-04-25 13:31:49 +02:00
Christian Kamm
fc73cde10c
Merge branch 'master' into 2.5
2018-04-25 12:30:31 +02:00
Christian Kamm
44071f0892
Nautilus shell integration: Print python version on startup #6406
2018-04-25 12:26:18 +02:00
Jenkins for ownCloud
529649254b
[tx-robot] updated from transifex
2018-04-25 02:18:37 +02:00
Samuel Alfageme
1ec5d5b0cf
Fix 'client/doc/conffile.rst:36: ERROR: Malformed table'
2018-04-24 16:13:45 +02:00
Olivier Goffart
7053a9c3d9
Update installing.rst
2018-04-24 13:33:56 +02:00
Jürgen Weigert
5ccf5fd9a1
update supported linux platforms
2018-04-24 13:33:56 +02:00
Adrien
6520263244
Fix #6394
2018-04-24 13:27:33 +02:00
Christian Kamm
9555f8d75c
Show a tray message when a folder watcher becomes unreliable #6119
2018-04-24 13:06:50 +02:00
Olivier Goffart
073de7a8e0
Merge remote-tracking branch 'origin/2.5'
2018-04-24 13:02:37 +02:00
Thomas Boerger
397206134f
Dropped .travis.yml from repo
2018-04-24 12:54:22 +02:00
Thomas Boerger
a12986a952
Build clang and gcc on drone
2018-04-24 12:54:22 +02:00
Thomas Boerger
5270b76520
Dropped .travis.yml from repo
2018-04-24 12:52:27 +02:00
Thomas Boerger
f0dae03d06
Build clang and gcc on drone
2018-04-24 12:52:27 +02:00
Christian Kamm
4268f793fb
Share dialog: Don't hide account settings before showing #6185
...
At least on windows and linux. OSX would need tests first since
the addition was originally supposed to help with OSX problems,
see #3783 .
2018-04-24 10:09:23 +02:00
Olivier Goffart
1ef7ca1b09
sqlite: Update bundled version to 3.23.1
...
For OS X and Windows.
2018-04-24 09:16:06 +02:00
Jenkins for ownCloud
dd5265a5f8
[tx-robot] updated from transifex
2018-04-24 02:18:31 +02:00
Jenkins for ownCloud
84a692435e
[tx-robot] updated from transifex
2018-04-23 15:28:10 +02:00
Olivier Goffart
c1fb5e6b20
Wizard: Move the 'Skip folder configuration' in a radio button
...
Issue #3664
2018-04-23 13:29:01 +02:00
Olivier Goffart
e0b554ada9
Fix a bunch of warning with clang
...
The option -Wno-discarded-qualifiers only exists with GCC, clang warns that
it has no effects.
Also it warns when some virtual fuction are marked with override but not
all of them.
2018-04-23 13:22:01 +02:00
Christian Kamm
1508b562ad
SocketAPI: Allow opening share dialog if contents still syncing #4608
...
With the previous changes the "Share..." action was shown but it didn't
work yet.
2018-04-23 12:24:32 +02:00
Christian Kamm
4390bbf838
SocketAPI: Remove SHARE_STATUS
...
It was never used by a shell integration.
2018-04-23 12:24:32 +02:00
Jenkins for ownCloud
a4d049464b
[tx-robot] updated from transifex
2018-04-23 02:18:31 +02:00
Jenkins for ownCloud
0073b7581f
[tx-robot] updated from transifex
2018-04-22 02:18:33 +02:00
Jenkins for ownCloud
1ce3e4c27a
[tx-robot] updated from transifex
2018-04-21 02:18:32 +02:00
Markus Goetz
69e5d55956
Logging: Avoid the word "Error"
...
The old code printed "QNetworkReply::NoError"
2018-04-20 15:26:34 +02:00
Christian Kamm
7cce30942e
CMake: Add a default placeholder_suffix
...
To make themes work that don't define it explicitly.
2018-04-20 15:08:08 +02:00
Jenkins for ownCloud
71db7fef77
[tx-robot] updated from transifex
2018-04-20 02:18:32 +02:00
Markus Goetz
b6f1ba38a6
Placeholders: Support for macOS #6290
2018-04-19 19:24:29 +02:00
Christian Kamm
f6a075ef54
Network settings: If no proxy host given, show "no proxy" #5885
...
What happens internally is that a proxy without a hostname gets treated
as no proxy.
2018-04-19 17:04:56 +02:00
Olivier Goffart
c5701f635a
Fix test: QTemporaryDir::filePath was added in Qt 5.9
2018-04-19 17:01:31 +02:00
Olivier Goffart
2bf1f27c80
More Button: Use SVG and fix size so it renders good in highdpi
...
When the more button was changed from using a text to an icon,
the size computation was not adjusted proerly to that of a button
with an icon.
And using svg allows it to be rendered correctly with high-dpi
It looks much much nicer now
2018-04-19 16:44:11 +02:00
Christian Kamm
a5271b529b
LocalDiscoveryTracker: Add unit test #6120
2018-04-19 10:58:46 +02:00
Christian Kamm
7c558394c1
LocalDiscoveryTracker: Separate from Folder and move to libsync
...
To allow relevant code to be closer together and for testing in
unittests without having to get a gui Folder.
See #6120
2018-04-19 10:58:46 +02:00
Jenkins for ownCloud
d2d5439c5c
[tx-robot] updated from transifex
2018-04-19 02:18:39 +02:00
Olivier Goffart
c82aa10a66
ChangeLog: update for 2.5
2018-04-18 15:04:56 +02:00
Olivier Goffart
38f1c5b7d2
Logger: Guard zlib usage by ZLIB_FOUND
...
Similar to the use for the checksum.
I know that zlib is required in principle, but i don't have it
in one of my test building environment, and it is easier to just
disable it.
2018-04-18 15:01:30 +02:00
Christian Kamm
985a657f48
Merge remote-tracking branch 'origin/master'
2018-04-18 11:14:08 +02:00
Christian Kamm
9e8464e114
Merge branch 'placeholder-prototype'
2018-04-18 11:02:53 +02:00
Olivier Goffart
02b818af04
Download: Use the <s:message> from the reply in the error message if any
...
Issue: #6459
2018-04-18 10:57:16 +02:00
Jenkins for ownCloud