chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-04 17:31:01 +02:00
Code Activity
13,590 Commits 4 Branches 173 Tags
2.6.2-buildtest1
Commit Graph
6388 Commits
Author SHA1 Message Date
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