Commit graph

13585 commits

Author SHA1 Message Date
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
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
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
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
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
Michael Schuster
207de071f4
Add warning for failed chown in libsync/propagatedownload.cpp
In addition to PR 1409 generate warnings if chown fails.

See: https://github.com/nextcloud/desktop/pull/1409

Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-16 20:26:18 +02:00
Michael Schuster
0845f25f70
Merge pull request #1240 from ivan-cukic/ivan/remote-size-retrieved-race-condition
Race condition in the remote size loading logic
2019-09-16 20:08:29 +02:00
Michael Schuster
916d414543
Merge branch 'master' into ivan/remote-size-retrieved-race-condition 2019-09-16 19:17:00 +02:00
Michael Schuster
b93fbddf05
Merge pull request #1409 from DominiqueFuchs/msvc-warn-audit
Review of msvc/gcc warnings -> code cleanup, prevention of implicit casts, variadic macros
2019-09-16 19:08:10 +02:00
Michael Schuster
b40e3e7b4e
Merge branch 'master' into msvc-warn-audit 2019-09-16 16:55:42 +02:00
Nextcloud bot
44d954ade9
[tx-robot] updated from transifex 2019-09-16 02:55:42 +00:00
Dominique Fuchs
cdc939ae97
Merge pull request #1214 from Thaodan/fix_urlscheme_warning
fix qt warning about registering a URL sheme first.
2019-09-15 19:31:20 +02:00
Dominique Fuchs
a2a753a34b
Merge branch 'master' into fix_urlscheme_warning 2019-09-15 19:12:22 +02:00
Camila Ayres
d0e25c230a
Merge pull request #1149 from nextcloud/bugfixing-slideshow
slideshow buttons
2019-09-15 18:52:05 +02:00
Camila Ayres
82a67a44c4
Merge branch 'master' into bugfixing-slideshow 2019-09-15 18:18:46 +02:00
Camila Ayres
233a423e8c
Merge pull request #1420 from nextcloud/e2e-csr-transmit
Fixing E2E CSR transmission failure for new connections
2019-09-15 17:22:49 +02:00
Dominique Fuchs
5e099adb2f
Merge branch 'master' into e2e-csr-transmit 2019-09-15 12:03:16 +02:00
Dominique Fuchs
a35b346e62 Fixed e2e key transmission issue after generation (forgotten content type on sendrequest())
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-15 11:53:57 +02:00
Dominique Fuchs
7d4406254a
Merge branch 'master' into fix_urlscheme_warning 2019-09-15 09:56:16 +02:00
Nextcloud bot
70091726c9
[tx-robot] updated from transifex 2019-09-15 02:57:10 +00:00
Nextcloud bot
564088680a
[tx-robot] updated from transifex 2019-09-14 02:55:51 +00:00
Dominique Fuchs
1eb61b7949 Fixed unused var
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-13 20:49:59 +02:00
Dominique Fuchs
f6bac6cfdd Merge branch 'bugfixing-slideshow' of https://github.com/nextcloud/desktop into bugfixing-slideshow 2019-09-13 20:38:16 +02:00