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

14674 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt
7d8bba6786
Fix appname for Nautilus integration script
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-11-28 11:54:08 +01:00
Nextcloud bot
f0c6825746
[tx-robot] updated from transifex 2018-11-28 01:48:00 +00:00
Roeland Jago Douma
1490b186f9
Merge pull request #860 from nextcloud/fix/566/do_not_read_system_exclude
Do not read system exclude list if user exclude is present
2018-11-27 11:54:40 +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
Roeland Jago Douma
ab85dfcd67
Merge pull request #880 from nextcloud/fix/873
Write the actual folder to the log
2018-11-27 11:16:10 +01:00
Nextcloud bot
13fdb32d4f
[tx-robot] updated from transifex 2018-11-27 01:51:22 +00:00
Camila Ayres
72901a4ed8
Merge branch 'master' into background 2018-11-26 21:07:14 +01:00
Nextcloud bot
558d3ad492
[tx-robot] updated from transifex 2018-11-26 01:52:12 +00:00
Nextcloud bot
0a04419180
[tx-robot] updated from transifex 2018-11-25 05:19:20 +00:00
Nextcloud bot
fdbc523f85
[tx-robot] updated from transifex 2018-11-24 01:44:00 +00: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
Nextcloud bot
8418507483
[tx-robot] updated from transifex 2018-11-23 02:52:33 +00:00
Roeland Jago Douma
d1b9d100b4
Merge pull request #874 from nextcloud/fix_activity_busy_loop
Fix the activity loop
2018-11-22 23:09:57 +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
Nextcloud bot
528e1bef37
[tx-robot] updated from transifex 2018-11-22 01:47:38 +00:00
Nextcloud bot
73aed1d630
[tx-robot] updated from transifex 2018-11-21 01:47:22 +00:00
Nextcloud bot
7b446eef93
[tx-robot] updated from transifex 2018-11-20 01:48:03 +00:00
Roeland Jago Douma
1afaa22ddb
Merge pull request #859 from nextcloud/fix/788/no_activity_flood
Do not fetch activities if they are not enabled
2018-11-19 23:15:08 +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
44b5e07a80
Merge pull request #847 from jpnurmi/share-dialog-take-2
Share dialog alignment
2018-11-19 20:18:30 +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
Nextcloud bot
a3d1bd3a42
[tx-robot] updated from transifex 2018-11-19 01:46:32 +00:00
Roeland Jago Douma
1c0fbba98e
Merge pull request #854 from nextcloud/enoch85-patch-1
Change link to docs for NC 15
2018-11-18 16:34:14 +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
Nextcloud bot
eaf339b11d
[tx-robot] updated from transifex 2018-11-18 01:48:31 +00:00
Roeland Jago Douma
3a50b57b5a
Merge pull request #848 from nextcloud/rakekniven-patch-1
Fixed typo
2018-11-17 13:08:06 +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
Nextcloud bot
3f2ff2e6ba
[tx-robot] updated from transifex 2018-11-17 02:02:47 +00:00
Roeland Jago Douma
433a059223
Merge pull request #843 from Aentfs/master
Change man page names and contents for nextcloud
2018-11-16 22:35:22 +01:00
Stefan Suhren
d6feb984c3 Change man page names and contents for nextcloud 2018-11-16 16:57:15 +01:00
Nextcloud bot
41f2864ac9
[tx-robot] updated from transifex 2018-11-16 01:47:40 +00:00
Nextcloud bot
b1a2683e62
[tx-robot] updated from transifex 2018-11-15 01:50:21 +00:00
Roeland Jago Douma
4febf7c70b
Merge pull request #823 from Awesome-Technologies/providers
Fix cmake build using WITH_PROVIDERS=OFF
2018-11-14 14:43:42 +01:00