 Michael SchusterandGitHub
|
211dbadd1a
|
Merge pull request #2514 from nextcloud/make_it_easier_for_user_to_provide_debug_information
Make it easier for user to provide debug information
|
2020-10-07 17:12:02 +02:00 |
|
|
Michael SchusterandGitHub
|
f90ae66d94
|
Merge pull request #2520 from nextcloud/handle_askForOptionalPassword_capability
Handle ask for optional password capability
|
2020-10-07 15:30:17 +02:00 |
|
|
Michael SchusterandGitHub
|
36002701ed
|
Merge pull request #2512 from nextcloud/fix_updater_with_github_downloads
Handle redirects when downloading updates
|
2020-10-05 16:56:23 +02:00 |
|
|
Michael SchusterandGitHub
|
a0b351b145
|
Merge pull request #2497 from nextcloud/fix/mac-folderwatcher-memory-leak
macOS: Fix memory leak in FolderWatcherPrivate::startWatching
|
2020-10-02 19:30:26 +02:00 |
|
|
Michael SchusterandGitHub
|
5467909389
|
Merge pull request #2478 from Aldaris1985/patch-1
Update propagateupload.cpp
|
2020-10-02 00:07:45 +02:00 |
|
|
Michael SchusterandGitHub
|
b72bfb5c65
|
Merge pull request #2369 from nextcloud/enh/windows-msi
Windows: MSI support & Win32 migration tools
|
2020-09-21 17:35:37 +02:00 |
|
|
Michael SchusterandGitHub
|
0f2784107c
|
Merge pull request #2437 from nextcloud/remove_no_description_available_messages_in_activity_list
If there's no description just say nothing
|
2020-09-18 20:41:34 +02:00 |
|
|
Michael SchusterandGitHub
|
f451e1d2d5
|
Merge pull request #2445 from nextcloud/fix-mac-catalina-login
Entitlement to sign the QtWebEngineProcess with an exception.
|
2020-09-18 06:44:11 +02:00 |
|
|
Michael SchusterandGitHub
|
75aa94be79
|
Merge pull request #2336 from nextcloud/jospoortvliet-patch-1
Some changes to the template...
|
2020-08-29 00:14:16 +02:00 |
|
|
Michael SchusterandGitHub
|
e973c43a7a
|
Merge pull request #2300 from chenecharry/master
Support client builds on VS2019 (QLinkedList is deprecated)
|
2020-08-27 01:27:09 +02:00 |
|
|
Michael SchusterandGitHub
|
24a2b21c2c
|
Merge branch 'master' into master
|
2020-08-27 01:12:30 +02:00 |
|
|
Michael SchusterandGitHub
|
c1cb3e6c49
|
Merge pull request #2309 from nextcloud/update-docs-page-title
Update copyright date and version displayed in the page title.
|
2020-08-25 21:07:18 +02:00 |
|
|
Michael SchusterandGitHub
|
c4b87cd465
|
Merge pull request #2313 from nextcloud/update-issue-template
Add --logdebug parameter to instructions in issue_template for Github.
|
2020-08-25 20:48:59 +02:00 |
|
|
Michael SchusterandGitHub
|
5b8ec5cede
|
Merge pull request #2302 from ivaradi/no-eoan
Do not build for Eoan
|
2020-08-22 00:55:31 +02:00 |
|
|
Michael SchusterandGitHub
|
b60239c29e
|
Merge pull request #2288 from nextcloud/enh/windows-shellext
Windows shell extensions: Use custom GUIDs and prepare for MSI
|
2020-08-20 21:11:34 +02:00 |
|
|
Michael SchusterandGitHub
|
fba50c7c42
|
Merge pull request #2224 from nextcloud/qt-5.12.9-update
Update CI for Qt 5.12.9
|
2020-07-22 15:21:48 +02:00 |
|
|
Michael SchusterandGitHub
|
8fb272a95f
|
Merge pull request #2213 from nextcloud/enh/ci-upload
Drone: Upload AppImage to GitHub using nextcloud-desktop-bot
|
2020-07-20 18:28:44 +02:00 |
|
|
Michael SchusterandGitHub
|
51ce085ab5
|
Merge pull request #2215 from jneplokh/pr/ownCloud-reference-fix
Change ownCloud reference to Nextcloud
|
2020-07-20 02:12:57 +02:00 |
|
|
Michael SchusterandGitHub
|
d55fd09b27
|
Merge pull request #2211 from nextcloud/logo-2.7
Logo update for 2.7
|
2020-07-18 14:41:40 +02:00 |
|
|
Michael SchusterandGitHub
|
a0284d07f6
|
Merge pull request #2183 from nextcloud/fix-delete-base-folders-instr
Prevent empty FileMap in local csync to be processed if folder not empty
|
2020-07-09 23:36:13 +02:00 |
|
|
Michael SchusterandGitHub
|
a94def0e54
|
Merge pull request #2177 from nextcloud/fix-issue-2175
Share link display the correct permissions for files and folders.
|
2020-07-09 06:16:18 +02:00 |
|
|
Michael SchusterandGitHub
|
4fec77e9c0
|
Merge pull request #2168 from nextcloud/display-default-permissions-share
Display the correct default permissions when creating a share.
|
2020-07-09 05:19:56 +02:00 |
|
|
Michael SchusterandGitHub
|
2475fb73b7
|
Merge pull request #2127 from nextcloud/fix/proxy-password-storage
ConfigFile security: Migrate Proxy password to keychain
|
2020-07-06 22:36:21 +02:00 |
|
|
Michael SchusterandGitHub
|
cee8a4ccf6
|
Merge pull request #2106 from nextcloud/fix/proxy-build-libsync
Fix libsync exports for proxy changes in #1886
|
2020-06-18 21:24:25 +02:00 |
|
|
Michael SchusterandGitHub
|
1afb70e114
|
Merge pull request #1886 from nextcloud/enh/proxy
Move the proxyfiles to libsync where they make more sense
|
2020-06-18 20:38:27 +02:00 |
|
|
Michael SchusterandGitHub
|
56f79eb8b4
|
Merge pull request #2093 from nicrame/patch-1
Add photothumb.db to sync-exclude.lst
|
2020-06-18 01:36:00 +02:00 |
|
|
Michael SchusterandGitHub
|
93404c6c1b
|
Merge branch 'master' into patch-1
|
2020-06-18 00:44:52 +02:00 |
|
|
Michael SchusterandGitHub
|
bb78789300
|
Merge branch 'master' into patch-1
|
2020-06-17 17:35:07 +02:00 |
|
|
Michael SchusterandGitHub
|
473f3fd05c
|
Merge pull request #2077 from nextcloud/nullptr-everywhere-comparison
Simplify nullptr comparisons where appropriate
|
2020-06-11 01:03:44 +02:00 |
|
|
Michael SchusterandGitHub
|
3b4c409aab
|
Merge pull request #2063 from nextcloud/fix/mac-bundleinfo-dark-mode-optin
macOS: Opt In to Dark Mode for building against older macOS SDKs < 10.14
|
2020-06-07 16:38:03 +02:00 |
|
|
Michael SchusterandGitHub
|
be48889812
|
Merge pull request #1749 from nextcloud/fix/mac-2.7-qml-tray-build
macOS: Use macdeployqt instead of the old admin/osx/macdeployqt.py
|
2020-06-07 16:17:30 +02:00 |
|
|
Michael SchusterandGitHub
|
3ce88bb62c
|
Merge pull request #2061 from nextcloud/enh/version-display-cmd
Improve command line version info and help display (gui & cmd)
|
2020-06-07 14:38:48 +02:00 |
|
|
Michael SchusterandGitHub
|
b28fe79902
|
Merge pull request #2060 from nextcloud/fix/qt-5.15.0-build-error
Fix Qt 5.15.0 build error (missing include)
|
2020-06-07 03:23:15 +02:00 |
|
|
Michael SchusterandGitHub
|
f286603ffe
|
Merge pull request #1235 from ivan-cukic/ivan/fixing-leaks
Fixing memory leaks in the encryption module
|
2020-06-02 17:47:08 +02:00 |
|
|
Michael SchusterandGitHub
|
e348f6458d
|
Merge pull request #2051 from nextcloud/remove-submodule-binary
Remove Submodule binary (old upstream binaries)
|
2020-05-31 16:06:22 +02:00 |
|
|
Michael SchusterandGitHub
|
a80d0b0f0f
|
Merge pull request #1940 from nextcloud/traywindow-listview-actions
Implemented share functionality in tray window and changed buttons
|
2020-05-29 21:14:21 +02:00 |
|
|
Michael SchusterandGitHub
|
ae0ea12501
|
Merge branch 'master' into traywindow-listview-actions
|
2020-05-29 19:08:21 +02:00 |
|
|
Michael SchusterandGitHub
|
a2fd79bcf7
|
Merge pull request #2035 from nextcloud/add_clang_tidy_pipeline_to_drone
Add clang tidy pipeline to drone
|
2020-05-27 19:14:08 +02:00 |
|
|
Michael SchusterandGitHub
|
c0a9f60d0d
|
Merge pull request #2032 from nextcloud/insulate_testutility_from_user_settings
testLaunchOnStartup shouldn't fail on dev setup
|
2020-05-27 16:10:57 +02:00 |
|
|
Michael SchusterandGitHub
|
ad8075a30b
|
Merge pull request #2023 from nextcloud/use_return_braced_init_list
Use the return braced init list pattern
|
2020-05-27 16:08:19 +02:00 |
|
|
Michael SchusterandGitHub
|
ccc409dbd0
|
Merge pull request #2024 from nextcloud/use_raw_string_literals
Use raw string literals when appropriate
|
2020-05-27 05:54:54 +02:00 |
|
|
Michael SchusterandGitHub
|
044a4bf6b5
|
Merge pull request #2021 from nextcloud/use_default_for_trivial_ctor_and_dtor
Use = default for trivial ctors and dtors
|
2020-05-27 05:17:24 +02:00 |
|
|
Michael SchusterandGitHub
|
b2b0e8f4e4
|
Merge pull request #2020 from nextcloud/use_make_unique
Use make_unique when appropriate
|
2020-05-27 05:10:41 +02:00 |
|
|
Michael SchusterandGitHub
|
4b2684cf4a
|
Merge pull request #2019 from nextcloud/remove_redundant_void_argument
Remove redundant void argument list
|
2020-05-27 05:07:52 +02:00 |
|
|
Michael SchusterandGitHub
|
21c6dd50a2
|
Merge pull request #2018 from nextcloud/use_using
Use using instead of typedef
|
2020-05-27 05:04:55 +02:00 |
|
|
Michael SchusterandGitHub
|
7a102feca8
|
Merge pull request #2017 from nextcloud/remove_redundant_initializer
Remove redundant initializer
|
2020-05-27 05:01:34 +02:00 |
|
|
Michael SchusterandGitHub
|
d4563e9196
|
Merge pull request #2006 from nextcloud/sbeyer-improve-wizard-url-field
Improve URL input field in Wizard
|
2020-05-23 20:06:21 +02:00 |
|
|
Michael SchusterandGitHub
|
ef7d268a63
|
Merge pull request #1990 from nextcloud/use_auto_to_avoid_duplicated_type_names
Use auto to avoiding repeating type names
|
2020-05-20 04:14:14 +02:00 |
|
|
Michael SchusterandGitHub
|
3d2de4fc40
|
Merge pull request #1989 from nextcloud/remove_redundant_virtual
Remove useless virtual, better use override only
|
2020-05-20 03:27:45 +02:00 |
|
|
Michael SchusterandGitHub
|
1f2bfc0f42
|
Merge pull request #1988 from nextcloud/nullptr_everywhere
Use nullptr when appropriate
|
2020-05-20 02:55:15 +02:00 |
|
|
Michael SchusterandGitHub
|
6559ba46bb
|
Merge pull request #1992 from NeroBurner/patch-1
Update github links to desktop repository
|
2020-05-20 02:53:00 +02:00 |
|
|
Michael SchusterandGitHub
|
0c040c9686
|
Merge pull request #1986 from nextcloud/properly_handle_denormalized_href_path
Properly handle denormalized href
|
2020-05-20 01:31:34 +02:00 |
|
|
Michael SchusterandGitHub
|
1f402e3482
|
Merge pull request #1994 from nextcloud/cleanup_stale_files
Remove now unused Qt patch files
|
2020-05-19 20:45:05 +02:00 |
|
|
Michael SchusterandGitHub
|
2744146101
|
Merge pull request #1979 from nextcloud/bump_qt_dependency_to_5_12
Stop supporting Qt older than 5.12
|
2020-05-19 18:57:28 +02:00 |
|
|
Michael SchusterandGitHub
|
4788f5032c
|
Merge pull request #1974 from nextcloud/dont_silently_kill_debug
Don't silently kill debug messages
|
2020-05-12 19:29:54 +02:00 |
|
|
Michael SchusterandGitHub
|
a786c3a972
|
Merge pull request #1972 from nextcloud/fix_fileutil_leak
Fix leak in FileUtil::IsChildFile
|
2020-05-12 17:33:24 +02:00 |
|
|
Michael SchusterandGitHub
|
afae7606cf
|
Merge pull request #1965 from ivaradi/drop-xenial
Do not build for Xenial anymore
|
2020-05-08 20:11:09 +02:00 |
|
|
Michael SchusterandGitHub
|
590d0f25b5
|
Merge pull request #1963 from nextcloud/drone-remove-qt-5.7-and-5.8
Drone: Remove CI builds for Qt 5.7 and 5.8
|
2020-05-07 01:45:46 +02:00 |
|
|
Michael SchusterandGitHub
|
cd8762f2c1
|
Merge pull request #1957 from nextcloud/backport/1954/master
[master] Fix typos.
|
2020-05-04 20:41:42 +02:00 |
|
|
Michael SchusterandGitHub
|
5f75231cf6
|
Merge pull request #1949 from veddox/master
Resolve symlinks when checking for registered paths.
|
2020-05-04 20:17:48 +02:00 |
|
|
Michael SchusterandGitHub
|
0082ff90df
|
Merge pull request #1955 from ivaradi/debian-cleanup
Remove unnecessary Debian build files
|
2020-05-04 19:57:19 +02:00 |
|
|
Michael SchusterandGitHub
|
684f061ab1
|
Merge pull request #1956 from nextcloud/update-changelog
Update ChangeLog with 2.6 series.
|
2020-05-04 19:42:28 +02:00 |
|
|
Michael SchusterandGitHub
|
60684da95d
|
Merge pull request #1933 from nicolasfella/fixdolphin
Fix build of Dolphin integration
|
2020-04-17 20:03:47 +02:00 |
|
|
Michael SchusterandGitHub
|
6e220b10e4
|
Merge pull request #1883 from nicolasfella/contexticon
[dolphin] Add icon to context menu
|
2020-04-16 02:52:34 +02:00 |
|
|
Michael SchusterandGitHub
|
45342d7952
|
Merge pull request #1882 from nicolasfella/detach
Fix container detaching
|
2020-04-15 21:28:51 +02:00 |
|
|
Michael SchusterandGitHub
|
d0b698ed37
|
Merge pull request #1881 from nicolasfella/envempty
Use qEnvironmentVariableIsEmpty
|
2020-04-15 17:52:09 +02:00 |
|
|
Michael SchusterandGitHub
|
ef42635c23
|
Merge pull request #1880 from nicolasfella/timeout
Remove timeout parameter from showMessage
|
2020-04-15 17:28:02 +02:00 |
|
|
Michael SchusterandGitHub
|
92afba538f
|
Merge pull request #1879 from nicolasfella/desktopentry
Add desktop-entry hint to notifications
|
2020-04-15 17:15:48 +02:00 |
|
|
Michael SchusterandGitHub
|
d2d9d29b55
|
Merge pull request #1848 from nextcloud/fix-webview-missing-qobjects
WebView: Add missing Q_OBJECT macros
|
2020-03-11 01:46:31 +01:00 |
|
|
Michael SchusterandGitHub
|
37f9e62993
|
Merge pull request #1853 from nextcloud/fix/test-updater
Updater: Fix Tests build (failed with BUILD_UPDATER=NO)
|
2020-03-10 23:41:06 +01:00 |
|
|
Michael SchusterandGitHub
|
78776f81e4
|
Merge pull request #1847 from nextcloud/enh/updater
Updater: Enhance UI, make build optional
|
2020-03-10 15:53:47 +01:00 |
|
|
Michael SchusterandGitHub
|
f629e83203
|
Merge pull request #1843 from nextcloud/enh/version-info
Enhance Version info display (minimal info, hide details)
|
2020-03-10 15:52:50 +01:00 |
|
|
Michael SchusterandGitHub
|
275fe95895
|
Merge pull request #1834 from cclauss/python3-issues
Use print() function in both Python 2 and Python 3
|
2020-03-06 02:55:17 +01:00 |
|
|
Michael SchusterandGitHub
|
0e60bf7c82
|
Merge pull request #1838 from nextcloud/enh/share_circles
Allow sharing to circles: https://github.com/nextcloud/circles
|
2020-03-06 02:17:36 +01:00 |
|
|
Michael SchusterandGitHub
|
398c5a2a37
|
Merge pull request #1832 from ivaradi/focal
Added build for Focal
|
2020-03-05 02:45:25 +01:00 |
|
|
Michael SchusterandGitHub
|
601804b78c
|
Merge pull request #1829 from nextcloud/fix-explorer-pinning
Fix Explorer pinning: Add fallbacks for Shell commands (fixes #1599)
|
2020-03-03 20:12:32 +01:00 |
|
|
Michael SchusterandGitHub
|
377526d6f9
|
Merge pull request #1827 from nextcloud/fix-webflow-username-case
WebFlowCredentials: Make username comparison case-insensitive (fix #1741)
|
2020-03-03 06:25:35 +01:00 |
|
|
Michael SchusterandGitHub
|
c6b59c5e58
|
Merge pull request #1826 from nextcloud/fix/qml-tray-msvc-warnings-1
Fix MSVC warnings: Missing return value, cast type
|
2020-03-03 02:38:26 +01:00 |
|
|
Michael SchusterandGitHub
|
7fa44d438d
|
Merge pull request #1823 from nextcloud/fix-http2-disable
Disable HTTP/2 for now due to Qt bug, allow enabling it via env var
|
2020-03-02 03:26:43 +01:00 |
|
|
Michael SchusterandGitHub
|
eb7ed33d98
|
Merge pull request #1744 from nextcloud/qt-traygeometry-workaround
Fix wrong window position on some linux DEs - worked around invalid g…
|
2020-03-01 07:07:47 +01:00 |
|
|
Michael SchusterandGitHub
|
deb90a6ba1
|
Merge pull request #1739 from nextcloud/qml-singleton-style
Outsourcing qml styling into own, centralized module
|
2020-03-01 07:06:20 +01:00 |
|
|
Michael SchusterandGitHub
|
318c749558
|
Merge pull request #1736 from nextcloud/resource-cleanup
Resource cleanup and application-wide svg usage
|
2020-03-01 06:11:17 +01:00 |
|
|
Michael SchusterandGitHub
|
662fbb7b2a
|
Merge pull request #1820 from nextcloud/fix-explorer-integration-2
Fix Explorer integration re-save and hide option on non-Windows
|
2020-03-01 05:43:49 +01:00 |
|
|
Michael SchusterandGitHub
|
bf838bd336
|
Merge pull request #1809 from sroracle/cmake-qml-quick
Fix cmake inclusion of Qml and Quick
|
2020-02-29 21:18:11 +01:00 |
|
|
Michael SchusterandGitHub
|
67e2999f63
|
Merge pull request #1810 from nextcloud/rakekniven-patch-1
l10n: Changes to improve source strings
|
2020-02-24 21:07:12 +01:00 |
|
|
Michael SchusterandGitHub
|
5ab20d4ab1
|
Merge pull request #1802 from nextcloud/feature/update-segment
Updater: Add query-parameter 'updatesegment' to the update check
|
2020-02-21 23:39:10 +01:00 |
|
|
Michael SchusterandGitHub
|
5554488dd8
|
Merge pull request #1768 from nextcloud/umlaut-sync-fix
Fix wrong encoding when specifying extra header with if-match path
|
2020-02-17 01:49:48 +01:00 |
|
|
Michael SchusterandGitHub
|
cf209f4c10
|
Merge pull request #1782 from nextcloud/enh/quota-userinfo
Add UserInfo class and fetch quota via API instead of PropfindJob
|
2020-02-14 12:58:16 +01:00 |
|
|
Michael SchusterandGitHub
|
20f1a01219
|
Merge pull request #1745 from nextcloud/bugfix/noid/use-system-proxy-default
Use system proxy by default if no config file is present
|
2020-01-21 17:29:20 +01:00 |
|
|
Michael SchusterandGitHub
|
8c2d77c68f
|
Merge pull request #1699 from Milokita/test-file-fix
apply http2 qt resend patch from owncloud
|
2020-01-19 18:11:36 +01:00 |
|
|
Michael SchusterandGitHub
|
36e2813169
|
Merge pull request #1737 from nextcloud/appimage-qmlfix
Testing fix for qmldir import with linuxdeployqt AppImage
|
2020-01-19 12:43:32 +01:00 |
|
|
Michael SchusterandGitHub
|
e7f7ad7eb3
|
Merge pull request #1735 from nextcloud/feature/context-menu-direct-edit
Add direct editing to the file manager extension
|
2020-01-18 15:45:49 +01:00 |
|
|
Michael SchusterandGitHub
|
2039872ee5
|
Merge pull request #1565 from nextcloud/qml-tray-menu
New tray window
|
2020-01-18 13:18:45 +01:00 |
|
|
Michael SchusterandGitHub
|
93319a6a61
|
Merge pull request #1623 from nextcloud/mac-prepare-notarization
macOS build: Avoid the Get-Task-Allow Entitlement (Notarization)
|
2019-11-17 21:54:47 +01:00 |
|
|
Michael SchusterandGitHub
|
e9e6b85bd9
|
Merge pull request #1621 from nextcloud/mac-sign-timestamp
Add timestamp to Mac installer code signing
|
2019-11-17 18:12:29 +01:00 |
|
|
Michael SchusterandGitHub
|
c7299dec78
|
Merge pull request #1619 from nextcloud/bumpQt-5.12.5
Bump Qt 5.12.5 image
|
2019-11-17 03:19:25 +01:00 |
|
|
Michael SchusterandGitHub
|
e2cb3aa078
|
Merge pull request #1617 from nextcloud/appimageQt-5.12.5
Upgrade for Qt 5.12.5 in docker-ci
|
2019-11-16 22:09:36 +01:00 |
|
|
Michael SchusterandGitHub
|
fca7b32405
|
Merge pull request #1604 from nextcloud/rakekniven-patch-1
l10n: Remove string from Transifex resource
|
2019-11-14 03:22:29 +01:00 |
|
|
Michael SchusterandGitHub
|
d558af31c9
|
Merge pull request #1605 from nextcloud/revert-1586-qt5.5-compat
Revert and Fix "Remove HTTP/2 support from Xenial"
|
2019-11-14 03:19:09 +01:00 |
|
|
Michael SchusterandGitHub
|
9e8498ad4e
|
Revert "Remove HTTP/2 support from Xenial"
|
2019-11-14 02:22:01 +01:00 |
|