Commit graph

7175 commits

Author SHA1 Message Date
Dominique Fuchs
b32310b8a6 Gigantic ton of changes and deletions: ActivityListModel, tray GUI, Account logic.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2020-01-03 13:09:29 +01:00
Dominique Fuchs
556a1a5ef2 Added ActivityModel in new tray backend, implemented as delegate in UI
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2020-01-02 10:39:53 +01:00
Dominique Fuchs
36467c1e3a Added folder search for User instance, added open folder button connection
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2020-01-02 09:55:37 +01:00
Dominique Fuchs
d4b334636e Fall back to primary screen on QT version < 5.10 instead of icon position detection
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2020-01-02 08:56:07 +01:00
Dominique Fuchs
7653c5fa60 Fix merge conflict
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2020-01-02 08:43:34 +01:00
Dominique Fuchs
44bfc79caa Implemented platform agnostic tray window positioning logic
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-30 14:14:28 +01:00
Dominique Fuchs
6f8ffc0357 Backend code separation & structure cleanup
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-30 11:52:07 +01:00
Dominique Fuchs
bb45a5f67e Added popup show/hide logic
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-30 11:39:21 +01:00
XNG
314c00a8b7 apply http2 qt resend patch from owncloud
Signed-off-by: XNG <Milokita@users.noreply.github.com>
2019-12-25 13:59:15 +08:00
Michael Schuster
2b2810511d
KeychainChunk: Fix error handling in ReadJob::slotReadJobDone
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 12:17:43 +01:00
Michael Schuster
e07859fb3c Fix date in ActivityWidget and remove unnecessary string conversion
The local date and time value was converted into a string, just to be converted
into another string, to be converted to a value once again, returning zero as
the result. This caused the widget to always display "now".

Looks like this was a simply copy and paste mistake from this line in
ActivityListModel::slotActivitiesReceived:

a._dateTime = QDateTime::fromString(json.value("date").toString(), Qt::ISODate);

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 08:53:14 +01:00
Michael Schuster
9b034a2eb0 Heavy refactoring: Windows workaround for >= 4k (4096 bit) client-cert SSL keys and large certs
With QtKeychain on Windows, storing larger keys or certs in one keychain entry causes the
following error due to limits in the Windows APIs:
    Error: "Credential size exceeds maximum size of 2560"

This fix implements the new wrapper class KeychainChunk with wrapper jobs ReadJob and WriteJob
to encapsulate the QKeychain handling of ReadPasswordJob and WritePasswordJob with binaryData
but split every supplied keychain entry's data into 2048 byte chunks, on Windows only.

The wrapper is used for all keychain operations in WebFlowCredentials, except for the server password.

All finished keychain jobs now get deleted properly, to avoid memory leaks.

For reference also see previous fixes:
- https://github.com/nextcloud/desktop/pull/1389
- https://github.com/nextcloud/desktop/pull/1394

This should finally fix the re-opened issue:
- https://github.com/nextcloud/desktop/issues/863

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:47:35 +01:00
Michael Schuster
bd9652b24c Flow2AuthWidget: Minor fixes and improvements
- Improve status messages

- Add a counter to make sure that "Link copied to clipboard." is visible for
  three seconds and to not enable the buttons too early

- Add more space between buttons and status

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
8b5f09305c Flow2: Refactor UI into Flow2AuthWidget only and improve Flow2Auth
- Flow2AuthCredsPage:
  - Remove .ui file and embed Flow2AuthWidget into layout

- Flow2AuthWidget:
  - Make use generic for Flow2AuthCredsPage and WebFlowCredentialsDialog
  - Fix _errorLabel to render HTML tags instead of dumping them as plain text

- Flow2Auth:
  - Explicitly start auth with startAuth(account) instead of using constructor
  - Take control of copying the auth link to clipboard
  - Request a new auth link on copying, to avoid expiry invalidation
  - Use signals statusChanged() and result() to be more verbose (status, errors)
  - Change timer invocation and add safety bool's to avoid weird behaviour when
    the user triggers multiple link-copy calls (fetchNewToken)

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
6d033f2964 Add new HeaderBanner class for WebFlowCredentialsDialog
New widget on top of the layout, based on Qt's own modern wizard header banner.

This should improve the user's perception of the dialog.

Encapsulate the existing layout into a container layout to allow the banner taking
the full width of the dialog.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
0bcac1882a Make WebFlowCredentialsDialog cancellation- and deletion-safe
- Add new signal to let WebFlowCredentials know and emit asked() to also
  tell AccountState that the user won't authenticate, and triggering
  log-out state in the settings window.

- Use deleteLater() to safely delete WebFlowCredentialsDialog, so
  that Qt can free it at the right time and without crashes.
  Do the same with it's _webView and _flow2AuthWidget on closeEvent().

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
b6b04aeff8 WebFlowCredentialsDialog: Bring re-auth dialog to top (raise) on error
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
a69aed80e6 Flow2: Make ProgressIndicator's background-aware (Dark-/Light-Mode switching)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
e81f972270 Flow2: Add poll status text, ProgressIndicator and countdown timer
Also enable / disable buttons during polling.

This aims to make the authentication status more transparent and should avoid the
impression that the client is perhaps doing nothing.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
542590db7c Small fixes and code cleanup
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
e04aae94bc Flow2: Poll for re-auth result upon WebFlowCredentialsDialog window activation
Since the default remote poll interval has been re-raised recently to 30 seconds,
the delay between clicking "Grant access" in the browser and fetch and showing success
in the dialog may seem erroneous to the users and tempt them to click "Re-open browser"
again, causing the whole login process to restart.

This commit implements an event handler to pass the dialog's window activation
event down to the Login Flow v2 widget, in order to allow it to poll earlier.

See previous commits for dependent implementation details.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
aa18667905 WebFlowCredentialsDialog: Bring re-auth dialog to top (raise) upon showing SettingsDialog
Purpose: The floating re-auth windows of the WebFlowCredentialsDialog often get hidden behind
the SettingsDialog, and the users have to minimize a lot of other windows to find them again.

See previous commit for dependent implementation details.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
addb27a085 Add helper slots and signals to catch SettingsDialog's window activation events
Signal the SettingsDialog's window activation event down to ownCloudGui and Application,
so that other classes can hook in to get notified when the SettingsDialog is being shown
again.

This approach has been chosen because we otherwise would have to deal with new instance
pointers of the current SettingsWindow - but Application is already there ;-)

Purpose: The floating re-auth windows of the WebFlowCredentialsDialog often get hidden
behind the SettingsDialog, and the users have to minimize a lot of other windows to find
them again. This commit implements the preparation for the upcoming fix commit.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
be10d5200f Flow2: Use ownCloudGui::raiseDialog to bring account setup wizard to top (raise) on auth result
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
e8348612b4 Flow2: Poll for auth result upon account setup wizard window activation
Since the default remote poll interval has been re-raised recently to 30 seconds,
the delay between clicking "Grant access" in the browser and fetch and showing success
in the wizard may seem erroneous to the users and tempt them to click "Re-open browser"
again, causing the whole login process to restart.

This commit implements an event handler to pass the wizard's window activation
event down to the Login Flow v2 page, in order to allow it to poll earlier.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
3a160a4dce Flow2: Bring account setup wizard to top (raise) on auth result
Show and raise the wizard on success / error in the Login Flow v2 auth.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:46:57 +01:00
Michael Schuster
ccd20f0172 Fix issue #1237: White text on almost-white background
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:44:18 +01:00
Michael Schuster
c03bc8540c Fix folder opening in ActivityListModel
After fixing the crash in the previous commit, double-clicking on Activity list rows still didn't work.

This fix partly reverts commit 8546d53b05 in ActivityItemDelegate::PathRole
of ActivityListModel::data, but adds a new check for relPath's existence in line 74.

I'm assuming the previous change there has been done to shorten the code and avoid opening the user's home
folder upon clicking entries which file value is "App Password". The new path-check takes care of that too now.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:42:01 +01:00
Michael Schuster
003acb7254 Fix crash in ActivityListModel (fixes #1693)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:42:01 +01:00
Michael Schuster
b961b683d6 Show date and time in activity log (fixes issue #1683)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-24 07:40:42 +01:00
Michael Schuster
a7dade979c Fix build (missing refactoring)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
3a2caf61e5 Mac and high-dpi displays: Add workaround in ActivityItemDelegate to show full uncropped activity's actionText and timeText
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
b5ed16088a Make all ProgressIndicator's background-aware (Dark-/Light-Mode switching)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
e4a20b9e72 Make OwncloudWizard and its pages background-aware (Dark-/Light-Mode switching)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
37e5fe786f Remove unnecessary string translation and copy in ActivityItemDelegate
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
643995528b Remove unnecessary breaks in ActivityListModel
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
ecd17f2ea2 Make ActivityItemDelegate background- and selection-aware (Dark-/Light-Mode switching)
Also implement cached member icons in ActivityListModel and return their enums to
ActivityItemDelegate instead of always recreating them for each call to paint().

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
bf0bf2c1b6 Refactor ActivitySettings: Rename member variable ui to _ui
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
acedf362b6 Make AccountSettings and ActivitySettings background-aware (Dark-/Light-Mode switching)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
3b580eeca7 Change error link colour in AccountSettings::showConnectionLabel
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
6adfff1f13 Add new Theme helper method to custom-colourize links
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
7d542d7989 Change Dark Mode link colour
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-19 22:07:30 +01:00
Michael Schuster
cc21d175f1 Fix Activity List: Add check to avoid first empty entry
Add checks to ActivityListModel::combineActivityLists in order to avoid adding
empty Activity entries to the _finalList.

The previous implementation always added an empty entry to the top of the list because
_notificationIgnoredFiles was appended without checking (_listOfIgnoredFiles.size() > 0).

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-18 03:29:54 +01:00
Michael Schuster
b754eacd74 macOS: Rename 'Explorer' appropriately on non-Windows
- Rename it to 'Finder' on macOS.
- This way we also avoid having the whole string re-translated on Transifex.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-09 21:37:21 +01:00
Michael Schuster
7ce8a6a201 Make the ShareDialog background-aware (Dark-/Light-Mode switching)
Use customizeStyle() to change link colours, icons and pixmaps in the ShareDialog and notify
it's widgets via slots.

TODO - known issue (macOS):
- The background and font colours in the ShareUserLine widget still stay the same.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-09 21:37:21 +01:00
Michael Schuster
789a2a7ae3 Make SettingsDialog background-aware (Dark-/Light-Mode switching)
Use customizeStyle() to change link colours in the SettingsDialog and notify it's widgets via slots.

Also modify the background colour of the errors messages in AccountSettings::showConnectionLabel
to always use an appropiate colour for it's custom-defined background.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-09 21:37:21 +01:00
Michael Schuster
be4fc6b887 Implement and move some colour-aware helper methods into the Theme class
This introduces a new method to change the colours in the links in QLabel's.
Utilizes a custom crafted RegEx function to replace already-coloured links.

Moved code is based on stuff from the SettingsDialog class.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-09 21:37:21 +01:00
Michael Schuster
2dae31486a Pick from upstream: Fix too low contrast when tab is selected
The low contrast is also a problem with the Dark Mode on macOS.

For reference please see:
- Commit: 413ef5e96d
- Issue: https://github.com/owncloud/client/issues/7512

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-09 21:37:21 +01:00
Michael Schuster
71f66c6229 Fix SSL-button's info background color for Dark Mode
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-09 21:37:21 +01:00
Michael Schuster
b4f926ded7 Remove submodule qtmacgoodies and the MacSettingsDialog class
Reverts back to the SettingsDialog class because of bugs and glitches with
more recent Qt versions (Qt 5.12) and with the macOS Dark Mode.

See upstream: https://github.com/owncloud/client/pull/7492

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-09 21:37:21 +01:00
Dominique Fuchs
438a445353 Merge remote-tracking branch 'origin/master' into qml-tray-menu 2019-12-09 06:52:52 +01:00
Dominique Fuchs
6a04fe8ab6 Remove init.qml from CMakeLists and resource file
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-09 06:43:20 +01:00
Dominique Fuchs
c45d2212a5 Removal of init.qml plus minor fixes
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-08 20:18:03 +01:00
Dominique Fuchs
66bfccc738 Replaced .engine() by pointer access b/c of backward compatibility
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-08 13:18:46 +01:00
Dominique Fuchs
ae7eddf7c9 Fixed inconsistent module import versions (based on Qt 5.9)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-08 11:32:22 +01:00
Michael Schuster
5869b93acb Fix deleteKeychainEntries: Stay consistent with job->setInsecureFallback(false)
We never fall back to the insecure variant in the whole codebase, so don't do it here.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-08 02:47:22 +01:00
Michael Schuster
b15eb27aa9 Fix Windows key-chunk deletion (too paranoid)
Clear the key chunk buffer, but don't set _clientSslKeyChunkCount to zero because we need it later for deleteKeychainEntries

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-08 02:47:22 +01:00
Michael Schuster
336b64a569 Fix member variable name from last refactoring (Windows code)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-08 02:47:22 +01:00
Michael Schuster
6a49e787bb Fix Remote Wipe keychain storage
In certain cases don't write the app password in Account::writeAppPasswordOnce:
- id() is empty: This always happend once the Account Wizard showed the folder selection
- appPassword is empty: Caused by Logout -> Relaunch, preventing remote wipe on relaunch

Implement some logging to ease debugging in the future.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-08 02:47:22 +01:00
Michael Schuster
0c5f4a1525 Remote Wipe: Implement hack to allow deleting all keychain entries (SSL certs & keys)
Client SSL certificates and keys cannot be deleted at this time because there is
no UI for selecting them on re-login.

We introduce this dirty hack here, to allow deleting them upon Remote Wipe.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-08 02:47:22 +01:00
Michael Schuster
6ef9f3cc26 Refactoring: Windows workaround for >= 4k (4096 bit) client-cert SSL keys
WebFlowCredentials:
- Remove _clientSslCaKeyWriteQueue and simply use _clientSslKeyChunkBufferPEM
- Store key's sub-chunks in slots with "." (dot) suffix
- Implement deletion of the key chunks in WebFlowCredentials::deleteKeychainEntries
- Remove spaces in log messages
- Improve code readability

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-08 02:47:22 +01:00
Michael Schuster
72be80cbd9 Windows: Workaround for storing >= 4k (4096 bit) client-cert SSL keys
With QtKeychain on Windows, storing larger keys in one keychain entry causes the
following error due to limits in the Windows APIs:
  Error: "Credential size exceeds maximum size of 2560"

To avoid overhead on the other platforms and balance code duplication, this
approach puts some read- and write-parts into Windows-only defines.

For reference also see previous fixes:
- https://github.com/nextcloud/desktop/pull/1389
- https://github.com/nextcloud/desktop/pull/1394

This (again) fixes the re-opened issue:
- https://github.com/nextcloud/desktop/issues/863

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-08 02:47:22 +01:00
Michael Schuster
877fd7abb9 Fall back to old login flow on GS as this is not yet ready (#2: re-auth)
This commit ensures that the check also occurs on re-authorization in case
the user gets logged out.

See: https://github.com/nextcloud/desktop/pull/1644

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-12-06 21:03:01 +01:00
Roeland Jago Douma
363e62f8fa Fall back to old login flow on GS as this is not yet ready
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-06 21:03:01 +01:00
David Kahles
9a3aa55b29 Compare QDateTime objects more efficient
There is no need to call toMSecsSinceEpoch() as QDateTime implements an
comparison operator itself. This is more efficient, because the
QDateTime comparison operator doesn't call localtime() in all cases. Thus, we
don't read /etc/localtime for every comparison. This improves
performance in some cases.

Signed-off-by: David Kahles <david.kahles96@gmail.com>
2019-12-06 16:17:53 +01:00
Dominique Fuchs
ab9897b397 Added frontend invokation to open local folder
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-06 14:50:34 +01:00
Dominique Fuchs
c18611d4af Finished account switch back- and frontend in tray menuwindow
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-05 11:38:29 +01:00
Dominique Fuchs
5eff8608fe Account swtich logic and UI updates
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-05 08:21:19 +01:00
Dominique Fuchs
3a4ca5e190 Working on account switching
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-04 16:19:42 +01:00
Dominique Fuchs
d1d1f9bb58 Connected AccountWizard with new account action in tray menu, minor fixes
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-04 14:19:23 +01:00
Dominique Fuchs
90ace3fedc Minor preps for c++ ActivityListModel impl. in QML
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-04 13:10:28 +01:00
Dominique Fuchs
4e0997dbdf Minor fixes and enhancements
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-04 08:06:56 +01:00
Dominique Fuchs
57084fbd3e WIP: working UserModel.cpp and account menu
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-03 22:15:25 +01:00
Dominique Fuchs
4478399282 More stuff regarding tray/UserModel.cpp
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-03 18:50:34 +01:00
Dominique Fuchs
53abf5a316 WIP: Building User/MenuModel backend for tray menu
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-03 17:25:11 +01:00
Joas Schilling
9ce2491d67 Use … instead of 3 dots
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-03 09:06:06 +01:00
Joas Schilling
ec637217f2 Fix some translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-03 09:06:06 +01:00
Joas Schilling
91a5395e1a Improve the translation of "Share via …"
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-03 09:06:06 +01:00
Dominique Fuchs
dac1c9b413 Avatar, full user name and server address now reflected in QML gui, provided by C++ backend
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-12-03 07:26:59 +01:00
Dominique Fuchs
c21e4f5982 Clean up test variable 2019-12-02 22:48:39 +01:00
Dominique Fuchs
478281d853 Restructures and refactorings: New systray class, handling of current user selection, integration of user information in tray window header 2019-12-02 22:45:14 +01:00
Dominique Fuchs
08d4c56886 WIP: Extending systray class, transitioning towas independent ActivityModel inclusion 2019-12-02 14:10:18 +01:00
Dominique Fuchs
03c0d8ba5a Minor preps for c++ ActivityListModel impl. in QML 2019-11-29 17:06:35 +01:00
Michael Schuster
76c7ab499f Use ReadPasswordJob::finished for ReadPasswordJob
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-29 13:53:52 +01:00
Michael Schuster
dcc84d3508 Fix remote wipe keychain storage (issue #1592)
The app password for the remote wipe was constantly being written in
WebFlowCredentials::slotFinished to the keychain, leading to unnecessary
write and log overhead on the system.

This fix introduces a check to only store the app password once in
a lifetime of the Account class. Also the method used to store the
password will be renamed from setAppPassword to writeAppPasswordOnce
to be more expressive.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-29 13:53:52 +01:00
Christoph Wurst
923abd8d0b Fix legal notice year
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-26 12:46:02 +01:00
Michael Schuster
fca7b32405
Merge pull request #1604 from nextcloud/rakekniven-patch-1
l10n: Remove string from Transifex resource
2019-11-14 03:22:29 +01:00
Michael Schuster
5131463644
Fix: Apply http2 patch from owncloud #1573 - only with Qt >= 5.8
Drone builds failed with Qt 5.7 and we introduce a new ifdef here
to avoid patching specifically for Ubuntu Xenial only.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-14 02:39:06 +01:00
rakekniven
e896c41ef9
l10n: Remove string from Transifex resource
Fix for #1578 

Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2019-11-13 18:03:22 +01:00
Camila Ayres
4efa282f80
Merge branch 'master' into issue_1351 2019-11-04 22:48:07 +01:00
Camila Ayres
94986877d8
Merge branch 'master' into master 2019-11-04 20:20:32 +01:00
Camila Ayres
a5365a6cce
Merge branch 'master' into master 2019-11-04 20:14:11 +01:00
Michael Schuster
b9ad82ceeb
Merge branch 'master' into fix-remote-wipe-proxy 2019-11-04 19:58:56 +01:00
Michael Schuster
6421397083
Fix updater message: Download link instead of "use the system's update tool"
Provide a download link to the new version instead of the confusing message that
users should use their "system's update tool to install it".

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-04 19:19:59 +01:00
Camila San
52ae354ca2 Fix remote wipe when a proxy is configured.
Signed-off-by: Camila San <hello@camila.codes>
2019-11-04 17:52:02 +00:00
Dominique Fuchs
c6ff66be79 Smoother deletions: Added animation for removeDisplaced including sequential opacity change and displacement animation
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-11-04 12:48:07 +01:00
XNG
cf1532acf1 Apply http2 patch from owncloud
Signed-off-by: XNG <Milokita@users.noreply.github.com>
2019-11-01 09:35:10 +08:00
Dominique Fuchs
06b251063e Initial ListView design/modeling for activity list
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-30 20:47:21 +01:00
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
adrb
921b144d06
Merge branch 'master' into issue_1351 2019-10-18 08:19:32 +02:00
Adrian Brzezinski
3b750895b4 * fix for issue no. 1351
Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
2019-10-18 08:16:59 +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
Felix Eckhofer
ace142bb23
Use user-provided username in displayName()
This replaces `davUser()`, which is replaced by a numeric ID when using
LDAP, by the username that was actually used for logging in.

Fixes #836

Signed-off-by: Felix Eckhofer <felix@eckhofer.com>
2019-09-30 17:56:14 +02:00
Dominique Fuchs
0a407a39b0
Merge branch 'master' into lnx-domainname-desktopfiles 2019-09-30 09:46:15 +02:00
Dominique Fuchs
3ad1c0e7a8 Created wrapper variable LINUX_APPLICATION_ID to clean up code
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-30 09:45:41 +02:00
Andreas Wunderlich
f293dbfeeb Revert default remote poll interval back from 5 seconds to 30 seconds
Signed-off-by: Andreas Wunderlich <code@andwun.me>
2019-09-29 00:58:35 +02:00
Dominique Fuchs
10a5e75cd8 Harmonizing sorting algorithm (again)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-28 09:17:12 +02:00
Dominique Fuchs
3269402f48 Merge branch 'syncjournal-del-prio' of https://github.com/nextcloud/desktop into syncjournal-del-prio 2019-09-27 12:21:06 +02:00
Dominique Fuchs
26f7848821 Fix logic for DELETE prio, now (hopefully) in harmony with destination sorting
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-27 12:21:02 +02:00
Dominique Fuchs
08efb40599
Merge branch 'master' into syncjournal-del-prio 2019-09-27 09:59:32 +02:00
Dominique Fuchs
f81e5be119 Implemented second sorting step for SyncFileVector (merged trees) to prioritize DELETEs
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-27 09:34:49 +02:00
Michael Schuster
00db94a73c
Revert "Fix White Window issue on Windows after Qt 5.12.4 upgrade"
This reverts commit 8f616969ab.

Turns out that with the upgrade to the new released Qt 5.12.5 the issue
has been solved by the Qt developers, so this fix becomes obsolete.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-27 04:58:12 +02:00
Dominique Fuchs
83918619cf Corrected new .desktop file location in forgotten function
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 20:56:14 +02:00
Dominique Fuchs
f52c330c22 cleanup and migration for location change
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 19:09:40 +02:00
Dominique Fuchs
67ed54671b Adapted for cmd version and added migration step for config file
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 17:47:01 +02:00
Dominique Fuchs
fc6b895f52 moved default db sync file to Qt standard path AppDataLocation
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 17:09:24 +02:00
Camila Ayres
6f9256f290
Merge branch 'master' into lnx-domainname-desktopfiles 2019-09-26 13:26:22 +02:00
Dominique Fuchs
555c513acb
Merge branch 'master' into lnx-domainname-desktopfiles 2019-09-26 12:51:20 +02:00
Dominique Fuchs
96da4674f9 Updated .desktop file naming scheme
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 12:36:05 +02:00
Camila Ayres
570041e3b4
Merge branch 'master' into enhancement/change-share-menu-wording 2019-09-26 11:12:43 +02:00
Michael Schuster
8f616969ab
Fix White Window issue on Windows after Qt 5.12.4 upgrade
Qt 5.12.4 seems to introduce a new bug on Windows, causing the settings window
to not be redrawn when re-opening it, for example by clicking at the tray icon.

As a workaround this fix starts a 100 ms timer to be fired once upon
QDialog::showEvent is called.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-26 04:59:17 +02:00
Camila San
b9f0e444e8
Improve wording of the context menu in the file manager extension.
'Share...' -> 'Share options'
'private link' -> 'internal link'
Removes 'to clipboard' from 'copy link' options.

Signed-off-by: Camila San <hello@camila.codes>
2019-09-25 19:54:22 +02:00
Dominique Fuchs
cd89efc24b Fixed some missing 'translatable' exclusions, added missing window titles in flow dialogs
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-25 14:02:59 +02:00
Camila San
dd90ed9643
Changes wording in the share context menu.
Instead of only Nextcloud it says "Share via Nextcloud".

Signed-off-by: Camila San <hello@camila.codes>
2019-09-24 16:25:03 +02:00
Dominique Fuchs
d8dca83dd5
Merge branch 'master' into recipientnote 2019-09-20 19:01:34 +02:00
Dominique Fuchs
0ff91574d2 show only 'shared with you by...' if it's not the current user itself
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-20 18:50:32 +02:00
Michael Schuster
30cff4e4f8
UI improvement: Message box: Delete / Keep all files
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-20 16:47:11 +02:00
Dominique Fuchs
31f3b322c8 Color corrections and sharer=self case implementation
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-19 10:04:52 +02:00
Mariusz Wasak
dcc33f3417 Fix for #1382 "linux client crashes for no discernable reason"
There in no "return" in
PropagateUploadFileCommon::slotStartUpload in if (prevModtime != _item-
>_modtime) {... }

There is possibility that
PropagateItemJob::done(status, errorString)
maybe called two times from PropagateUploadFileCommon::slotStartUpload
1. in if (prevModtime != _item->_modtime) {... }
2. in if (fileIsStillChanging(*_item)) {..}
if changes in files are frequent the second call is possible.

This two calls has effect in PropagatorCompositeJob::slotSubJobFinished
and job is removed two times in _runningJobs.remove(i);
(the second time with argumetnt -1 (because first call removed job).

This return was removed in commit
efc039863b - by accident I think.

Good simulation is to synchronize firefox profile with frequent page
refresh.

Signed-off-by: Mariusz Wasak <mawasak@gmail.com>
2019-09-18 18:18:12 +02:00
Dominique Fuchs
5a9fc02f07 Correcting autoraise for widget w/ background fill
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-18 13:40:14 +02:00
Dominique Fuchs
9d6780d6c1 Finishing PR #1154 adding note when sharing
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-18 13:37:49 +02:00
Michael Schuster
207de071f4
Add warning for failed chown in libsync/propagatedownload.cpp
In addition to PR 1409 generate warnings if chown fails.

See: https://github.com/nextcloud/desktop/pull/1409

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-16 20:26:18 +02:00
Michael Schuster
916d414543
Merge branch 'master' into ivan/remote-size-retrieved-race-condition 2019-09-16 19:17:00 +02:00
Michael Schuster
b40e3e7b4e
Merge branch 'master' into msvc-warn-audit 2019-09-16 16:55:42 +02:00
Kilian Pfeiffer
c46ca5c256
Merge branch 'master' into master 2019-09-16 13:41:15 +02:00
Dominique Fuchs
a2a753a34b
Merge branch 'master' into fix_urlscheme_warning 2019-09-15 19:12:22 +02:00
Camila Ayres
82a67a44c4
Merge branch 'master' into bugfixing-slideshow 2019-09-15 18:18:46 +02:00
Dominique Fuchs
a35b346e62 Fixed e2e key transmission issue after generation (forgotten content type on sendrequest())
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-15 11:53:57 +02:00
Dominique Fuchs
7d4406254a
Merge branch 'master' into fix_urlscheme_warning 2019-09-15 09:56:16 +02:00
Dominique Fuchs
1eb61b7949 Fixed unused var
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 20:49:59 +02:00
Dominique Fuchs
f6bac6cfdd Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow 2019-09-13 20:38:16 +02:00
Dominique Fuchs
e8c8fe4223 Added slight svg transparency as requested in ref issue, fixed bg detection logic
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 20:38:03 +02:00
Dominique Fuchs
3659bca0ec
Merge branch 'master' into bugfixing-slideshow 2019-09-13 17:30:25 +02:00
Dominique Fuchs
ace3da841c (Maybe) finished implementation of themed wizard buttons and accessibility refinements and thus implementation of helper fct. to retrieve themed QIcons.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 17:26:39 +02:00
Kilian Pfeiffer
457b0c3ab1
Merge branch 'master' into master 2019-09-13 08:57:06 +02:00
Dominique Fuchs
544229d1e8 [WIP] themed button implementation
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 08:24:02 +02:00
Dominique Fuchs
af05db895c [WIP] Resource file and include changes as well as new control icons for wizard slide buttons
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 08:08:39 +02:00
Dominique Fuchs
1d96b102c0 Layout optimizations and tab access for self-hosting link
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 22:00:43 +02:00
Dominique Fuchs
ff5bf8634f fix naming for slide navigation, adapted everywhere to be consistent
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 20:59:03 +02:00
Dominique Fuchs
f49cd1850c Restructured layout, as the initial change were too broken (after additions through the last months)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 20:53:40 +02:00
Dominique Fuchs
c873da75e4 Fixed wrong resource paths
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 17:52:31 +02:00
Dominique Fuchs
907f36bfcb Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow 2019-09-12 16:43:54 +02:00
Dominique Fuchs
04fedf83b4 Added newly created next/prev svg's and fixed reduntant layout parts in wizard
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-12 16:43:24 +02:00
Michael Schuster
f3d774e2e5
Merge branch 'master' into fix-double-slashes 2019-09-12 05:09:21 +02:00
Dominique Fuchs
febc035063
Merge branch 'master' into ivan/remote-size-retrieved-race-condition 2019-09-11 22:56:34 +02:00
Dominique Fuchs
4902751d02
Merge branch 'master' into bugfixing-slideshow 2019-09-11 22:17:57 +02:00
Dominique Fuchs
45bd869a15
Merge branch 'master' into master 2019-09-11 22:06:22 +02:00
Michael Schuster
905c1532fe
fix comment typo
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-11 17:31:16 +02:00
Dominique Fuchs
dd130ede8f
Merge branch 'master' into master 2019-09-10 10:17:37 +02:00
Dominique Fuchs
c662ff1902 fixed wrongly assigned pointer, didn't recognize class
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 20:06:32 +02:00
Dominique Fuchs
a237493def Q_UNUSED for atm unused parameters
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:23:38 +02:00
Dominique Fuchs
3a0cd45782 Declared Q_UNUSED for as-of-now unused parameters.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:23:37 +02:00
Dominique Fuchs
f08cc08eb2 Prevented warning regarding operator precedence - enhanced clarity by adding parentheses
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:23:36 +02:00
Dominique Fuchs
e3685b951c removed reduntant /* within a comment
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:23:35 +02:00
Dominique Fuchs
6b04e2f77b Remove unnecessary argument
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:23:34 +02:00
Dominique Fuchs
2e8b7771b0 Prevent use of uninitialized folder pointer.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:23:32 +02:00
Dominique Fuchs
26e98d35e6 Added forgotten case when parsing log through gui. LockedFiles were not communicated.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:23:31 +02:00
Dominique Fuchs
ab3d0141ec initialize _modtime to prevent undefined usage
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 19:23:30 +02:00
Dominique Fuchs
39df36c247 Use return type to prevent warning and determine chown success. Added TODO
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 18:06:29 +02:00
Dominique Fuchs
7473cdf184 Removed disabling of msvc warning to prevent generating a unknown option for other compilers in turn. Now detect specifically GCC in ifdef
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-09 13:46:46 +02:00
Dominique Fuchs
c585e81530 Moved macro definition due to timing issues while compiling when relying on header inheritance
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 19:46:08 +02:00
Dominique Fuchs
c779098772 Conditional (based on Qt version) use of 'horizontalAdvance' to provide better UI experience. See https://doc.qt.io/qt-5/qfontmetrics-obsolete.html#width
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 19:37:56 +02:00
Dominique Fuchs
cc07ed1ee8 commit 222b2d did the trick. now streamlined use of https://doc.qt.io/qt-5/qtglobal.html#QT_VERSION_CHECK
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 19:22:40 +02:00
Dominique Fuchs
222b2d8645 Further testing of cond. include of Qt library > 5.9. Utilized different macro.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 19:17:00 +02:00
Dominique Fuchs
f41eeaf6ec Fixed another logic error -> logical to bitwise OR for QTLEGACY
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 18:51:54 +02:00
Dominique Fuchs
48097801e8 Fixed logic error in QTLEGACY macro and added forgottin #if clause for header file
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 18:42:40 +02:00
Dominique Fuchs
dca83aad45 Added macro definition and compile-time condition to support Qt < 5.9
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 17:33:34 +02:00
Dominique Fuchs
be7a524557 Indeed, DWORD is a special snowflake - only when on _WIN32
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 16:22:08 +02:00
Dominique Fuchs
0827ff0995 Fixed wrongly formatted args for win32 linker flags resulting in 'unrecognized option' for all of them. Remark: /WL is for VS only, useless (and not necessary for msvc cmd)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 16:09:58 +02:00
Dominique Fuchs
503b9de2a0 Fixed missing braces
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 15:49:53 +02:00
Dominique Fuchs
a2d47cdec4 Qt: Fixed numerous deprecated calls by adapting newer ones
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 15:40:49 +02:00
Dominique Fuchs
d60a216982 Use existing fct for RegKeyQuery instead of redundant subroutine
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 13:44:00 +02:00
Dominique Fuchs
d6af025a46 Numoerous safe conversions implemented. Added additional Utility::convertSizeToDWORD for windows builds.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 11:33:20 +02:00
Dominique Fuchs
82fa10c227 Corrected namespace when calling convertSizetoUint
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 10:21:59 +02:00
Dominique Fuchs
46e0a05078 Renamed conversion function to make intention more clear. Also defaulted to 'controlled truncation' to not stupidly crash. TBD/TODO: Better handling for such things.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 02:20:24 +02:00
Dominique Fuchs
8329de4cee Selectively and temporary disabled warning about unknown preprocessor declarative for msvc when using specific GCC instruction.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 02:07:52 +02:00
Dominique Fuchs
b4dee67bf5 Implemented Utility::convert function to convert size_t -> uint safely and on the fly. Often necessary for Qt and WIN32 functions. Using this will not generate compiler warnings of possible truncation. First call implemented in ownsql.cpp
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 02:04:50 +02:00
Dominique Fuchs
5ae3435fe6 Fixed broken overloading mechanism of variadic templates. See code comment for further information.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-08 01:09:22 +02:00
Michael Schuster
67107a4f5d
Fix double slashes in WebDAV URLs (account setup wizard)
Sanitize URL paths to elaminate double-slashes in the URL path string,
used for the first connection by the account setup wizard.

Example: https://cloud.example.com/remote.php/webdav//

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-07 04:18:07 +02:00
Camila Ayres
081f9741e4
Merge branch 'master' into flow2-ui-qt5-compat 2019-09-06 17:32:40 +02:00
Camila Ayres
a3beb9ba41
Merge branch 'master' into w10-start-logo 2019-09-06 17:02:06 +02:00
Camila Ayres
0841fe8dd3
Merge branch 'master' into master 2019-09-06 16:50:27 +02:00
Camila Ayres
9ab5241459
Merge branch 'master' into w10-start-logo 2019-09-06 16:03:54 +02:00
Camila Ayres
ec603b061d
Merge branch 'master' into logo-update 2019-09-06 15:42:02 +02:00
Michael Schuster
b792a627e2
Qt5.5 compatiblity patch for login flow V2 + UI improvment
Removes the right-click function for the "Re-open browser" buttons because
they are not intuitive for the user.

Adds a dedicated "Copy link" button.

Implements Qt 5.5 fixes based on: https://github.com/nextcloud/desktop/pull/1392

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-06 14:40:54 +02:00
Camila Ayres
d36ddb752a
Merge branch 'master' into per-directory-ignore 2019-09-06 13:35:28 +02:00
Dominique Fuchs
680f70aa1a
Merge branch 'master' into w10-start-logo 2019-09-06 09:30:12 +02:00
Dominique Fuchs
4ea64bf9ee Final commit to resolve #22 (at least in desktop repo, final bits have to be set in client-building).
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-06 09:24:06 +02:00
Dominique Fuchs
c1dd0079d9 Modified CMakeLists (src/gui/) to install VisualElements logo files in appropiate install output folder
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-06 08:35:46 +02:00
Dominique Fuchs
f33d0a322d Renamed files for consistent sheme & use in CMakeLists (/src/gui)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-06 08:23:48 +02:00
Dominique Fuchs
abb2711d26
Merge branch 'master' into logo-update 2019-09-05 21:38:17 +02:00
Dominique Fuchs
4b9e8274b5 Merge branch 'logo-update' of https://github.com/DominiqueFuchs/desktop into logo-update 2019-09-05 20:59:34 +02:00
Dominique Fuchs
7aefa5afaf Updated CmakeLists for gui part to correct old variable (OUTFILE_BASE[NAME]) that changed by recent update of AddAppIcon modules. Fixes wrong naming of resource pack in build output.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-05 20:58:05 +02:00
Michael Schuster
1b2e64788d
Merge branch 'master' into ssl-error-digests 2019-09-05 01:07:20 +02:00
Roeland Jago Douma
b8ef78205a
Merge pull request #1256 from meskobalazs/master
Marking unused strings as unstranslatable
2019-09-04 23:06:08 +02:00
Martin Sucha
3e6422a889
Use newer digest algorithms in TLS error dialog
MD5 has been broken for a long time now and SHA1 has been
deprecated as well. SHA1 is not used when issuing new
publicly trusted certificates since 1 January 2016[1] and
there are more and more effective attacks[2][3] against it,
so display SHA1 fingerprint only for old certificates
to encourage use of safer digests by users.

So, we display SHA-256 and SHA-512 fingerprints instead in
the common case.

[1] https://cabforum.org/wp-content/uploads/CA-Browser-Forum-BR-1.6.5.pdf
[2] https://shattered.io/static/shattered.pdf
[3] https://eprint.iacr.org/2019/459.pdf

Signed-off-by: Martin Sucha <git@mm.ms47.eu>
2019-09-04 22:06:12 +02:00
Dominique Fuchs
8f3bf3313e Integrated registry check on windows when hasDarkSystray is called.
Return value determines which theme is applied for monochrome variant.
Fixes #1276 but only when monochrome option is toggled or nc starts, not automatically when changing windows theme.

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-01 22:13:14 +02:00
Michael Schuster
61884d1ada
fix indents, add comment
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-30 05:35:36 +02:00
Michael Schuster
b52292db92
Windows: Workaround for CredWriteW used by QtKeychain
Saving all client CA's within one credential may result in:
  Error: "Credential size exceeds maximum size of 2560"

Client CA certificates are now being stored in separate slots
within the keychain and are being processed by a queue mechanism.

IMPORTANT TODO:
forgetSensitiveData(): Invoked by "Log out" & "Remove account"

- Remove client CA certs and KEY!
  (uncomment "//deleteKeychainEntries();" )

  Disabled as long as selecting another cert is not supported by the UI.

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-30 04:56:01 +02:00
Roeland Jago Douma
d584bedcb6
Also store the CACertificates of the client side certificate
Else authentication will still fail in setups that have a chain of
certificates supplied.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-27 09:55:41 +02:00
Michael Schuster
dbde585049
Adds SSL client cert storage to webflow + Login Flow v2
The previous commit 50cd6af394 - Build a webflowcredentials
changed:

src/gui/wizard/flow2authcredspage.cpp in line 135 to use WebFlowCredentials
instead of HttpCredentials.
But the WebFlowCredentials class didn't include code to store and load SSL client
certificates and keys from the keychain.

This commit migrates the useful stuff from the old HttpCredentials class
into WebFlowCredentials.

Successfully tested on Windows. Please test on other systems and verify it's safe! :)

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-27 03:32:21 +02:00
Roeland Jago Douma
302ca0e04e
Fix some compiler warnings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-26 20:41:14 +02:00
Roeland Jago Douma
50cd6af394
Build a webflowcredentials
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-26 20:04:23 +02:00
Michael Schuster
fd8345ccbe
Login Flow V2: adds re-auth upon logout, improvements
- Implements re-auth upon logout -> login
- Improves UI and security

TODO:
- SSL: Client certificate login is possible at the first time only but missing after relaunch

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
7add98e9a3
UI: don't let Flow2 and OAuth hide the wizard
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
aa93a04fd6
fix comment typo in httpcredentials.cpp
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
628bab92c4
fix comment typo in webflowcredentials.cpp
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
12f2ea6728
Login Flow V2: remove static test url
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
8fa55b97b4
Login Flow V2: 1st implementation, cleanup
This is the first draft of the Login Flow V2 authorization method.

See: https://docs.nextcloud.com/server/latest/developer_manual/client_apis/LoginFlow/index.html#login-flow-v2

- Adds the Login Fĺow V2 auth method
- Adds ability to reinitiate a new request via UI

TODO:
- Implement re-auth upon logout -> login
- Improve UI
- SSL: Client certificate login is possible at the first time only but missing after relaunch

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Michael Schuster
2742411abd
Login Flow V2: 1st test-implementation
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-08-26 20:03:15 +02:00
Roeland Jago Douma
e0a1d78441
Merge pull request #1225 from edent/patch-1
Typo
2019-08-19 15:39:10 +02:00
Samir Benmendil
5e3c2d2a96 Fix fullPath matching
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
7a9b13a563 Manual exclude are anchored to _localPath by default
This makes a lot of sense, since there should be no file to be synced
outside of _localPath.

Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
e27645cb00 Extract loadExcludeFile and use it when discovering new exclude files
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
34fcb13e78 Never ignore .sync-exclude, even if excludeHidden
That is unless any of the parent folders is hidden.

Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
9f4873e864 Fix some typos
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
94448a8b33 Add menu action to main sync folder too
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
acf0b0f7c4 Add menu action to each subfolder
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
d4816442ef Extract IgnoreListTableWidget to be reused
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
e44a2302de Remove all rows in the table widget
`clearContents()` will leave the number of rows as is. This was causing
a segfault when trying to loop over the items of the widget.

Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
4a2b91a043 IgnoreListEditor can work on any path
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
14279104ae Read .sync_exclude.lst in each subdirectory
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Roeland Jago Douma
4c8da1a3e7
Add proper CA
If the cert has a chain of certs we should send them all properly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-02 14:19:37 +02:00
Camila San
3ea472d9f2
Minor text change in the link to help in the tab 'General'.
Also uses helpUrl() retrieve the correct APPLICATION_HELP_URL
instead of APPLICATION_DOMAIN.

Signed-off-by: Camila San <hello@camila.codes>
2019-07-24 16:39:21 +02:00
Camila Ayres
5d30f4b1eb
Merge branch 'master' into pr/607 2019-07-22 19:38:56 +02:00
Camila Ayres
4801bd5818
Merge branch 'master' into pr/607 2019-07-22 16:46:45 +02:00
Camila Ayres
9411a34a2b
Merge branch 'master' into pr/878 2019-07-22 16:09:52 +02:00
Camila Ayres
0ae72cd68a
Merge branch 'master' into pr/878 2019-07-22 15:45:56 +02:00
Claas Augner
116c5b361f Displays FileIgnored activities with an info icon
See: https://github.com/nextcloud/desktop/issues/965
Signed-off-by: Claas Augner <git@caugner.de>
2019-07-21 22:02:15 +02:00
Camila San
d6a0a5272a
Displays the uid_owner of a shared file.
Also displays the sharees that reshared it via share link.

Signed-off-by: Camila San <hello@camila.codes>
2019-06-21 18:36:45 +02:00
Kilian Pfeiffer
ac24874585
Merge branch 'master' into master 2019-06-12 12:41:09 +02:00
Camila San
bb7d330516
Add error category for http file lock error status 423.
It filters the error out of the list of blocking errors. It now shows up
in the Activities and Notificattions list as a warning.

Signed-off-by: Camila San <hello@camila.codes>
2019-06-11 23:32:10 +02:00
Ivoline Ngong
5c2e8c9574
Merge branch 'master' into pr/607 2019-06-07 19:36:44 +03:00
Ivan Čukić
200032c9cb
Merge branch 'master' into ivan/encryption-initial-setup 2019-06-03 09:11:56 +02:00
ivyclare
f4340b98ce Unshare action transferred to 3 dot menu
Signed-off-by: ivyclare <ivolinengong@gmail.com>
2019-05-29 20:54:53 +03:00
Camila Ayres
867e546fa9
Merge branch 'master' into master 2019-05-29 17:40:53 +02:00
ivyclare
bcdc88ecf0 Change »Details…« to »View more activity…«
Signed-off-by: ivyclare <ivolinengong@gmail.com>
2019-05-28 01:14:31 +03:00
Camila San
9ff1a30dc4
Display error when current user is not allowed to reshare file/folder.
Signed-off-by: Camila San <hello@camila.codes>
2019-05-27 19:46:38 +02:00
Camila San
4f0ff154d3
Display sharees on the first show of the share dialog.
It was displaying them only when the current user would edit the share.

Signed-off-by: Camila San <hello@camila.codes>
2019-05-27 19:46:38 +02:00
Camila San
981a4ee240
Adds parameter to retrieve shares with its reshares.
If the initiator or the recipient is not the current user,
show the list of sharees without any options to edit it.

Minor change: updates api to v2.

Signed-off-by: Camila San <hello@camila.codes>
2019-05-27 19:46:38 +02:00
Sven Strickroth
85d217ec95 WebView: Properly handle usernames with spaces and plus signs in it
The path returned from the server encodes a space in the username with `+` and if the username contains a `+` sign it is encoded as `%2B` (cf. https://www.php.net/manual/function.urlencode.php).

Fix: Don't (double) decode the URL path and then replace `+` with space (introduced in issue #279 resp. commit 9ec61a84ce). Instead first replace `+` with space, then decode percent encoding.

Tested with a username containing a space, a username containing a `+`sign and a username containing just A-Za-z0-9- (with Nextcloud 16).

(fixes issue #1266)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
2019-05-23 17:09:33 +02:00
Ivan Čukić
33605d7f65 Removed ellipsis from the button text 2019-05-18 22:58:41 +02:00
Ivan Čukić
4f17366262 Changed the message to 'Enable encryption...' 2019-05-14 21:54:43 +02:00
Ivan Čukić
a8ac89c20c Merge branch 'master' into ivan/encryption-initial-setup 2019-05-14 21:53:57 +02:00
Balázs Meskó
a13bba7f42 Marking unused strings as unstranslatable
Signed-off-by: Balázs Meskó <mesko.balazs@fsf.hu>
2019-05-14 20:07:08 +02:00
Roeland Jago Douma
b6c0f9db5d
Merge pull request #1253 from muesli/webview-typo
Fixed typo in "certificate"
2019-05-13 07:58:52 +02:00
Christian Muehlhaeuser
9dc0027304 Fixed typo in "certificate"
Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com>
2019-05-13 05:22:58 +02:00
Yaron Shahrabani
692d885b55
Fixed typo
Chipher -> Cipher
2019-05-12 19:11:33 +03:00
Ivan Čukić
6c0d796b4b E2E UI setup poligh
- Text changed to "Enable..." instead of "Setup"
- The close icon follows NC style
- "end-to-end" instead of "end to end"

Signed-off-by: Ivan Čukić <ivan.cukic@kde.org>
2019-05-11 19:20:19 +02:00
Ivan Čukić
db7e5e01b3 Merge branch 'master' into ivan/encryption-initial-setup 2019-05-11 19:19:00 +02:00
Camila Ayres
bdfc5dcd14
Merge branch 'master' into master 2019-05-10 14:42:44 +02:00
shobha
188374f60c updated default remote poll to 5 seconds #1115
Signed-off-by: shobha <tyagishobha@gmail.com>
2019-05-10 09:15:09 +05:30
Joshua Sterner
b6ff17c50b Fixed Issue #1000 - Subfolders of moved folders not synced
Signed-off-by: Joshua Sterner <joshua.s.sterner@gmail.com>
2019-05-09 04:12:33 -07:00
Ivan Čukić
7af786fde9 Added a nice UI for the E2E-enabled account first connect
Instead of immediately popping up the mnemonic dialogue,
only show a notification bar on the account setup page.

For the cases where the user does not want to use E2E,
this is significantly less intrusive than the old approach.
2019-05-09 00:37:24 +02:00
Ivan Čukić
0f7c10a2d6 Race condition in the remote size loading logic
The quota retrieval process might not be finished by the time
the used space on the server (`_rSize`) is compared against
the locally available disk space which might end up in
a "There isn't enough free space in the local folder!" message
even if there is enough free space.

This patch updates the status after the quota has been retrieved.

It also initializes `_rSize` to `-1` so that errors like this
are easier to catch in the future.
2019-05-08 23:09:55 +02:00
Christoph Wurst
c2e3cbca31
Fix memory leak with device pointer
Downstream of https://github.com/owncloud/client/pull/6856

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-05-08 19:41:48 +02:00
Corentin Noël
18f51e47d7
Merge branch 'master' into master 2019-05-03 17:04:42 +02:00
Terence Eden
e64fa74899
Typo
There's no such thing as a "key*h*chain".
2019-04-28 10:03:38 +01:00
Björn Bidar
cea0d519a4 fix qt warning about registering a URL sheme first.
Qt recommends to register a URL scheme before installing it.
I don't know the impact of the not registering before instaling but I
think the change is pretty harmles.

See:
https://doc.qt.io/qt-5/qwebengineurlscheme.html#registerScheme
Signed-off-by: Björn Bidar <theodorstormgrade@gmail.com>
2019-04-22 07:38:38 +02:00
Camila Ayres
4d61a7c263
Merge branch 'master' into tuchfarber/fix_empty_file_error_wording 2019-04-12 16:51:36 +02:00
Camila San
7f3c3f6eb6
Uses configuraion to determine if it should show empty folder popup.
Configuration default value is set to false because  users are getting
the popup message too often.

Signed-off-by: Camila San <hello@camila.codes>
2019-04-12 16:22:07 +02:00
Camila San
35114cf45c
Disable options in share dialog if account state changes.
Signed-off-by: Camila San <hello@camila.codes>
2019-04-12 14:17:58 +02:00
Camila San
e07c472057
Refactores sharing link to support multiple share links.
Signed-off-by: Camila San <hello@camila.codes>
2019-04-12 14:17:58 +02:00
Camila San
0fed1cc54d
Fixes deleting of one single link share.
Signed-off-by: Camila San <hello@camila.codes>
2019-04-12 14:17:57 +02:00
Corentin Noël
088a5a9771 Fix several memory leaks in cloudproviders and add translation support 2019-04-04 22:06:22 +02:00
Stéphane Guillou
3a893d6179
Fix a minor typo 2019-03-24 20:12:44 +10:00
Izabela Bakollari
ff7b0aace9 Modified slideshow buttons and edited "Host your own server" link 2019-03-18 16:31:35 +01:00
Kilian Pfeiffer
2c58bee151
Merge branch 'master' into master 2019-03-09 17:57:11 +01:00
Matt Tuchfarber
0862d6cfb0 Fix empty file wording in error log
Changing empty file error text so that it reads correctly.
2019-03-07 00:18:12 -05:00
Roeland Jago Douma
0e3a8856e5
Merge pull request #1092 from nextcloud/enh/debug_not_warnings
Be less verbose with logging
2019-03-04 10:19:16 +01:00
Morris Jobke
158c6e8136
Fix typo in translation string 2019-03-01 11:40:20 +01:00
Roeland Jago Douma
bb2f179342
Be less verbose with logging
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-02-15 20:23:24 +01:00
Joda Stößer
9393626ec2
correct app passwords link
Since some versions ago, the path/url for the app password settings is `/settings/user/security#security` instead of `/settings/personal#apppasswords`
2019-02-14 05:26:21 +01:00
Kilian Pfeiffer
c4ffd844f3
Merge branch 'master' into master 2019-02-12 12:46:19 +01:00
Roeland Jago Douma
c9d4360fb6
Add invalid certiticate messagebox
This is a quick hack to make self signed certificates work.
I'm not to fond of it the real solution should be to request the url
with QNAM and then see if it fails.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-02-05 10:18:35 +01:00
Camila Ayres
d4a77be3f8
Merge branch 'master' into enh/notifications/do_not_show_dismissed 2019-02-04 20:27:44 +01:00
rakekniven
d564279254
Fixed l18n issue. Added space for separating string
Related to #1068 

Reported at forums with screenshots. See 

https://help.nextcloud.com/t/client-2-5-1-linux-typo/46796

Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
2019-02-04 17:13:53 +01:00
Roeland Jago Douma
86251ff2e3
Do not display dismissed notifications
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-02-01 14:39:59 +01:00
Roeland Jago Douma
50ebc49d69
Work around proxy issue with webview by always setting a proxy
Just use the prefered http tcp socket proxy.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-31 14:14:31 +01:00
Roeland Jago Douma
eb3245b241
Fix login flow with system proxy
I must admit why this works is puzzling me. However if I just use a system
proxy without this it doesn't work. I suspect a Qt bug but will have to
dig deeper to find out if that is the case.

For now this little hack will have to do.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-31 13:45:40 +01:00
Roeland Jago Douma
e2293eddce
Allow to specifiy server url via CMAKE
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-31 11:28:46 +01:00
Roeland Jago Douma
b34708da29
Move help URL also to CMAKE
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-31 11:28:46 +01:00
Roeland Jago Douma
0c21852bc3
No need to overwrite customMedia in the theme
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-31 11:28:46 +01:00
Roeland Jago Douma
944f9e9668
Move wizard options to CMAKE as well
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-31 11:28:38 +01:00
Roeland Jago Douma
5c2996deb7
Use the provided updater URL
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-31 09:52:16 +01:00
Roeland Jago Douma
bf81a473af
Merge pull request #1054 from nextcloud/enh/no_double_slash
Do not add double slash to login flow url
2019-01-30 16:39:52 +01:00
Roeland Jago Douma
7c1401da1c
Do not add double slash to login flow url
If the entered url ends with a slash we should not add another one.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-29 22:50:30 +01:00
Izabela Bakollari
e3731e40aa Changes to be committed:
modified:   src/gui/activitywidget.cpp

  Removed whitespace from string

  Issue #928
2019-01-29 13:10:11 +01:00
Javier Llorente
cbc19e86fb Add sync date next to "Synchronized with local folder" 2019-01-22 23:16:57 +01:00
kilian.pfeiffer
10073c1f10 changed max GUI bandwith limits 2019-01-18 15:11:52 +01:00
Javier Llorente
e5b5573711 Show an error message if there is no enough free space in the local
folder
2019-01-13 23:35:06 +01:00
Roeland Jago Douma
27298a2056
Merge pull request #959 from yan12125/correct-webview-deallocation
Make sure _profile and _page are deleted in the correct order
2019-01-07 15:01:23 +01:00
Roeland Jago Douma
9ec61a84ce
Handle spaces in username properly in login flow
Fixes #279

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-07 10:41:01 +01:00
Oskar Kruschitz
74454d0452 Removed Stylesheet
Stylesheet String was not correctly defined (missing ";" after "%2") and caused an error in logging output.

After checking the fixed Style I removed it since it does not really look good.
2019-01-03 15:54:50 +01:00
Chih-Hsuan Yen
09b0055dc3
Make sure _profile and _page are deleted in the correct order
Inspired by https://github.com/electron/electron/pull/15028

Closes https://github.com/nextcloud/desktop/issues/941
Closes https://github.com/nextcloud/desktop/issues/950
2018-12-19 21:44:54 +08:00
Roeland Jago Douma
071709ab5e
Merge pull request #946 from hiiamok/qt5.12-wizard-webview
Added missing Include
2018-12-13 19:34:42 +01:00
Oskar Kruschitz
1295884420 Added missing Include
Fixing an error during Build with Qt5.12:
error: member access into incomplete type 'const QWebEngineCertificateError'
2018-12-13 16:13:01 +01:00
Camila Ayres
f91678ef24
Merge branch 'master' into background 2018-12-06 09:35:15 +01:00
Roeland Jago Douma
8b64db6344
Merge branch 'master' into fix/566/do_not_read_system_exclude 2018-11-27 11:19:20 +01:00
Camila Ayres
72901a4ed8
Merge branch 'master' into background 2018-11-26 21:07:14 +01:00
Roeland Jago Douma
287d78ffd3
Write the actual folder to the log
Fixes #873
Not all folder names are proper latin1.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-23 10:33:25 +01:00
Roeland Jago Douma
b93c762205
Fix the activity loop
We should stop fetching the moment the activity stream is empty when
fetched. It doesn't matter if the current list is empty.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-22 10:40:00 +01:00
Roeland Jago Douma
bdd5d423ed
Merge branch 'master' into fix/788/no_activity_flood 2018-11-19 21:29:58 +01:00
Roeland Jago Douma
d8c0fb856c
Merge branch 'master' into share-dialog-take-2 2018-11-19 19:33:05 +01:00
Roeland Jago Douma
6cc496633f
Do not read system exclude list if user exclude is present
For #566

Since we only showed the user exclude list (and some extra items) the
system exclude list was still used.

This copies over the system exclude list (if it isn't there).
If it fails we use the system one still.

However if you now remove items from your own list it will really be
gone.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-19 15:35:32 +01:00
Roeland Jago Douma
1d0bf08a1c
Do not fetch activities if they are not enabled
Fixes #788
Fixes #834

If the activity app is not enabled we should not try to fetch the
activities at all.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-19 14:13:51 +01:00
Daniel Hansson
2d6c5f393f
Change link to docs for NC 15
This changes the link for the "Host your own" link in the wizard.
2018-11-18 11:02:34 +01:00
rakekniven
6c0cd4bd3a
Fixed typo
Reported at Transifex.

Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
2018-11-17 11:36:16 +01:00
J-P Nurmi
d6170271e9 ShareDialog: increase the width
To match the old width it had before the alignment work.
2018-11-17 09:24:45 +01:00
J-P Nurmi
6f145e3a80 ShareUserGroupWidget: allow frame when scrollable 2018-11-17 09:22:52 +01:00
J-P Nurmi
3c193143f2 Cleanup sharedialog.ui 2018-11-17 09:22:52 +01:00
J-P Nurmi
b25e15347b ShareUserGroupWidget: fix scroll area size management 2018-11-17 09:22:52 +01:00
J-P Nurmi
a8cce41f35 sharedialog.ui: fix scroll area size 2018-11-17 09:22:52 +01:00
J-P Nurmi
f0f691fffc Cleanup shareuserline.ui 2018-11-17 09:22:52 +01:00
J-P Nurmi
847706432b ShareLinkWidget: redo the layout
NOTE: The progress indicator is temporarily moved one line up to avoid
inserting it on its own line, which would cause the content pushed down
and the dialog size jump back and forth.
2018-11-17 09:22:52 +01:00
J-P Nurmi
bd93489b14 Cleanup shareusergroupwidget.ui
Remove hard-coded fixed sizes, size constraints, and other unnecessary
property assignments. This works with any dialog width, meaning that
the width can be defined in one place higher up in the widget hierachy.
2018-11-17 09:22:52 +01:00
J-P Nurmi
96d0059ca4 ShareDialog: use auto-raising tool buttons as confirm buttons 2018-11-17 09:22:52 +01:00
J-P Nurmi
df802472cb ShareLinkWidget: sync the confirm button size 2018-11-17 09:22:52 +01:00
J-P Nurmi
94750a5ea1 ShareUserGroupWidget: sync the share confirm button size with others
This keeps also the total width of the share dialog constant.
2018-11-17 09:22:52 +01:00
J-P Nurmi
fae1c0dbdd ShareUserLine: fix eliding
The widget doesn't have its final size at construction time, so the
width for eliding is not yet known. Let ElidedLabel do the job.
2018-11-17 09:22:52 +01:00
J-P Nurmi
b546e7c224 ElidedLabel: add default constructor
Makes it possible to promote QLabel to an ElidedLabel in Qt Designer.
2018-11-17 09:22:52 +01:00
J-P Nurmi
cd58850f5b ShareUserGroupWidget: remove nested content margins 2018-11-17 09:22:52 +01:00
J-P Nurmi
7d3242077b ShareDialog: align the left margin
All other margins are 10px.
2018-11-17 09:22:52 +01:00
Manuel Stahl
6718f5ad58 Fix cmake build using WITH_PROVIDERS=OFF
Fixes #821.
2018-11-13 14:54:30 +01:00
Julius Härtl
2d79ea5262
More verbose error and proper app name on configuration read error
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-13 11:01:20 +01:00
Roeland Jago Douma
e2c813bfca
Merge branch 'master' into action-colors 2018-11-13 07:41:53 +01:00
Roeland Jago Douma
0d9d942ab7
Merge branch 'master' into modernize 2018-11-12 20:21:13 +01:00
J-P Nurmi
53c89e2196 SettingsDialog: tweak color aware icons
If selected text is light, provide a light icon too when selected.
2018-11-12 20:04:02 +01:00
J-P Nurmi
b0959a6292 SettingsDialog: fix a little glitch in the account tool button size
SettingsDialog::accountAdded() uses the height of the toolbar to
calculate the desired default size for toolbuttons. Make sure to have
the "General" and "Network" tool buttons in place before calling
accountAdded() to avoid cramped first button.
2018-11-12 18:53:47 +01:00
J-P Nurmi
1af9bf8abc libsync: run clang-tidy modernize-use-nullptr 2018-11-12 18:46:39 +01:00
J-P Nurmi
0d1c15a768 libsync: run clang-tidy modernize-use-override 2018-11-12 18:43:58 +01:00
J-P Nurmi
48acaec66f libsync: search'n'replace "Q_DECL_OVERRIDE" with "override" 2018-11-12 18:39:50 +01:00
Roeland Jago Douma
c5a4694c74
Merge branch 'master' into modernize 2018-11-12 14:56:35 +01:00
Roeland Jago Douma
0f2294cef4
Merge pull request #806 from nextcloud/server-notification-handler
Fixup the port in server notification URLs
2018-11-12 14:48:30 +01:00
J-P Nurmi
ba53a01339 SlideShow: don't allow clicks while animating
Changing slides while animating was looking a bit awkward.
2018-11-11 12:30:33 +01:00
J-P Nurmi
8217c44ee5 SlideShow: slow down the slide interval
The original non-animated slide show was running at 2500ms interval.
The new animated slide show was using the same interval, but used
1000ms to animate the slides. This left significantly less time for
the user to read the slides.
2018-11-11 12:27:21 +01:00
J-P Nurmi
fff64e8aa5 GUI: search'n'replace remaining "Q_DECL_OVERRIDE" with "override" 2018-11-11 11:12:37 +01:00
J-P Nurmi
8e38e2ac86 GUI: run clang-tidy modernize-use-override 2018-11-11 11:08:03 +01:00
J-P Nurmi
fb5ff96ed6 GUI: run clang-tidy modernize-use-nullptr 2018-11-11 10:56:22 +01:00
J-P Nurmi
91602574a9 Fixup the port in server notification URLs
... in addition to fixing up the scheme and host.

For example, the survey app sends "/settings/admin/survey_client" as
a link. Clicking the "More information" button wouldn't lead to the
correct place if NC was running on a custom port.
2018-11-10 22:24:17 +01:00
rakekniven
a73da99d78
Merge branch 'master' into rakekniven-patch-1 2018-11-09 16:37:43 +01:00
rakekniven
f25ef73772
l10n. Added space for correct grammar.
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
2018-11-09 16:37:29 +01:00
Roeland Jago Douma
cf0838643f
Merge pull request #800 from nextcloud/fix/open_activities_on_conflict
Actually open the activity view on a click for more info
2018-11-09 16:36:24 +01:00
Roeland Jago Douma
3a0c7f64c0
Use a format that supports alpha channels for avatars
If we use the source format it can result in fully black images. As the
basic generated avatar doesn't have an alpha channel.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-09 13:01:28 +01:00
Roeland Jago Douma
7925c6c081
Actually open the activity view on a click for more info
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-09 12:12:25 +01:00
Roeland Jago Douma
9c0e5c2b19
Merge pull request #797 from alexcustos/issue_alternative_log_in
Added default scheme when server returns just a host
2018-11-09 08:52:39 +01:00
Aleksandr Borisenko
f5586baee7 Added default scheme when server returns just a host 2018-11-08 11:35:27 +03:00
Aleksandr Borisenko
bb2d31a2bd Removed explicit initialization; Fixed RAND_bytes not found 2018-11-08 11:24:39 +03:00
J-P Nurmi
3a6d0ee29c SettingsDialog: disable unnecessary wrapping for the about label
For some reason, QLabel with rich text and word wrapping enabled
calculates quite a bit too large size hint. Luckily, it's rich text
that is already divided to paragraphs so that wrapping makes actually
very little visual difference. For example, on my screen, when the
settings dialog is resized horizontally to the minimum, the only word
that actually wrapped was "2017". After this patch, it naturally won't
wrap anymore, but the General Settings page also doesn't leave a large
gap at the bottom. As a result, the minimum height of the dialog went
down from 581 to 525. The exact values depend on the style and fonts.

Fixes #91.
2018-11-07 20:01:28 +01:00
J-P Nurmi
ee8bcb2a5b Add a command line option to launch the client in the background
Allow passing a --background argument to force the app in the background
even if systray is not available.

Fixes #737
2018-11-07 18:42:36 +01:00
J-P Nurmi
d01a99e9e5 ActivityWidget: remove a hard-coded white background
Let the system palette provide the appropriate color.

Fixes #742.
2018-11-05 22:13:34 +01:00
J-P Nurmi
b8d97b590f Fix palette usage in ActivityItemDelegate::paint()
Fixes #742.
2018-11-05 20:18:54 +01:00
Roeland Jago Douma
fe60a2a570
Use Nextcloud
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-05 13:27:30 +01:00
Roeland Jago Douma
ef15534c64
Merge branch 'master' into margins 2018-11-04 19:40:40 +01:00
Roeland Jago Douma
0c535872cb
Merge branch 'master' into feature/migrate_http_to_webflow 2018-11-04 13:47:04 +01:00
J-P Nurmi
028979d752 ActivityWidget: remove double margins
To align margins with the account settings tab, so the content doesn't
jump when switching tabs.
2018-11-03 23:03:54 +01:00
J-P Nurmi
1e1d116052 SettingsDialog: remove an unused button box
This makes the bottom margin aligned with horizontal margins, and
eliminates a warning on startup:

    [unknown QObject::connect: Cannot connect (null)::clicked() to OCC::SettingsDialog::accept()
2018-11-03 22:49:48 +01:00
Roeland Jago Douma
045bba0161
Migrate http auth to webflow
This moves all the basic http auth over to the webflow mechanism.
This thus also makes sure that if the password changes a webflow page
pops up. And thus will directly move them over to apptokens then.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-03 12:37:53 +01:00
Roeland Jago Douma
af8a2819be
Merge pull request #768 from nextcloud/fix/766/copy_over_old_windows_config
Copy over config file to new location on windows
2018-11-02 21:01:22 +01:00
Roeland Jago Douma
0f767ed995
Increase durations a bit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 11:10:57 +01:00
Roeland Jago Douma
e6f1d7632a
Merge branch 'master' into slideshow 2018-11-02 10:43:01 +01:00
Roeland Jago Douma
40c36a9ed3
Merge pull request #756 from jpnurmi/add-button
Make the "Add Folder Sync Connection" button act like a button
2018-11-02 10:39:00 +01:00
Roeland Jago Douma
67714d33db
Merge pull request #744 from jpnurmi/remove-qtsvg-include
Build fix: remove an unused QtSvg/QSvgRenderer include
2018-11-02 10:31:01 +01:00
Roeland Jago Douma
e01cb108e1
Merge pull request #754 from kevin147147/patch-1
theming for general settings ui
2018-11-02 10:08:18 +01:00
Roeland Jago Douma
3e634dad70
Merge pull request #764 from Awesome-Technologies/user_group_widget
Fix warning in ShareUserGroupWidget
2018-11-02 10:05:14 +01:00
Roeland Jago Douma
188a1a6e24
Copy over config file to new location on windows
Fixes #766

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-01 15:02:31 +01:00
Roeland Jago Douma
899fca12ba
Merge pull request #721 from storca/patch-1
Inform user that configuration is not writable
2018-11-01 11:44:37 +01:00
Roeland Jago Douma
0f1395fdf0
Merge pull request #758 from nextcloud/self-signed-login-flow
Allow to use the login flow with a self signed certificate
2018-11-01 11:43:54 +01:00
Manuel Stahl
c9f720b68d Fix warning in ShareUserGroupWidget
Change-Id: I63091c67cd56dce241f04ed6badc090bb25cad5f
2018-11-01 10:26:19 +01:00
Roeland Jago Douma
bb4c180c89
Merge branch 'master' into upstream/wizard 2018-11-01 08:32:12 +01:00
Roeland Jago Douma
3b5d8f0277
Merge branch 'master' into upstream/pr/6656 2018-11-01 08:07:55 +01:00
Roeland Jago Douma
5cfdc71ca5
Merge branch 'master' into upstream/pr/6671 2018-10-31 21:13:10 +01:00
J-P Nurmi
08879c0f14 Make the "Add Folder Sync Connection" button act like a button 2018-10-31 20:05:14 +01:00
Roeland Jago Douma
b7d0e5672a
Merge branch 'master' into upstream/pr/6616 2018-10-31 13:51:34 +01:00
Roeland Jago Douma
cb4450864e
Merge pull request #656 from nextcloud/upstream/pr/6672
Settings: Attempt to fix rename issue on old macOS
2018-10-30 23:04:34 +01:00
Roeland Jago Douma
ef3aeb65cc
Merge pull request #658 from nextcloud/upstream/pr/6698
OAuth: Fix infinite loop when the refresh token is expired
2018-10-30 23:04:09 +01:00
Roeland Jago Douma
aca75ee982
Merge pull request #403 from nextcloud/upstream/pr/6372
Partial local discovery: Fix scheduling logic
2018-10-30 23:03:16 +01:00
Roeland Jago Douma
326c872ba7
Merge pull request #663 from nextcloud/upstream/pr/6707
Windows: Release handle/fd when file open fails #6699
2018-10-30 22:40:44 +01:00
Roeland Jago Douma
8df9746005
Merge branch 'master' into upstream/pr/6372 2018-10-30 22:37:30 +01:00
Roeland Jago Douma
668c53a0af
Allow to use the login flow with a self signed certificate
The QWebEngine uses a different certificate store/system. So we can't
just pass wour accepted certificates in there.

As a work around we now trust the url we set by definition. As this has
to already be approved before we access this.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 22:23:10 +01:00
kevin147147
30032f9c0c
i18n for general settings ui 2018-10-30 17:32:52 +01:00
J-P Nurmi
1d3d261e38 Setup wizard: implement an animated and interactive slide show 2018-10-29 19:10:27 +01:00
J-P Nurmi
f48aabf344 Build fix: remove an unused QtSvg/QSvgRenderer include
Slipped in in 156605c.
2018-10-25 21:32:43 +02:00
Julius Härtl
99d4f81892
Merge branch 'master' into upstream/pr/6592 2018-10-24 22:38:11 +02:00
storca
ef8e029cbf
Merge branch 'master' into patch-1 2018-10-24 18:10:35 +02:00
Roeland Jago Douma
eb31e9205c
Merge branch 'master' into upstream/issues/6696-6610 2018-10-24 16:50:39 +02:00
Roeland Jago Douma
174f99728f
Merge branch 'master' into upstream/pr/6617 2018-10-24 16:27:31 +02:00
Roeland Jago Douma
d246c1e8b9
Merge branch 'master' into upstream/pr/6485 2018-10-24 08:27:11 +02:00
Roeland Jago Douma
091c4fd9b0
Merge branch 'master' into upstream/pr/6688 2018-10-24 07:29:10 +02:00
Julius Härtl
23883b2b60
Merge branch 'master' into patch-1 2018-10-23 23:11:21 +02:00
Dominik Schmidt
cddb9aa8ba
Support higher resolution theme icons 2018-10-23 23:07:17 +02:00
Roeland Jago Douma
24606c0105
Merge branch 'master' into upstream/pr/6632 2018-10-23 22:51:12 +02:00
Roeland Jago Douma
6b7328bb87
Merge branch 'master' into upstream/pr/6632 2018-10-23 22:48:34 +02:00
Roeland Jago Douma
f3529e3dd7
Merge branch 'master' into upstream/pr/6674 2018-10-23 21:43:13 +02:00
Roeland Jago Douma
c37186cc56
Merge branch 'master' into upstream/issue/6581 2018-10-23 21:08:51 +02:00
Roeland Jago Douma
35c0c9c0b1
Merge branch 'master' into upstream/issue/6522 2018-10-23 20:13:28 +02:00
Roeland Jago Douma
0cf2970134
Merge branch 'master' into upstream/pr/6605 2018-10-23 12:32:16 +02:00
Roeland Jago Douma
1c8307f264
Merge branch 'master' into fix-issue-268 2018-10-23 12:04:14 +02:00
Roeland Jago Douma
a492ab8294
Merge branch 'master' into upstream/issue/6545 2018-10-23 10:59:56 +02:00
Roeland Jago Douma
156308c72e
Merge branch 'master' into upstream/issue/6581 2018-10-21 14:19:07 +02:00
Roeland Jago Douma
2dc7ff7332
Merge branch 'master' into upstream/pr/6360 2018-10-19 16:13:09 +02:00
Roeland Jago Douma
7ace48d5de
Merge pull request #643 from nextcloud/upstream/pr/6615
Log: Adjust update/reconcile log verbosity
2018-10-19 16:04:26 +02:00
Roeland Jago Douma
56ccff4ee8
Merge pull request #654 from nextcloud/upstream/sqlite-version-3-24
sqlite: Update bundled version to 3.24.0
2018-10-19 16:03:04 +02:00
Roeland Jago Douma
9d9f96a685
Merge branch 'master' into upstream/pr/6615 2018-10-19 15:43:50 +02:00
storca
4bd3829f78
Merge branch 'master' into patch-1 2018-10-16 21:17:58 +02:00
Roeland Jago Douma
6805d91033
Merge branch 'master' into fix-issue-665 2018-10-15 13:47:18 +02:00
Camila San
45ff3385c7
Uses QByteArray to store private key.
Removes QSslkey. See #268

Signed-off-by: Camila San <hello@camila.codes>
2018-10-15 00:21:08 +02:00
storca
620908523e
Update accountmanager.cpp
Fixed syntax error
Possible fix for issue #720
2018-10-13 18:45:01 +02:00
storca
8a996ba9a9
Update accountmanager.cpp
Fixed issue #720 by adding the isWrittable method
2018-10-13 18:36:40 +02:00
kevin147147
e214234001
Rename README to README.md
Preview :)
2018-10-08 21:01:08 +02:00
kevin147147
54e58b51ab
Rename INSTALL to INSTALL.md
Preview :)
2018-10-08 20:57:34 +02:00
Camila San
debe37308f
Fixes #665 Adds slot for confirmShare button.
Signed-off-by: Camila San <hello@camila.codes>
2018-10-08 20:56:01 +02:00
Camila San
63d7e54ef3
Updates submodule qtmacgoodies.
Signed-off-by: Camila San <hello@camila.codes>
2018-09-11 16:11:47 +02:00
Markus Goetz
a2f4917daf
SettingsDialogMac: Show the page for the newly created account 2018-09-11 13:45:01 +02:00
Olivier Goffart
a09f1d14ba
SettingsDialog: Show the page for the newly created account 2018-09-11 13:44:22 +02:00
Christian Kamm
4bd2545dad
Windows: Release handle/fd when file open fails #6699 2018-09-10 21:17:20 +02:00
Olivier Goffart
08e4ba3363
Data-Fingerprint: Fix backup detection when fingerprint is empty
Add a test to test the data fingerprint feature make me realize it was broken.
The code was relying in the distinction between empty and null QByteArray,
but this was a bad idea as this difference is lost when going through QString.
2018-09-10 20:44:03 +02:00
Olivier Goffart
3b2c6d2202
OAuth: Fix infinite loop when the refresh token is expired
The server reply with a code 400 when the token is invalid,
the client was understanding this error as a network error, and was retying
again with the same token.

Instead, we must rely on what the json is saying, even if the reply is
not a 200 code.

Issue https://github.com/owncloud/enterprise/issues/2777
2018-09-10 20:22:40 +02:00
Markus Goetz
4f83bba829
Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY
Too many applications incorrectly use this attribute.

For #6696 #6610
2018-09-10 20:20:40 +02:00
Markus Goetz
109947ba3f
Settings: Attempt to fix rename issue on old macOS
Found by @hurradieweltgehtunter
2018-09-10 17:34:48 +02:00
Christian Kamm
5b228d1afd
Do not require server replies to contain an mtime
The check was added for #6317 in commit
13eb64584f.

We did see missing mtimes in replies in tests with live servers though.
Possibly those were old incomplete responses cached in the stat cache?
2018-09-10 17:33:53 +02:00
Markus Goetz
b873311bc5
sqlite: Update bundled version to 3.24.0
For OS X and Windows.
2018-09-10 16:44:16 +02:00
Christian Kamm
3ec4fc6145
Update: Report on readdir() errors #6610 2018-09-10 14:33:36 +02:00
Olivier Goffart
b3e4ec9454
FolderMan::checkPathValidityForNewFolder: make sure to work when folder points to deleted folders
Note that we also needed to adjust the server url to contains the user name
in the folder wizard. (As checkPathValidityForNewFolder expect the user name)

Issue #6654
2018-09-09 22:02:44 +02:00
Olivier Goffart
39c6196487
Wizard: show a message when the URL is invalid
Rather than let Qt show "Host not found"

Issue #6646
2018-09-09 21:47:03 +02:00
Olivier Goffart
986cf448a9
Wizard OAuth2 Page: add a context menu to copy the link
Relates to https://github.com/owncloud/enterprise/issues/2600
2018-09-09 21:46:42 +02:00
Olivier Goffart
67f793a49e
Log: Remove inaccurate comment about --logdebug
The exact string is actually "sync.*.debug=true\ngui.*.debug=true".
And this is not strictly equivalent to setting the env var, as it
calls QLoggingCategory::setFilterRules.
Over all, that's an implementation details that users do not care about.
2018-09-09 21:44:55 +02:00
Olivier Goffart
d202942a2c
Reconcile: When detecting a local move, keep the local mtime
https://github.com/owncloud/client/issues/6629#issuecomment-402450691
2018-09-09 21:38:10 +02:00
Christian Kamm
283c4b13a1
Log: Adjust update/reconcile log verbosity
Not having these enabled by default is causing significant extra back
and forth with reporters since they must manually use --logdebug for the
log to be useful.
2018-09-09 21:34:41 +02:00
Olivier Goffart
40007537ea
OAuth: Remove the timeout
There is no real reason to have a timeout. The connection can stay open
as long as we are not authenticated. The User can still re-open a browser
from the UI at any time.

Issue #6612
2018-09-09 17:57:38 +02:00
Markus Goetz
6122a47241
UpdateInfo: Remove unused code 2018-09-09 17:39:56 +02:00
Christian Kamm
ce3339a00f
fixup: remove outdated Qt5.5 workaround code 2018-09-09 17:27:30 +02:00
Christian Kamm
14df7a3273
fixup: use initializer for contextMenuVisibleManual 2018-09-09 17:23:49 +02:00
Christian Kamm
9330d2b178
fixup: make logging "info" 2018-09-09 17:15:58 +02:00
Christian Kamm
87dd198b52
Tray workarounds #6545
* Disentangle the previous 'qdbusWorkarounds' into three different
  things
* Make not trusting tray.isVisible() a new workaround
* Introduce env vars for all workaround flags
* Use the workaround flags for OSX
* Determine workaround flags for KDE when the plasma integration plugin
  is missing
2018-09-09 13:17:31 +02:00
Olivier Goffart
a68c95522d
OAuth2: Try to refresh the token even if the credentials weren't ready.
This can happen when the client is started and the internet connection
was not enabled. Then we would fetch the credentials, but we would
no do the refresh token step (because network is down).
So next time we try to connect, we would also not refresh the token
because the credentials are not marked as 'ready'

Reported in
https://github.com/owncloud/client/issues/6522#issuecomment-396845167
2018-09-09 12:00:59 +02:00
Christian Kamm
cba0627a9c
Ensure GETFileJob notices finishing #6581
It could happen that readyRead was emitted for incoming data while the
download was not yet finished. Then the network job could finish with
no more data arriving - so readyRead wasn't emitted again.

To fix this, the finished signal also gets connected to the readyRead
slot.
2018-09-09 11:50:00 +02:00
Camila Ayres
bddc573c54
Merge branch 'master' into fix/279/abstract_webflow_qnam 2018-09-05 12:42:56 +02:00
Oskar Kruschitz
2bfb99f174 Mac Application Icon
Replaced ownCloud.icns with APPLICATION_ICON_NAME variable
2018-09-05 11:57:26 +02:00
Roeland Jago Douma
9f1f99f4db
Add a WebFlowCredentialsAccessManager
Fixes #279

Some setups don't make Qt emit the right signals and the client would
end up in state where it could not do the initial authentications.
This is a similar hack that apparently already was is place for basic
http auth.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-04 20:59:25 +02:00
Camila Ayres
44026763b8
Merge branch 'master' into host_link 2018-09-02 12:55:44 +02:00
Camila Ayres
3a489b73f9
Merge branch 'master' into webview_scale 2018-09-02 12:23:44 +02:00
Tobia De Koninck
d9f79215a7 Fix the hiddensync state in the UI + also sync hidden in cmd 2018-09-01 16:30:27 +02:00
Jan-Christoph Borchardt
309b0b6382 Sync hidden files by default 2018-09-01 16:30:27 +02:00
Óscar Nájera
452f64221e Web view scales vertically
Fix #591
2018-08-31 19:49:13 +02:00
Óscar Nájera
72419a1149 Remove hostButton from setup page 2018-08-31 18:35:52 +02:00
Óscar Nájera
ab5c4749c1 In setup wizard put link to nextcloud installation
Fix #604

Remove the not actionable button but a direct link to the nextcloud
installation page. In this case the button is changed for a label with an
html link to the website.
2018-08-31 18:32:00 +02:00
Camila Ayres
4a47d1c8ef
Merge branch 'master' into unpause_resume 2018-08-30 16:47:28 +02:00
Camila Ayres
efc2f0eded
Merge branch 'master' into login_button 2018-08-30 14:33:00 +02:00
Camila Ayres
3e839b2e44
Merge branch 'master' into unpause_resume 2018-08-30 13:31:34 +02:00
Óscar Nájera
121c0d8433 Hide login button on setup screen
Fix #576
2018-08-30 13:24:23 +02:00
Óscar Nájera
0f80ecbb39 Drop the ToolTipRole from the activity list
Fix #515
2018-08-30 00:37:59 +02:00
Óscar Nájera
d896edeee8 Rename Unpause to Resume
Fix #192
2018-08-29 17:03:07 +02:00
Christian Kamm
2844c925eb
Show a tray message when a folder watcher becomes unreliable #6119 2018-08-28 17:04:25 +02:00
Camila San
64e21d5083
Fixes #538: correctly checks for local sync actitivities.
- Local sync activities are now listed with the sync icon and included
in the correct list: once a file is synced, activityWidget checks for
its status to know if it is an error or if the file was successfully synced.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-24 09:24:32 +02:00
Camila San
d5a0ec7d8b
Fixes #534: interactions with expiration date and password.
- Fixes call for slot when date is set - it was the password
slot for that.
- Adds QProgressIndicator and function to toggle animation.
- Fixes: when date was set, the date was not being correctly set and
displayed.
- Fixes: hides and 'deletes' passsword and expire. date widgets when
the user unchecks it in the toolbox menu.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-21 22:48:51 +02:00
Camila San
eecbdb00de
Fixes #534: can edit permission were always disabled.
- Properly checks files and folder share permissions when displaying
can edit checkbox - which can also be partially checked - and listing
permissios in the tollbutton menu.
- Fixes click on can edit checkbox - which can also change state of
permissions in the toolbutton menu.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-21 22:48:51 +02:00
Camila San
085de2825a
Enhancement #534: hide tool button when there is no share link.
- Only display button when there is a share link.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-21 22:48:51 +02:00
Camila San
cf3ee4b3a4
Fixes share link delete action when clicking on tool button menu.
- Shared point was not handled properly.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-21 22:48:50 +02:00
Camila San
8f7bc8cff9
Changes 'Allow editing' for file sharing to a checkbox instead of a radiobutton.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-21 22:48:42 +02:00
Camila San
c8d5d9a622
Removes dynamic cast when building navigation apps.
- It checks for the menu title to know where to add the apps menu instead of trying to cast
the menu pointer saved in the sender() property.
- The previous solution was not working reliably - see #523
- Adds TODO.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-21 14:57:12 +02:00
István Váradi
8b996772a4 Further QAction constructor fixes 2018-08-15 17:02:28 +02:00
István Váradi
8cbc757a56
Merge branch 'master' into qaction 2018-08-14 17:13:44 +02:00
István Váradi
5bcc4ece77
Merge branch 'master' into qaction 2018-08-14 17:11:00 +02:00
Camila San
135bcaea3e
Fixes #517: changes QPalette for more readability in the activities list.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-14 17:00:43 +02:00
István Váradi
a15a470ea2
Merge branch 'master' into qaction 2018-08-14 16:53:14 +02:00
Camila San
1d4fc91d79
Fixes #518: adds more margin for the text in the activity (only for Windows).
Signed-off-by: Camila San <hello@camila.codes>
2018-08-14 16:32:48 +02:00
Camila San
c1c5e5da5f
Fixes #533: Removes the copy activities/notifications button
- Also removes the signal/slot associated with it.
- Minor changes: removes white background and changes frame style to the
same used in the accountsettings for consistency.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-14 13:53:14 +02:00
István Váradi
14615855d0 Provide parent to QAction 2018-08-14 11:54:08 +02:00
Camila Ayres
8e8a619ee1
Merge branch 'master' into issues/494 2018-08-13 17:42:53 +02:00
Camila San
8fd0ca4587
Removes unused NotificationWidget class.
Since the new activities/notifications list UI this class is not used
anymore.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-13 15:17:40 +02:00
Camila San
2aa942e4b8
Issue #494: removes close button from the settings.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-13 14:24:10 +02:00
Julius Härtl
3576fbb2a5
Remove unused subclass of QWebEngineView
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-11 17:47:40 +02:00
Julius Härtl
8dedb9084e
Make links open in an external browser
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-11 17:38:08 +02:00
Roeland Jago Douma
b85bad0566
Remove nlohmann/json.hpp
Not used so no need to have it lying around

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-08 20:03:04 +02:00
Roeland Jago Douma
c4d7f97e00
Add legal notice button to about dialog
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-02 22:17:11 +02:00
Roeland Jago Douma
aa4ff0c083
Fix include order
Because why not :S

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-02 21:19:57 +02:00
Camila San
9d087b920b
Inserts ShareDialogStartPage in the correct position in the share dialog.
- With the new UI this had to be adapted.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 20:23:26 +02:00
Camila San
2cd32261a2
Checks if share link exists before settings password.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 20:22:37 +02:00
Camila San
8e0398426d
Replaces 'more' (3 dots) png icon for svg in buttons of the share
dialog.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 20:21:11 +02:00
Camila San
44865e0107
Adjustes sizes and margins in the share dialog and its widgets.
- Adds TODO's in commented out code.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
c2c2fe3ce3
Changes Share User/Group widget UI to match the server share UI.
- Display list of permissions in the tool button menu.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
25ff932a0b
Fixes edit permission on share link for files and folders.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
b14aa11c29
Changes share link layout so it looks like the UI on the server.
- Adds icons to Share link and to save password on share dialog.
- Changes wording of the menu options for sharing link.
- Adds functionality to the new menu (mostly permissions).
- More widget size and size policy adjustments.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:16 +02:00
Camila San
a19904657a
Switches order of widgets in share dialog: share link comes first.
- First text input to search for users,then share link and then the list
of users.
- Adjusts size and scroll bar for sharees list.
- Adds option 'can share' to 3 dots menu in share user/group widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:52:28 +02:00
Camila San
7aff1e27c0
Fixes share users/groups widget.
- Existing sharees where not being displayed.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:52:28 +02:00
Camila San
55b0b46bb6
Changes size, size policy, content and margins of the share dialog and its widgets.
- Adds select with permissions to share dialog on the user/group search.
- Changes order of widgets, removes excess of text and do not display empty widgets.
- Share user/group widget: replaces combo box for tool button with permissions.
- Using Fixed as size policy it gives a much smoother user experience
when windows size dinamically changes.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:52:27 +02:00
Camila San
4ecfab4bf3
Improves share dialog.
- Removes the tabs: adds items to a vertical layout.
- Fix spacing and alignment.
- Removes extra text.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:48:42 +02:00
Camila San
0ac532f5c9
Fixes crash on mac OS and linux.
- The crash was happening when the user could not connect and it would
crash on trying to retrieve and display the navigation apps.
- Checks AccountStatePtr earlier in the function
slotNavigationAppsFetched.
- Cast of pointer stored in QVariant to QMenu was not done correctly -
qvariant_cast works best for user type defined or QMetaType known to
QVariant.

Signed-off-by: Camila San <hello@camila.codes>
2018-08-01 00:28:25 +02:00
Julius Härtl
bc96ec8ae1
Fix styling
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-31 13:35:37 +02:00
Julius Härtl
3159a36f25
Make build optional
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-31 13:35:36 +02:00
Julius Härtl
156605c2fa
Use proper URL
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-31 13:35:36 +02:00
Julius Härtl
295750555d
Allow to use provider registration with flow auth
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-31 13:35:35 +02:00
Camila San
32bb1ca449
Aligns copy button to the left in the activity widget.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
a149660ae9
Enables again alternate row color in the activity list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
524a3d4c6a
Returns default icon when no status matches any of the check for SyncFileItem::Status.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
90a2d5a3e7
Aligns text correcty when not all text has content in the activity list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
156b4cf284
Aligns time vertically on the bottom of the notification action text when there is no message.
- Minor fix: gives less space for long text that needed ellipses which
was not showing and set right margin because otherwise text was not
painted correctly and completly.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:04 +02:00
Camila San
ee612bda3a
Fixes crash when folder it is not set in the activity list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:11:03 +02:00
Camila San
a1cab471e8
Comments out slotProgressInfo.
- Added TODO.
- It seems to be working only in some cases.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
f294cf1b93
Changes icons for errors and warnings in the activity list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
31892f5337
Changes background color to white for the Activity list widget.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
e9dbee0df5
Removes alternate color on the rows of Activity Widget.
- Also fixes the click on each activity: the user had to click twice -
one to select the row and then one click to open file manager or
browser.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
9cbf5aa783
Changes icons for actions in Activity List.
- For folder (open file manager) and close (dismiss
notification).

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
36a73432bc
Implements ActivityWidget::slotProgressInfo.
- Attempts to implement slot as it was in the old IssuesWidget.
- It should clean up the activity list when needed -  e.g. when file
conflict was solved.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
b2834e047d
Refactores ActivityListModel::removeFromActivityList.
- Fixes crash when dismissing notification - notification was being
removed from the wrong list.
- Minor changes: removes AccountStatePtr where it was needed anymore now
that ActivityListModel has an _accountState, it doesn't need to be
checked for each activity/notification.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f63434b856
Stores folder in ActivityData.
- The information is needed on ActivityWidget::slotProgressInfo.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
7bc9275a8c
Separates types of errors: SyncErrorType and SyncFileItemType.
- This follows what the enums already being used SynResult::Status and
SyncFileItem::Status.
- Do not display buttons for FileErrorTypes - since they are errors on
local syncing, there is nothing to do in the server.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
7b1569df81
Removes static const from activity widget.
- It didn't need to be static.
- It crashed on Windows (Visual Studio 15 2017 Win64).

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f85825dee4
Adds header and forward declaration of 'QMouseEvent' to ActivityItemDelegate.
To fix compiling for Qt5.7 (drone error).

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
3673603e5a
Fixes buttons clickable area in the activities list.
- Their size was not correctly calculated so it was hard to filter the
clicks on the list. User had to click multiple times before clicking on
the right acceptable area.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
9f9be7814c
Adjust space between action/buttons in the toolbar.
- Minor: cleans up code used for debug.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
938c99ec42
Fixes and improves 'copy to clipboard' output.
- With the merging of activities and notifications the copy to clipboard
function got broken. Had to put it back as it was before.
- The output text from the clipboard was almost unreadeable. Ajusted the
space between texts and used separator '-' instead of ','.
- Minor: cleans up comments.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
4a6b7854f5
Adds 'Join' string for call notifications.
- Stores object_type from the api response to check if notification is a
call so the primary button text and action is 'Join'.
- Puts strings into consts.
- Minor change: Improves comments on ActivityListModel.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
00effb0e2f
Adds 'accept' button for remote share notifications.
- Stores object_type form the api response to check if notification is
remote_share, so the primary button text is 'accept' instead of 'more
information'.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f0ca5dbded
Fix settings dialog for mac.
- Fixes adding/removing accounts with separator in the toolbar -
accounts were not added in the right order and removing was not
including the separator.
- Fixes button sizes in the activities list - the buttons were too small
for the text.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
11484d5588
Removes Protocol and Issues widget files and references.
- Minor changes:
 - Improves comments and qCWarning  messages
 - Removes commented out code.
 - adds TODO's.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
ab3c6da5d7
Gives full path to file to open in file manager.
- The path to the file wa being stored in the wrong activity property.
It was in the action link when it should be in the file.
- Minor: comments out the display of issues and protocol widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f402b1d9e4
Changes icons for opening in file manager and to dismiss notification.
- The icons used before were not really clear on what their function
was.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
ec51428e4d
Fixes the url for the button 'more information'.
- The url for the browser was not full path to the file.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
64d635a046
Fixes the color of the font.
- It was too light when the row was selected.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
9de3985021
Small fixes.
- Align progress indicator to the center.
- Moves unused code.
- Removes unused labels.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
a9cd3b3a6d
Merges errors and protocols into notifications/activities.
- Errors will always be on top, then Notifications comes next and then Activities for last.
- Adds 2 new types of Activity: NotificationType and ErrorType.
- ActivityListModel and ActivityWidget stores AccountState to connect user and widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
d0c72dd642
Makes space smaller bewteen user/activities and network/settings menu.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
9ad2a980ce
Moves the separator to between accounts.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
7e8b5f34d7
Fixes the text length for activities.
- Activities from the server don't have buttons to interact with so
their content can use the full lenght of the row.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
918ccb1ed3
Removes row when notification is dismissed.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
e3c7a5a2ff
Changes Activity list view icons, buttons and drawing.
- Displays the notification icon when available.
- Adds dismiss button with an icon.
- Handles buttons actions in the list view.
- Changes what is painted first (activityitemdelegate) for each row in
the activity list.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
00a73b5ded
Adds class to retrieve icons.
- This is an attempt to cache the icons.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
49377976db
Removes notification row from the view when clicking on Dismiss.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
ef4a30fcb9
Displays a menu once the user clicks on the button in the notifications.
- In activityitemdelegate the mouse events are filtered (ActivityItemDelegate::editorEvent) to check if the user clicked
on a button in the list of activities/notifications. Then a signal is emitted to ActivityWidget that does the rest:
show submenu when there are more options, open browser, open file manager, send request to server.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
9ad01f0819
Fixes order of the notifications: latest on top.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
7fa5e41e8d
Only displays buttons if it is a notification and adjust space left.
- Do not display buttons for activities.
- Adds correctly text and button in the space left depending on the widget size.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
4e4a0da3b7
Returns the activity type to the list view.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
2350b41dc3
List model returns the list of actions for each activity.
- The list of possible actions (server requests( was not being used in
the activityitemdelegate. This is needed to be able to draw the primary
action buttons and other options for each notification in the view.)
- Minor changes:
  - Uses different icons for activities and notifications in the list view.
  - Align elements in the list view of notifications/activities properly.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
d1f4f8a558
Correctly removes actions - account, separator and settings widget from toolbar when account is removed.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
a6331c7a75
Fixes widget stack visibility when switching actions.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
22a6303c9d
Adds space bewteen different accounts and activity.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
1b1468a9c6
Each user has its own list of activities.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
b13f77c0fb
Adds one activity widget for each user.
- ActivityListModel and ActivityWidget stores an AccountState to connect user and widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
8e0c036fc3
Aligns Network and General to the right.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
75c2613b1b
Displays activity and notification messages in the list view.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
908870ccde
Adds notifications to the Activities list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:57 +02:00
Roeland Jago Douma
24efdd3b45
Fix E2E query
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 11:40:58 +02:00
Roeland Jago Douma
6c11c1aa73
Fix query
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 10:33:26 +02:00
Olivier Goffart
d114212333
OwnSql: Fixup after feedback for #6388 2018-07-03 10:33:26 +02:00
Olivier Goffart
779969f865
OwnSql: Put the SQL queries next to their use.
This avoid haivng to modify 4 places when we want to add a query
2018-07-03 10:33:26 +02:00
Olivier Goffart
518fb90757
OwnSql: Some refactoring
Use QByteArray for the query so we don't have to convert twice.
Automatically finish the query when the DB close, so we don't
have to call reset
2018-07-03 10:33:26 +02:00
Christian Kamm
d549c77af6
Issues: Show link to conflicts doc if there are some #6396
The link url is themed.
2018-07-03 10:18:18 +02:00
Roeland Jago Douma
0d70b05b65
Set Accept-language header for webview requests
This way the server will properly translate it for you if it has
translations.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 07:45:02 +02:00
Camila Ayres
9627aad04c
Merge branch 'master' into fix/458/do_not_show_webview_by_default 2018-07-02 22:01:03 +02:00
Christian Kamm
70b5d54082
Proxy settings: Fix bad behavior with empty host
Fixes f6a075ef54 for #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-07-02 21:15:30 +02:00
Roeland Jago Douma
34d964fc80
Do not force to show the webview on construct
Should fix #458

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 20:09:30 +02:00
Roeland Jago Douma
08abc71acb
gui Q_UNUSED
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 13:02:15 +02:00
Roeland Jago Douma
ce545b1e47
propage*encrypted Q_UNUSED
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 12:45:44 +02:00
Roeland Jago Douma
e871359453
Remove unneeded ;
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 11:03:58 +02:00
Roeland Jago Douma
b952fa64ee
Restore logger installation
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 11:01:52 +02:00
Roeland Jago Douma
d2b75cabb2
Remove default trademark text
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 21:36:18 +02:00
Roeland Jago Douma
595cbfaa16
Update urls
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-28 12:46:47 +02:00
Camila San
4c7b7dfcaa
Restores previous text in the about section.
Signed-off-by: Camila San <hello@camila.codes>
2018-06-28 12:33:40 +02:00
Olivier Goffart
c5ace2338c
Theme: unify ownCloudTheme and Theme classes
The goal is to avoid confusion described in issue #6422 by removing
duplicates between the Theme and owncloudTheme.

 - Use the about from ownCloudTheme everywhere
 - Create default applicationIcons() and condifFileName() that should work
   everywhere
 - trayFolderIcon was removed as it is not used
 - the helpUrl from the default Theme now points to the owncloud client
   documentation. Before there was no help entry by default for branded
   client if the function was not overriden.
 - Do not merge functions that would otherwise break compatibility with
   theme that did not override them. For example colors or customMedia.
2018-06-28 12:33:39 +02:00
Camila San
e69a9c61d0
Windows: moves translation files to /i18n.
Signed-off-by: Camila San <hello@camila.codes>
2018-06-26 23:56:34 +02:00
Roeland Jago Douma
9eb950bdcf
Merge pull request #438 from nextcloud/bugfix/413/hide-decrypt-option
Hide decrypt option since it does only work for empty folders
2018-06-23 21:20:46 +02:00
Julius Härtl
92480ec8fb
Hide decrypt option since it does only work for empty folders
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-22 12:13:04 +02:00
Julius Härtl
e42f5648bd
Add indicator to e2e folders
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-22 11:21:30 +02:00
Julius Härtl
655a43db10
Use custom mnemonic dialog
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-22 10:42:01 +02:00
Roeland Jago Douma
48a6ef37b2
Add a button to E2E accounts to show the mnemonic
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-21 19:52:27 +02:00
Roeland Jago Douma
30b211381f
More fixes for the OSX daily builds
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-21 15:22:53 +02:00
Julius Härtl
4ba40a6ce1
Move information icon to warning icon
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-20 16:06:19 +02:00
Roeland Jago Douma
f7bf8c7577
Thread local storage don't work properly on OSX
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-14 21:26:07 +02:00
Christian Kamm
ca8f569371
SocketAPI: Remove SHARE_STATUS
It was never used by a shell integration.
2018-06-11 19:35:17 +02:00
Christian Kamm
2bec587d4d
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-06-11 19:35:16 +02:00
Christian Kamm
d304fcbda7
Rename local discovery option for clarity
It's using full relative filepaths, not just dir paths.
2018-06-11 14:50:01 +02:00
Christian Kamm
77fcff5bdf
Conflicts: Change tags to be more user friendly #6365
From "_conflict-user-yyyymmdd-hhmmss"
to   " (conflicted copy user yyyy-mm-dd hhmmss)"
2018-06-11 14:40:40 +02:00
Roeland Jago Douma
dc41f8a16e Fix windows build
* Reorder openssl header import
* not => !

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-08 16:53:56 +02:00
Christian Kamm
e65caee9cf
Notify if an explicitly excluded folder is created #6222 2018-06-08 14:49:26 +02:00
Christian Kamm
a1d6af60f0
AccountWizard: Reserve space for error label #6546 2018-06-07 15:32:52 +02:00
Olivier Goffart
7c9ec4a55a
Credentials: Retry fetching from the keychain in case the keychain is still starting
When owncloud is restored, at boot time, it might be started before the
crendential manager. So if we detect an error, wait 10 seconds and hopefully
it'd be loaded by then.

Issues: #4274, #6522
2018-06-07 15:18:40 +02:00
Julius Härtl
689ab5b8b3
Merge branch 'master' into upstream/owncloudsynclog 2018-06-07 14:38:49 +02:00
Markus Goetz
3cd21e258e
macOS: Don't use WAL for sqlite3 in /Volumes
For #6049
2018-06-07 10:22:07 +02:00
Christian Kamm
8147963b24
SyncJournal: Explain added file-exists check 2018-06-07 09:50:09 +02:00
Christian Kamm
cc04ce9fe4
SyncJournal: Check file existence even for open dbs #6049
With WAL mode sqlite seems to occasionally crash when the
underlying filesystem goes away.
2018-06-07 09:50:09 +02:00
Christian Kamm
5f793c151c
Upload: Adjust timeout for final job based on size #6527
Some servers have virus scanners and the like that can delay the
response of the final chunked upload assembly significantly, often
breaking the current 5min (!) timeout. See owncloud/enterprise#2480
for details.
2018-06-07 09:38:16 +02:00
Christian Kamm
4fa762b5ce
Propagation: Connection closed is a normal error #6516
Because it sometimes appears in conjunction with server bugs and we
don't want to halt all syncing for other files in these cases.
2018-06-07 09:12:46 +02:00
Olivier Goffart
14ff3534a8
Fix compilation warning
propagateuploadng.cpp:500:10: warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
2018-06-07 08:53:12 +02:00
Christian Kamm
d9640dd79e
PropagateUpload: Fix miscount in abort() #6516
Previously it tried to abort even jobs that had already finished, which
was not going to work as they wouldn't emit finished() again.

Also, in some cases the abortCount would never go to zero and that case
wasn't well documented.
2018-06-07 08:53:12 +02:00
Christian Kamm
96126a53d3
PropagateUpload: Remove unused PropagateUploadFileCommon::abort 2018-06-07 08:53:10 +02:00
Christian Kamm
797b40237e
Partial local discovery: Fix scheduling logic
A recent patch that touched the condition for deciding whether a
periodic full local discovery is necessary accidentally inverted the
condition.
2018-06-06 22:49:50 +02:00
Christian Kamm
898a530ba5
ShareLink: Preserve password when unrelated ui changes #6512 2018-06-06 20:56:34 +02:00
Olivier Goffart
31ba483845
sqlite: Update bundled version to 3.23.1
For OS X and Windows.
2018-06-06 20:40:23 +02:00
Olivier Goffart
fbc1747168
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-06-06 20:31:14 +02:00
Markus Goetz
367d0c39e8
Logging: Avoid the word "Error"
The old code printed "QNetworkReply::NoError"
2018-06-06 20:24:32 +02:00
Christian Kamm
e1ab5f3811
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-06-06 20:11:09 +02:00
Olivier Goffart
073a5184cb
Use std::chrono::milliseconds to represent milliseconds 2018-06-06 17:26:53 +02:00
Olivier Goffart
c4af4a5a85
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-06-06 13:55:34 +02:00
Olivier Goffart
012c638d4e
Uploads: Don't delete unexisting chunks
Since commit 4dc49ff3, we store an entry in the upload info table even
for non chunked uploads. However, if this fails we don't want to remove
non-existant stale chunks if the upload fails.

Without this commit, we would send a DELETE command to clean non-existant
chunks in the dav/uploads/ namespace.
2018-06-06 09:52:02 +02:00
Christian Kamm
de9fb7dc9a
Silence warning by removing unnecessary this capture 2018-06-06 09:15:25 +02:00
Christian Kamm
550b845037
SocketApi/Sharing: Add "copy public link" to menu #6356
* The new menu option will fetch shares and create a new link share if
  no "context menu share" currently exists.
* Various cleanup of common operations in socketapi happened as well,
  in particular there's now FileData::get() that calculates all the
  relevant paths that are useful for most socketapi actions.
2018-06-06 09:15:23 +02:00
Markus Goetz
eb097cbffb
Notifications: Lower hiding timeout
With the 4.5sec timeout, it was very easy to accidently hit the wrong notification
when the previous one dissapeared so late.
2018-06-05 21:24:56 +02:00
Markus Goetz
de1032ebd7
Q_UNUSED: Sprinkle around 2018-06-05 20:45:51 +02:00
Markus Goetz
d3cbe63801
macOS: Implement new dynamic Finder menu items #6328 2018-06-05 20:40:40 +02:00
Markus Goetz
648911f3ab
macOS: Unload the Finder extension on exit #5382 #3819 2018-06-05 20:22:02 +02:00
Christian Kamm
4a81ae75cf
Logging: Add persistent auto-logdir option #6442 2018-06-05 20:07:53 +02:00
Christian Kamm
428cfc5e1c
LogDir: Compress log when switching files #6442 2018-06-05 20:07:53 +02:00
Christian Kamm
9319b6594e
LogDir: Go to new file on Problem/Abort too #6442 2018-06-05 20:07:53 +02:00
Christian Kamm
63c2474b70
Folders: Use "Problem" icon for unresolved conflicts #6277 2018-06-05 19:59:19 +02:00
Christian Kamm
ed5e413751
Share link: Update permission wording #6192 2018-06-05 19:46:04 +02:00
Christian Kamm
09f83f4fa9
SyncJournal: Clear etag filter before sync
Before, we only cleared the _avoidReadFromDbOnNextSyncFilter *after* a
sync which meant that we had to sync twice after selective sync setup.

Now, we clear the filter *before* a sync as well which allows the actual
next sync to write the correct etags to the db again - instead of only
the sync after that one.

Also expand on comments and rename _avoidReadFromDbOnNextSyncFilter to
_etagStorageFilter.
2018-06-05 12:00:20 +02:00
Olivier Goffart
613fd30021
SyncJournalDb::setSelectiveSyncList: Always use a transaction
Issue #6431
2018-06-05 11:15:51 +02:00
Christian Kamm
c57e4dcf03
Blacklisting must prevent parent etag updates #6411 2018-06-05 10:12:11 +02:00
Roeland Jago Douma
a0c458d937
Fix output add E2E again
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-05 09:02:41 +02:00
Olivier Goffart
f4f228de3e
FolderStatusModel: fix potential assert
OCC::FolderStatusModel::slotUpdateDirectories: ASSERT: "parentInfo->_fetching" in file /home/olivier/kdegit/owncloud/mirall/src/gui/folderstatusmodel.cpp, line 599

This can happen if the structure of a folder is change while the user
expands the root folder. In this case, resetSubs() is called which
resets _fetching to false.
Instead, we need to keep a pointer to the job so we can abort it by
deleting it.
2018-06-05 08:12:58 +02:00
Olivier Goffart
3e508329b5
csync_update: add the checksum in the discovery log
Issue #6414
2018-06-05 07:52:29 +02:00
Roeland Jago Douma
32ae670c4e
Merge pull request #325 from nextcloud/upstream/ssl-button-speed
SslButton: Improve speed (especially on macOS) #6031
2018-06-04 17:14:38 +02:00
Roeland Jago Douma
4bd6f2b26d
Merge pull request #323 from nextcloud/upstream/upload-finished-flag
Upload: Simplify 'finished' flag
2018-06-04 17:14:17 +02:00
Roeland Jago Douma
c1171d700e
Merge pull request #322 from nextcloud/upstream/pr/6404
Excludes: Expand doc, Desktop.ini only in root folder
2018-06-04 17:13:23 +02:00
Roeland Jago Douma
3a1dc44ec8
Merge pull request #320 from nextcloud/upstream/issue/6403
propagateuploadv1: don't finalize after a done()
2018-06-04 17:12:52 +02:00
Roeland Jago Douma
3c3f3541d4
Merge pull request #291 from nextcloud/fixEncryptionDecryptionNonEmptyFolder
Forbid to encrypt or decrypt a non-empty folder.
2018-06-04 16:03:25 +02:00
Roeland Jago Douma
c49597d9d8
Merge pull request #319 from nextcloud/upstream/issue/4424
Folder: normalize the local path.
2018-06-04 16:02:49 +02:00
Roeland Jago Douma
321e8c0264
Merge pull request #317 from nextcloud/upstream/issue/3146
SslButton: Add HTTP/2 info #3146
2018-06-04 16:01:44 +02:00
Olivier Goffart
393f6c2310
SyncEngine: remove the "CSync" wording from the error messages
They are confusing for the user.
Example in issue #6274
2018-06-04 15:41:38 +02:00
Olivier Goffart
5f30177bfc
CSync: Remove unused error codes
None of the removed ERRNO code were ever set.
So none of the removed error hapenned anymore
2018-06-04 15:41:38 +02:00
Olivier Goffart
15e93c8a31
CSync: reconcile never returns an error 2018-06-04 15:41:38 +02:00
Olivier Goffart
be29fc2f69
csync: remove CSYNC_PARAM_ERROR
It does not make sense to report such error to the user.
Its goal was to show invalid use of the csync API, but this is now done
with asserts.
2018-06-04 15:41:38 +02:00
Olivier Goffart
0443f8dd4d
csync: Simplify csync_walk_local_tree/csync_walk_remote_tree
Small refactoring
2018-06-04 15:41:38 +02:00
Tomaz Canabrava
9b74a596c6
Forbid to encrypt or decrypt a non-empty folder.
The specs forbid the encryption or decryption of a
non empty folder. so...
1 - check for the sync status, if it's not synced return

as there's no way that I can say that there's items on the
server right now without waiting for the sync to finish

2 - verify if the folder is empty locally

as the user could have send some files to the folder.
2018-06-04 15:33:01 +02:00
Julius Härtl
5df1af79c5
Merge pull request #377 from nextcloud/bugfix/noid/cloudprovidesr_314
Fix cloudproviders after merging #314
2018-06-04 15:32:36 +02:00
Markus Goetz
ab34f36836
owncloudsynclog: 1 MB -> 10 MB #6420 2018-06-03 23:09:23 +02:00
Roeland Jago Douma
f96206705a
Merge pull request #315 from nextcloud/upstream/pr/6379
Discovery: Error if properties are missing #6317
2018-06-03 19:58:21 +02:00
Roeland Jago Douma
4b1c6bb833
Fix cloudproviders after merging #314
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-02 20:46:10 +02:00
Roeland Jago Douma
1262cbf4ef
Merge pull request #314 from nextcloud/upstream/pr/6373
Make sure ignored and conflict files show up in the issues tab even with partial local discovery
2018-06-02 20:20:19 +02:00
Julius Härtl
c9634d65aa
Merge pull request #313 from nextcloud/upstream/pr/6380
ConnectionValidator: change the minimum server version
2018-06-01 15:43:19 +02:00
Markus Goetz
b8b9b93a6e
ShareDialog: macOS grey odditiy #5774 2018-06-01 13:31:22 +02:00
Olivier Goffart
4d7617d64b
Propagator: remove a bunch of code related to the 'Shared' directory
This no longer exists since the owncloud server 7.0 which we no longer
allow to connect to
2018-06-01 13:17:20 +02:00
Olivier Goffart
8484b493e4
ConnectionValidator: change the minimum server version
Forbit connection with server older than 7.0. These server did not have
permission.

Also warn for anything older than 9.1. 9.0 is end of life according to
https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
2018-06-01 13:17:11 +02:00
Olivier Goffart
1b587a1241
ConnectionValidator::Status use Q_ENUM
So no need to have a manual conversion to QString
This is only used in debug message anyway.
2018-05-31 21:56:55 +02:00
Olivier Goffart
311307e8cb
Move ClientProxy and ConnecitonValidator to gui
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
2018-05-31 21:56:55 +02:00
Olivier Goffart
7e05e1e411
owncloudcmd: Do not overwrite the http timeout for json jobs
The AbstractNetworkJob already has a sensible timeout that depends
on an environment variable.
No need to overwrite that with some arbitrary value. (The connection
validator does that because it could cause problems if two connection
validator were to run at the same time. Not a problem here)
2018-05-31 21:56:55 +02:00
Olivier Goffart
204cb470b4
owncloudcmd: Do not read the proxy settings from the gui's config file
The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
2018-05-31 21:56:55 +02:00
Olivier Goffart
9fe8713bdc
Folder: remove unused member 2018-05-31 21:56:44 +02:00
Roeland Jago Douma
c6ef8eec0a
Merge pull request #305 from nextcloud/upstream/pr/6363
SyncEngine: Use separate state for two unicode conversions
2018-05-30 08:04:05 +02:00
Roeland Jago Douma
86741de622
Merge pull request #299 from nextcloud/upstream/pr/6349
Don't delete contents behind directory junctions #6322
2018-05-30 08:03:04 +02:00