chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
14,618 Commits 4 Branches 173 Tags
v2.7.0-beta2
Commit Graph
14618 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Schuster 3bee0bcf04 Merge pull request #1032 from k1l1/master 
Changed max GUI bandwidth limits
 2019-10-10 01:09:01 +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
Michael Schuster a16c1a8957 Merge branch 'master' into for_loop_optimization 2019-10-10 00:41:46 +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
Nextcloud bot 40b2fc8848 [tx-robot] updated from transifex 2019-10-09 03:04:39 +00:00
Dominique Fuchs 6bc13fcab1 Merge branch 'master' into for_loop_optimization 2019-10-08 10:36:25 +02:00
Dominique Fuchs c3cb7dfadd Merge branch 'testSyncFileStatusTracker-winPath' of https://github.com/nextcloud/desktop into testSyncFileStatusTracker-winPath 2019-10-08 08:44:23 +02: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 3ced2a6ea3 Merge branch 'master' into testSyncFileStatusTracker-winPath 2019-10-08 08:37:29 +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
Nextcloud bot 35df5691f2 [tx-robot] updated from transifex 2019-10-08 03:03:10 +00:00
asapelkin 6b71e4ec6f Merge branch 'master' into for_loop_optimization 2019-10-07 15:31:01 +03:00
Camila Ayres 9c199cc753 Merge pull request #1477 from sryze/tray-menu-fix 
Prevent jumping of tray menu
 2019-10-07 12:53:28 +02:00
asapelkin 57f9b8159f Merge branch 'master' into for_loop_optimization 2019-10-07 12:35:18 +03:00
Camila Ayres a94e116926 Merge branch 'master' into tray-menu-fix 2019-10-07 09:56:40 +02:00
Dominique Fuchs 75444e44b9 Merge branch 'master' into master 2019-10-07 09:45:22 +02:00
Nextcloud bot dbfa5dc786 [tx-robot] updated from transifex 2019-10-07 03:02:44 +00:00
asapelkin 17f39bd09d little loops optimization 
Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
 2019-10-07 01:29:55 +03:00
Nextcloud bot 7c8e650c5a [tx-robot] updated from transifex 2019-10-06 03:05:29 +00: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
Dominique Fuchs f3ab9d5fef Merge branch 'master' into master 2019-10-05 10:35:59 +02:00
Nextcloud bot 998354b5ab [tx-robot] updated from transifex 2019-10-05 03:04:09 +00:00
Michael Schuster 852d39e271 Merge pull request #1465 from nextcloud/show-server-vers 
Add server info to menu
 2019-10-05 01:50:38 +02:00
Michael Schuster 7deb74cc22 Merge branch 'master' into show-server-vers 2019-10-05 00:44:08 +02:00
Michael Schuster ba6d1ab886 Merge pull request #1474 from nextcloud/rakekniven-patch-1 
Fixed grammar
 2019-10-05 00:43:05 +02:00
Michael Schuster c72aa457b3 Merge branch 'master' into rakekniven-patch-1 2019-10-05 00:04:39 +02:00
István Váradi 6ed6a5e8ea Merge pull request #1467 from ivaradi/fix-eoan-build 
Remove kdelibs5-dev from the build dependencies for Eoan
 2019-10-04 21:29:51 +02:00
István Váradi fd7ba861a1 Merge branch 'master' into fix-eoan-build 2019-10-04 20:15:38 +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
Nextcloud bot dddb233f16 [tx-robot] updated from transifex 2019-10-04 03:05:53 +00:00
Corentin Noël 04dd02c295 Build with libcloudproviders on debian and in the AppImage 
Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
 2019-10-03 10:33:46 +02:00
Nextcloud bot 3f495a30e0 [tx-robot] updated from transifex 2019-10-03 03:03:10 +00:00
István Váradi 37f74291b5 Remove kdelibs5-dev from the build dependencies for Eoan 
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
 2019-10-02 20:04:23 +02:00
Nextcloud bot 361c5a5a54 [tx-robot] updated from transifex 2019-10-02 03:05:56 +00: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 4dddf88569 Merge pull request #1459 from tribut/fix-ldap-display-name 
Use user-provided username in `displayName()` - Fix #836
 2019-10-01 15:06:15 +02:00
Camila Ayres 7f19d5669b Merge branch 'master' into fix-ldap-display-name 2019-10-01 12:34:39 +02:00
Roeland Jago Douma c6705ecd9c Merge pull request #1462 from tribut/fix-typo-elided 
Fix typo
 2019-10-01 12:02:36 +02:00
Felix Eckhofer 28da954aad Fix typo 
Signed-off-by: Felix Eckhofer <felix@eckhofer.com>
 2019-10-01 08:25:24 +02:00
Nextcloud bot a8fbbc65c1 [tx-robot] updated from transifex 2019-10-01 03:15:23 +00:00
Michael Schuster 47ffcfd561 Merge pull request #1461 from nextcloud/issue/1458 
Checks if exclude file is empty before creating the regular expressions.
 2019-09-30 21:52:04 +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 ea14baff6c Merge branch 'lnx-domainname-desktopfiles' of https://github.com/nextcloud/desktop into lnx-domainname-desktopfiles 2019-09-30 11:00:10 +02:00
Dominique Fuchs 0c4c5c5f8b Fixed typo / double suffix 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-30 10:59:59 +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