nextcloud
/
desktop
зеркало из https://github.com/nextcloud/desktop.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
13 755 коммитов 473 Ветки 255 Теги 499 MiB
Граф коммитов

13755 Коммитов

Автор SHA1 Сообщение Дата
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
Roeland Jago Douma 4c791abafc
Bump Qt5.12 image 
Main improvement is that this image contains the libsecret.
So when building qtkeychain that should be used.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-21 14:50:25 +02:00
István Váradi 11e14f1726
Merge pull request #1531 from ivaradi/debian-dbus 
Add libdbus-1-dev to the build dependencies
 2019-10-21 14:03:03 +02:00
István Váradi 0273689ca9
Merge branch 'master' into debian-dbus 2019-10-21 11:39:51 +02:00
Nextcloud bot 05a56c2e8e
[tx-robot] updated from transifex 2019-10-21 03:06:00 +00:00
Michael Schuster 325dd8732e
Merge pull request #1487 from nextcloud/testSyncFileStatusTracker-winPath 
Fix tests for Windows platform
 2019-10-20 21:48:36 +02:00
Michael Schuster 4d5dd0f49c
Merge branch 'master' into testSyncFileStatusTracker-winPath 2019-10-20 21:33:19 +02:00
Michael Schuster 39d85fd008
Merge pull request #1532 from nextcloud/fix-msvc-clang-variadic-macro-warning-fix 
MSVC Fix for PR #1526: Fix clang's variadic macro warnings
 2019-10-20 13:31:01 +02:00
Michael Schuster a12164ad53
MSVC Fix for PR #1526: Fix clang's variadic macro warnings 
The recently merged #1526 caused the MSVC Builds on Windows to fail.

This patch sets the new CMake flag only if the compiler it not MSVC.

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-20 12:52:52 +02:00
István Váradi 805b85a4d7 Add libdbus-1-dev to the build dependencies 
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
 2019-10-20 10:23:49 +02:00
Nextcloud bot cacb300ffd
[tx-robot] updated from transifex 2019-10-20 03:08:24 +00:00
samu-workopen 15e36c535f
Update Step 11 
Step 11 is completely outdated, please replace it with: 
Enable git submodules:
$ cd desktop
$ git submodule init
$ git submodule update
Generate the build files:
$ cd build
$ cmake .. -DCMAKE_INSTALL_PREFIX=~/nextcloud-desktop-client -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
 2019-10-19 16:11:49 +02:00
Camila Ayres b5e51c7e34
Merge pull request #1528 from nextcloud/samu-workopen-patch-1 
Update building instructions.
 2019-10-19 15:14:17 +02:00
samu-workopen e4482ef675
Replace command line Step 5 Install Homebrew 
replace brew install "qt5 --with-qtwebkit" with "install qt5" otherwise it will not work
 2019-10-19 15:06:07 +02:00
samu-workopen 09b3be25fc
Update building instructions 
Added links and a description how to clone the repo
 2019-10-19 14:21:04 +02:00
Michael Schuster 7235db2793
Merge branch 'master' into qt-5.12.5-update-submodules 2019-10-19 05:43:23 +02:00