chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-16 22:42:45 +01:00
Code
16,161 Commits 4 Branches 173 Tags 91 MiB
v3.2.0-rc2
Commit Graph

16161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominique Fuchs
26f7848821 Fix logic for DELETE prio, now (hopefully) in harmony with destination sorting 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-27 12:21:02 +02:00
Dominique Fuchs
08efb40599
Merge branch 'master' into syncjournal-del-prio 2019-09-27 09:59:32 +02:00
Dominique Fuchs
f81e5be119 Implemented second sorting step for SyncFileVector (merged trees) to prioritize DELETEs 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-27 09:34:49 +02:00
Nextcloud bot
cf4fcebc53
[tx-robot] updated from transifex 2019-09-27 03:04:15 +00:00
Michael Schuster
00db94a73c
Revert "Fix White Window issue on Windows after Qt 5.12.4 upgrade" 
This reverts commit 8f616969ab.

Turns out that with the upgrade to the new released Qt 5.12.5 the issue
has been solved by the Qt developers, so this fix becomes obsolete.

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-09-27 04:58:12 +02:00
Dominique Fuchs
a8ecf486d1 Updated AppImage instructions w/ new desktop file name 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-26 21:01:01 +02:00
Dominique Fuchs
83918619cf Corrected new .desktop file location in forgotten function 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-26 20:56:14 +02:00
Dominique Fuchs
f52c330c22 cleanup and migration for location change 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-26 19:09:40 +02:00
Dominique Fuchs
67ed54671b Adapted for cmd version and added migration step for config file 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-26 17:47:01 +02:00
Dominique Fuchs
fc6b895f52 moved default db sync file to Qt standard path AppDataLocation 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-26 17:09:24 +02:00
Camila Ayres
6f9256f290
Merge branch 'master' into lnx-domainname-desktopfiles 2019-09-26 13:26:22 +02:00
Camila Ayres
f6b03f0186
Merge pull request #1443 from nextcloud/enhancement/change-share-menu-wording 
Improve wording of the context menu in the file manager extension.
 2019-09-26 13:20:42 +02:00
Dominique Fuchs
555c513acb
Merge branch 'master' into lnx-domainname-desktopfiles 2019-09-26 12:51:20 +02:00
Dominique Fuchs
96da4674f9 Updated .desktop file naming scheme 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-26 12:36:05 +02:00
Dominique Fuchs
e5f0ee3b92 Fixed wrongly formatted define statement 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-26 12:35:32 +02:00
Camila Ayres
570041e3b4
Merge branch 'master' into enhancement/change-share-menu-wording 2019-09-26 11:12:43 +02:00
Camila Ayres
c0e7120b12
Merge pull request #1445 from nextcloud/fix-white-window 
Fix White Window issue on Windows after Qt 5.12.4 upgrade
 2019-09-26 11:04:14 +02:00
Michael Schuster
82a73e443c
Merge branch 'master' into fix-white-window 2019-09-26 05:21:42 +02:00
Nextcloud bot
5d3a8e3725
[tx-robot] updated from transifex 2019-09-26 03:03:05 +00:00
Michael Schuster
8f616969ab
Fix White Window issue on Windows after Qt 5.12.4 upgrade 
Qt 5.12.4 seems to introduce a new bug on Windows, causing the settings window
to not be redrawn when re-opening it, for example by clicking at the tray icon.

As a workaround this fix starts a 100 ms timer to be fired once upon
QDialog::showEvent is called.

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-09-26 04:59:17 +02:00
Michael Schuster
cb60e8aa90 Merge branch 'master' of https://github.com/nextcloud/desktop 2019-09-26 01:41:06 +02:00
Camila San
b9f0e444e8
Improve wording of the context menu in the file manager extension. 
'Share...' -> 'Share options'
'private link' -> 'internal link'
Removes 'to clipboard' from 'copy link' options.

Signed-off-by: Camila San <hello@camila.codes>
 2019-09-25 19:54:22 +02:00
Dominique Fuchs
cd89efc24b Fixed some missing 'translatable' exclusions, added missing window titles in flow dialogs 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-25 14:02:59 +02:00
Nextcloud bot
8ebacae846
[tx-robot] updated from transifex 2019-09-25 03:04:06 +00:00
Camila Ayres
7a033395f2
Merge pull request #1438 from nextcloud/enhancement/change-share-menu-wording 
Changes wording in the share context menu.
 2019-09-24 16:52:27 +02:00
Camila San
dd90ed9643
Changes wording in the share context menu. 
Instead of only Nextcloud it says "Share via Nextcloud".

Signed-off-by: Camila San <hello@camila.codes>
 2019-09-24 16:25:03 +02:00
Camila Ayres
d392843c12
Merge pull request #1434 from nextcloud/ui-msg-delete-all-files 
UI improvement: Message box: Delete / Keep all files
 2019-09-24 12:24:36 +02:00
Camila Ayres
e944aa6f2d
Merge branch 'master' into ui-msg-delete-all-files 2019-09-24 12:06:09 +02:00
Nextcloud bot
08c76f5997
[tx-robot] updated from transifex 2019-09-24 03:07:21 +00:00
Nextcloud bot
4c2895c92f
[tx-robot] updated from transifex 2019-09-21 03:02:36 +00:00
Dominique Fuchs
d8dca83dd5
Merge branch 'master' into recipientnote 2019-09-20 19:01:34 +02:00
Dominique Fuchs
0ff91574d2 show only 'shared with you by...' if it's not the current user itself 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-20 18:50:32 +02:00
Michael Schuster
30cff4e4f8
UI improvement: Message box: Delete / Keep all files 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-09-20 16:47:11 +02:00
Nextcloud bot
1138118d8e
[tx-robot] updated from transifex 2019-09-20 03:04:15 +00:00
Dominique Fuchs
be2c1fdb89
Merge pull request #1427 from mawasak/master 
Fix for #1382 "linux client crashes for no discernable reason"
 2019-09-19 19:51:12 +02:00
Dominique Fuchs
030e85c06c
Merge branch 'master' into master 2019-09-19 17:05:04 +02:00
Camila Ayres
b493f03d42
Finish adding tags to the the exemptLabels list for the stale bot. 2019-09-19 14:47:40 +02:00
Camila Ayres
4bfd2a5d77
Update exempt labels config for stale bot. 2019-09-19 13:36:44 +02:00
Camila Ayres
4945dd126a
Add configuration file for funding. 
Bounty source link.
 2019-09-19 13:05:14 +02:00
Camila Ayres
8caa997181
Add configuration file for stale bot. 2019-09-19 12:59:21 +02:00
Dominique Fuchs
2b88ea390c
Merge branch 'master' into recipientnote 2019-09-19 10:05:06 +02:00
Dominique Fuchs
31f3b322c8 Color corrections and sharer=self case implementation 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-19 10:04:52 +02:00
Nextcloud bot
55ebd5154c
[tx-robot] updated from transifex 2019-09-19 03:06:20 +00:00
Mariusz Wasak
dcc33f3417 Fix for #1382 "linux client crashes for no discernable reason" 
There in no "return" in
PropagateUploadFileCommon::slotStartUpload in if (prevModtime != _item-
>_modtime) {... }

There is possibility that
PropagateItemJob::done(status, errorString)
maybe called two times from PropagateUploadFileCommon::slotStartUpload
1. in if (prevModtime != _item->_modtime) {... }
2. in if (fileIsStillChanging(*_item)) {..}
if changes in files are frequent the second call is possible.

This two calls has effect in PropagatorCompositeJob::slotSubJobFinished
and job is removed two times in _runningJobs.remove(i);
(the second time with argumetnt -1 (because first call removed job).

This return was removed in commit
efc039863b - by accident I think.

Good simulation is to synchronize firefox profile with frequent page
refresh.

Signed-off-by: Mariusz Wasak <mawasak@gmail.com>
 2019-09-18 18:18:12 +02:00
Michael Schuster
eab8c1eb7e
Merge branch 'master' into recipientnote 2019-09-18 14:02:47 +02:00
Dominique Fuchs
5a9fc02f07 Correcting autoraise for widget w/ background fill 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-18 13:40:14 +02:00
Dominique Fuchs
9d6780d6c1 Finishing PR #1154 adding note when sharing 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-18 13:37:49 +02:00
Nextcloud bot
811c3c995a
[tx-robot] updated from transifex 2019-09-18 03:04:37 +00:00
Michael Schuster
44ed5744f1 Merge branch 'master' of https://github.com/nextcloud/desktop 2019-09-17 17:46:17 +02:00
Nextcloud bot
179bbffd76
[tx-robot] updated from transifex 2019-09-17 02:55:13 +00:00