1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-25 01:42:47 +01:00
Commit Graph

6388 Commits

Author SHA1 Message Date
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
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
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
Terence Eden
e64fa74899
Typo
There's no such thing as a "key*h*chain".
2019-04-28 10:03:38 +01: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
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
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
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