Dominique Fuchs
cb7b2a3dc6
Merge branch 'master' into qml-tray-menu
2019-10-30 17:19:18 +01:00
Dominique Fuchs
6135eb26ad
Finished (static) header design and hover effects
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-29 23:25:00 +01:00
Dominique Fuchs
7ed03f1f29
resolving conflict with current master
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-29 14:07:26 +01:00
Dominique Fuchs
5301477747
Merge branch 'master' into recipientnote
2019-10-29 12:58:14 +01:00
Dominique Fuchs
73667a5367
Updated vecto icons and names, disabled init position (breaks on multiple monitors on windows), integrated new icons in qml
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-29 08:13:05 +01:00
Camila San
1e43c29484
Add new qml tray icon.
...
This is a work in progress.
Signed-off-by: Camila San <hello@camila.codes>
2019-10-27 20:02:30 +01:00
Michael Schuster
8e8858178b
Merge branch 'master' into move-rtfiles
2019-10-27 17:49:22 +01:00
Michael Schuster
e54f127a06
Merge branch 'master' into lnx-domainname-desktopfiles
2019-10-27 17:30:48 +01:00
Michael Schuster
9618500975
fix tab spacing
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-27 17:25:50 +01:00
Michael Schuster
25076f2ddc
tab formatting (just a little more ;p)
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-27 17:03:23 +01:00
Dominique Fuchs
66912071a8
Merge branch 'syncjournal-del-prio' of https://github.com/nextcloud/desktop into syncjournal-del-prio
2019-10-27 16:56:07 +01:00
Dominique Fuchs
e9438549f4
tab formatting
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-27 16:55:37 +01:00
Dominique Fuchs
eff75a2059
Merge branch 'master' into move-rtfiles
2019-10-27 15:43:41 +01:00
Dominique Fuchs
d001d9d1a3
Merge branch 'master' into syncjournal-del-prio
2019-10-27 15:38:43 +01:00
Dominique Fuchs
7f764f8108
Added basic UI [WIP] for new tray window
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-27 15:19:20 +01:00
Sergey Zolotarev
9a11bef263
Fix duplicate items in Apps menu (a bug introduced in #1477 )
...
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2019-10-24 02:55:56 +06:00
Camila Ayres
3a310f93e0
Merge branch 'master' into qt-5.12.5-update-submodules
2019-10-22 14:31:27 +02:00
Michael Schuster
4d5dd0f49c
Merge branch 'master' into testSyncFileStatusTracker-winPath
2019-10-20 21:33:19 +02:00
Michael Schuster
a12164ad53
MSVC Fix for PR #1526 : Fix clang's variadic macro warnings
...
The recently merged #1526 caused the MSVC Builds on Windows to fail.
This patch sets the new CMake flag only if the compiler it not MSVC.
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-20 12:52:52 +02:00
Michael Schuster
abd50022d1
Update submodules for Qt 5.12.5 (qtmacgoodies)
...
Fetch the new submodule commits to get these fixes:
- Merge upstream: Retrieve the associated NSView more reliably: https://github.com/camilasan/qtmacgoodies/pull/1
- Bugfix for Qt 5.12.5 - Redraw the ToolBar: https://github.com/camilasan/qtmacgoodies/pull/2
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-19 05:04:41 +02:00
Michael Schuster
8950417d37
Merge branch 'master' into clang-variadic-macro-warning-fix
2019-10-19 04:37:42 +02:00
Michael Schuster
4f1e4e149f
Merge branch 'master' into fix/too-low-default-poll-interval
2019-10-19 03:40:21 +02:00
Johannes Lorenz
8c334a1f43
Fix clang's variadic macro warnings
...
Using variadic macros like `qCWarning()` without any parameter for "..."
is a GNU extension, which causes a lot of `clang` warnings:
```
desktop/src/common/ownsql.cpp:74:24: warning: must specify at least one
argument for '...' parameter of variadic macro
[-Wgnu-zero-variadic-macro-arguments]
qCWarning(lcSql) << "Error:" << _error << "for" << filename;
^
/usr/include/qt/QtCore/qloggingcategory.h:140:11: note: macro 'qCWarning'
defined here
^
```
This patch tells `clang` to be silent.
Signed-off-by: Johannes Lorenz <j.git@lorenz-ho.me>
2019-10-18 05:25:05 +02:00
Michael Schuster
32bb31a417
Merge branch 'master' into feature/remote-wipe
2019-10-17 22:05:20 +02:00
Camila San
19491ff85f
Once client gets 401/403 from the server, check if remote wipe was requested.
...
- When the the users logs because of 401 or 403 errors, it checks if the
server requested the remote wipe. If yes, locally deletes account and folders
connected to the account and notify the server. If no, proceeds to ask the
user to login again.
- The app password is restored in the keychain.
- WIP: The change also includes a test class for RemoteWipe.
Signed-off-by: Camila San <hello@camila.codes>
2019-10-17 20:11:31 +02:00
Camila San
8546d53b05
Merge the list of ignored files/symlinks into one Activity notification.
...
Signed-off-by: Camila San <hello@camila.codes>
2019-10-17 18:45:33 +02:00
Camila Ayres
6c56811636
Merge branch 'master' into testSyncFileStatusTracker-winPath
2019-10-17 13:37:01 +02:00
Michael Schuster
ade50d0b92
Pick from upstream: Update qtmacgoodies for an OSX crash fix #6930
...
With Qt 5.12.5 this OC crash also applies to the Nextcloud Desktop Client on macOS.
For reference please see:
- https://github.com/owncloud/client/issues/6930
- 0dc7bc3328
For the required changes in the qtmacgoodies submodule see:
https://github.com/camilasan/qtmacgoodies/pull/1
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-17 04:29:33 +02:00
Michael Schuster
e8fc3ecf28
Merge branch 'master' into quit-wizard-fix
2019-10-16 04:43:41 +02:00
Michael Schuster
c8b4145214
Add a 'Content-Length: 0' header to initial POST requests
...
The webserver lighttpd rejected POST requests without a Content-length
header with "411 Length Required".
See: https://github.com/nextcloud/desktop/issues/1473
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-10 05:17:22 +02:00
Michael Schuster
04a9f0313a
Merge pull request #1481 from asapelkin/for_loop_optimization
...
Avoiding copying in range-based loops
2019-10-10 01:30:40 +02:00
Michael Schuster
4ddc606361
Merge branch 'master' into for_loop_optimization
2019-10-10 01:12:57 +02:00
Michael Schuster
836c748cd9
Merge branch 'master' into trexcl
2019-10-10 01:12:48 +02:00
Michael Schuster
0d349d54b4
Fix outdated link to server admin docs
...
Sets the target version from "15" to "latest" and removes
"index.html" because this could get obsolete in the future too.
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-10 01:03:46 +02:00
Michael Schuster
29123f4d9d
Merge branch 'master' into master
2019-10-10 00:45:04 +02:00
Dominique Fuchs
c1cd308940
Merge branch 'master' into quit-wizard-fix
2019-10-09 09:18:26 +02:00
Sergey Zolotarev
4bba498229
Replace isQuitting flag with disconnect()
...
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2019-10-09 11:07:00 +06:00
Dominique Fuchs
7750d2198d
Don't need a second if for non-Windows, using Qt macro for platform check
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-08 08:44:08 +02:00
Dominique Fuchs
f993e7c555
Fixed typo preventing successful path rename on Win and modified ASSERT for Window path styles
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-08 08:31:31 +02:00
asapelkin
6b71e4ec6f
Merge branch 'master' into for_loop_optimization
2019-10-07 15:31:01 +03:00
Dominique Fuchs
75444e44b9
Merge branch 'master' into master
2019-10-07 09:45:22 +02:00
asapelkin
17f39bd09d
little loops optimization
...
Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
2019-10-07 01:29:55 +03:00
Sergey Zolotarev
eaddc55267
Don't run connection wizard when quitting the application
...
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2019-10-05 22:38:47 +06:00
Sergey Zolotarev
f6b6765424
Prevent jumping of tray menu
...
Instead of adding the "Apps" menu after the apps are fetched, add it
from the start (together with other actions) but in a disabled state,
and enable it after the apps data is ready.
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2019-10-05 22:10:35 +06:00
Michael Schuster
7deb74cc22
Merge branch 'master' into show-server-vers
2019-10-05 00:44:08 +02:00
rakekniven
b25aa99de7
Fixed grammar
...
Reported at Transifex.
See https://www.transifex.com/nextcloud/nextcloud/translate/#nl/client/182396083
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2019-10-04 08:10:55 +02:00
Daniel Kesselberg
4114fe68c9
Add server info to menu
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-01 16:16:20 +02:00
Camila Ayres
7f19d5669b
Merge branch 'master' into fix-ldap-display-name
2019-10-01 12:34:39 +02:00
Felix Eckhofer
28da954aad
Fix typo
...
Signed-off-by: Felix Eckhofer <felix@eckhofer.com>
2019-10-01 08:25:24 +02:00
Camila San
481d8d3a0b
Checks if exclude file is empty before creating the regular expressions.
...
The default file created by the application it is not empty.
Signed-off-by: Camila San <hello@camila.codes>
2019-09-30 20:38:56 +02:00