Commit graph

12993 commits

Author SHA1 Message Date
Nextcloud bot
24907acc2a
[tx-robot] updated from transifex 2018-12-17 01:48:23 +00:00
Nextcloud bot
01bbfaacf3
[tx-robot] updated from transifex 2018-12-16 01:48:42 +00:00
Nextcloud bot
6d5da44947
[tx-robot] updated from transifex 2018-12-15 01:46:20 +00: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
Nextcloud bot
6d661e0b3d
[tx-robot] updated from transifex 2018-12-13 01:48:20 +00:00
Nextcloud bot
e0430288ce
[tx-robot] updated from transifex 2018-12-12 01:54:46 +00:00
Nextcloud bot
a7b16e3c28
[tx-robot] updated from transifex 2018-12-11 01:47:42 +00:00
Nextcloud bot
abe22d8fe6
[tx-robot] updated from transifex 2018-12-10 05:20:00 +00:00
Nextcloud bot
1ad7116045
[tx-robot] updated from transifex 2018-12-09 01:48:57 +00:00
Nextcloud bot
72777be571
[tx-robot] updated from transifex 2018-12-07 01:47:38 +00:00
Camila Ayres
840904d527
Merge pull request #778 from jpnurmi/background
Add a command line option to launch the client in the background
2018-12-06 09:53:19 +01:00
Camila Ayres
f91678ef24
Merge branch 'master' into background 2018-12-06 09:35:15 +01:00
Nextcloud bot
6cf390f753
[tx-robot] updated from transifex 2018-12-06 01:54:12 +00:00
Nextcloud bot
0ff23eabca
[tx-robot] updated from transifex 2018-12-05 01:48:53 +00:00
Camila San
b37cbea5cc
Updates desktop client version to 2.5.1.
Signed-off-by: Camila San <hello@camila.codes>
2018-12-04 12:18:06 +01:00
Nextcloud bot
fc18fd9a06
[tx-robot] updated from transifex 2018-12-04 01:57:46 +00:00
Nextcloud bot
07116707e5
[tx-robot] updated from transifex 2018-12-03 01:45:39 +00:00
Nextcloud bot
0f935b06e9
[tx-robot] updated from transifex 2018-12-02 01:47:55 +00:00
Nextcloud bot
a0d6f5fb60
[tx-robot] updated from transifex 2018-12-01 01:45:33 +00:00
Nextcloud bot
4ddfc04534
[tx-robot] updated from transifex 2018-11-30 01:46:30 +00:00
Nextcloud bot
9fb5b4a92d
[tx-robot] updated from transifex 2018-11-29 01:48:27 +00:00
Camila Ayres
b97d8ba6db
Merge pull request #898 from nextcloud/nautilus-integration-name
Fix appname for Nautilus integration script.
2018-11-28 12:21:27 +01:00
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