Michael Schuster
b9ad82ceeb
Merge branch 'master' into fix-remote-wipe-proxy
2019-11-04 19:58:56 +01:00
Camila Ayres
fe959fe0d5
Merge pull request #1580 from nextcloud/fix-updater-message
...
Fix updater message: Download link instead of "use the system's updat…
2019-11-04 19:55:39 +01:00
Michael Schuster
6421397083
Fix updater message: Download link instead of "use the system's update tool"
...
Provide a download link to the new version instead of the confusing message that
users should use their "system's update tool to install it".
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-04 19:19:59 +01:00
Camila San
52ae354ca2
Fix remote wipe when a proxy is configured.
...
Signed-off-by: Camila San <hello@camila.codes>
2019-11-04 17:52:02 +00:00
Nextcloud bot
73af9b1cac
[tx-robot] updated from transifex
2019-11-04 03:08:04 +00:00
Nextcloud bot
cdaee7b933
[tx-robot] updated from transifex
2019-11-03 03:09:40 +00:00
Nextcloud bot
6adbd9bd50
[tx-robot] updated from transifex
2019-11-02 03:04:09 +00:00
Nextcloud bot
6acf3871e4
[tx-robot] updated from transifex
2019-11-01 02:56:47 +00:00
XNG
ead2131ba2
Merge branch 'master' of https://github.com/Milokita/desktop
2019-11-01 09:35:19 +08:00
XNG
cf1532acf1
Apply http2 patch from owncloud
...
Signed-off-by: XNG <Milokita@users.noreply.github.com>
2019-11-01 09:35:10 +08:00
XNG
17ca7ab5db
Apply http2 patch from owncloud
...
Signed-off-by: XNG <Milokita@users.noreply.github.com>
2019-11-01 09:22:52 +08:00
XNG
c42332a5ee
Merge pull request #1 from nextcloud/master
...
Just some catch up
2019-11-01 08:48:06 +08:00
Nextcloud bot
c736f48ac9
[tx-robot] updated from transifex
2019-10-31 02:57:51 +00:00
Nextcloud bot
5ac203ebd8
[tx-robot] updated from transifex
2019-10-30 02:56:18 +00:00
Dominique Fuchs
d18e2ba339
Merge pull request #1429 from nextcloud/recipientnote
...
Finishing PR #1154
2019-10-29 14:49:36 +01:00
Dominique Fuchs
7ed03f1f29
resolving conflict with current master
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-29 14:07:26 +01:00
Dominique Fuchs
5301477747
Merge branch 'master' into recipientnote
2019-10-29 12:58:14 +01:00
Nextcloud bot
09c282d9ea
[tx-robot] updated from transifex
2019-10-29 03:05:48 +00:00
Nextcloud bot
f5ff69f8b3
[tx-robot] updated from transifex
2019-10-28 03:05:30 +00:00
Michael Schuster
a15cad0088
Merge pull request #1451 from nextcloud/move-rtfiles
...
Move journal files away from sync folder to standardized location
2019-10-27 18:03:49 +01:00
Michael Schuster
8e8858178b
Merge branch 'master' into move-rtfiles
2019-10-27 17:49:22 +01:00
Michael Schuster
528352ba82
Merge pull request #1449 from nextcloud/lnx-domainname-desktopfiles
...
Linux/Wayland: Updated .desktop file naming scheme
2019-10-27 17:48:28 +01:00
Michael Schuster
e54f127a06
Merge branch 'master' into lnx-domainname-desktopfiles
2019-10-27 17:30:48 +01:00
Michael Schuster
d9fd9cfef2
Merge pull request #1454 from nextcloud/syncjournal-del-prio
...
Prioritize DELETE instruction in SyncFileVector (merged trees)
2019-10-27 17:29:03 +01:00
Michael Schuster
9618500975
fix tab spacing
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-27 17:25:50 +01:00
Michael Schuster
25076f2ddc
tab formatting (just a little more ;p)
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-27 17:03:23 +01:00
Dominique Fuchs
66912071a8
Merge branch 'syncjournal-del-prio' of https://github.com/nextcloud/desktop into syncjournal-del-prio
2019-10-27 16:56:07 +01:00
Dominique Fuchs
e9438549f4
tab formatting
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-27 16:55:37 +01:00
Dominique Fuchs
eff75a2059
Merge branch 'master' into move-rtfiles
2019-10-27 15:43:41 +01:00
Dominique Fuchs
d001d9d1a3
Merge branch 'master' into syncjournal-del-prio
2019-10-27 15:38:43 +01:00
Nextcloud bot
2dcf594fc6
[tx-robot] updated from transifex
2019-10-27 03:04:17 +00:00
Nextcloud bot
076469f385
[tx-robot] updated from transifex
2019-10-26 03:05:59 +00:00
Nextcloud bot
e178eeb7f5
[tx-robot] updated from transifex
2019-10-25 03:06:12 +00:00
Nextcloud bot
a8cf6e0443
[tx-robot] updated from transifex
2019-10-24 03:05:27 +00:00
Michael Schuster
725458b63c
Merge pull request #1554 from sryze/fix-duplicate-apps
...
Fix duplicate items in Apps menu (a bug introduced in #1477 )
2019-10-23 23:44:54 +02:00
Sergey Zolotarev
9a11bef263
Fix duplicate items in Apps menu (a bug introduced in #1477 )
...
Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
2019-10-24 02:55:56 +06:00
Michael Schuster
b184cba953
Merge pull request #1553 from nextcloud/jospoortvliet-patch-1
...
Update ChangeLog
2019-10-23 22:45:55 +02:00
Jos Poortvliet
8b393ce792
Update ChangeLog
...
Link to https://github.com/nextcloud/desktop/releases as there's no plan to keep the changelog file up to date.
2019-10-23 21:30:40 +02:00
Nextcloud bot
f801ffe4f7
[tx-robot] updated from transifex
2019-10-23 03:05:14 +00:00
Camila Ayres
b293a5b818
Merge pull request #1529 from nextcloud/samu-workopen-patch-2-1
...
Replace command line Step 5 Install Homebrew
2019-10-22 15:08:11 +02:00
Camila Ayres
beffd726bd
Merge branch 'master' into samu-workopen-patch-2-1
2019-10-22 15:08:01 +02:00
Camila Ayres
41f6c9e52d
Merge pull request #1530 from nextcloud/samu-workopen-patch-1
...
Update Installing Mac Step 11
2019-10-22 15:01:58 +02:00
Camila Ayres
ce71673824
Merge branch 'master' into samu-workopen-patch-1
2019-10-22 14:59:45 +02:00
Camila Ayres
e05f187fcf
Merge pull request #1544 from asapelkin/address_sanitizer
...
Enabled address sanitizing for tests
2019-10-22 14:59:33 +02:00
Camila Ayres
04b5754653
Merge branch 'master' into address_sanitizer
2019-10-22 14:43:37 +02:00
Camila Ayres
44bc3692fd
Merge pull request #1527 from nextcloud/qt-5.12.5-update-submodules
...
Update submodules for Qt 5.12.5 (qtmacgoodies)
2019-10-22 14:41:51 +02:00
Camila Ayres
3a310f93e0
Merge branch 'master' into qt-5.12.5-update-submodules
2019-10-22 14:31:27 +02:00
Nextcloud bot
706769026d
[tx-robot] updated from transifex
2019-10-22 03:06:06 +00:00
asapelkin
704e34fa99
enabled address sanitizing for tests
...
Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
2019-10-22 01:13:59 +03:00
Roeland Jago Douma
a6fae36cb2
Merge pull request #1536 from nextcloud/ci/bump5.12image/libsecret
...
Bump Qt5.12 image
2019-10-21 20:27:53 +02:00
