chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-15 09:30:05 +02:00
Code Activity
17,398 Commits 4 Branches 173 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel MolkentinandGitHub bb5c2cbfa5 Always follow redirects in network jobs (#4905) 
This is a move away from the original policy where jobs
would only follow redirects in special cases.

Two restrictions are in place:

1. We do not allow protocol downgrades (https -> http)
2. We stop redirects after we find them looping (e.g. old = new url, or
indirectly when looping 10 times).

This is closer to RFC conforming behavior, although currently
we will treat 301 replies like they were 302. This is for a separate
commit.

Error handling (and display) also needs improvement.

Addresses #2791
 2016-08-09 16:01:29 +02:00
Daniel MolkentinandGitHub a338b9f269 Merge pull request #5034 from owncloud/fix-5033 
Only accept notification API Capability if endpoint is OCS-enabled
 2016-07-05 12:46:20 +02:00
Daniel Molkentin 801cb42d57 Merge pull request #4939 from owncloud/osx_filewatcher_fix 
OS X filewatcher fix
 2016-06-02 18:37:38 +02:00
Daniel Molkentin ebbe5acf2b Merge pull request #4938 from owncloud/fix_4840 
GUI: don't force the environment variable for high DPI on linux.
 2016-06-02 18:13:25 +02:00
Daniel Molkentin da69756bb0 Merge pull request #4935 from owncloud/fix_updater_memleak 
Fix memleak in updater
 2016-06-02 15:36:49 +02:00
Daniel Molkentin 100ee69ddd Merge pull request #4923 from RobinGeuze/2.2 
Fix Qt4 build
 2016-05-30 11:50:50 +02:00
Daniel Molkentin 2608c7007e Merge pull request #4922 from owncloud/fix_4840 
Don't try to determine pixel ratio with Qt < 5.6.0
 2016-05-30 09:20:50 +02:00
Daniel Molkentin 763016bd8f Merge pull request #4916 from mwleeds/patch-1 
Fix typo in folder.cpp
 2016-05-27 18:13:05 +02:00
Daniel Molkentin 00d20b4a42 Merge pull request #4913 from owncloud/normalize_name_in_filestatus 
Undo regression caused by 727e73d
 2016-05-27 18:08:08 +02:00
Daniel Molkentin b3e16e0eb0 Merge pull request #4825 from owncloud/22-user-manual 
[Doc] 2.2 user manual updates
 2016-05-12 08:20:55 +02:00
Daniel Molkentin 7b0231bfce Merge pull request #4821 from owncloud/notification_doc 
Documentation draft to introduce notifications.
 2016-05-11 21:16:35 +02:00
Daniel Molkentin 6d83e841a9 Merge pull request #4756 from owncloud/revert-4738-fix_3411 
Revert "Disambiguate socket API pathes on Windows with user name"
 2016-04-28 13:53:06 +02:00
Daniel Molkentin b43a9421d2 Revert "Disambiguate socket API pathes on Windows with user name" 2016-04-28 13:52:15 +02:00
Daniel Molkentin 19eca84d4f Merge pull request #4715 from owncloud/translate-desktop-ini 
Adding new resource for the desktop.ini file
 2016-04-22 12:05:15 +02:00
Daniel Molkentin 8b39c6e6ce Merge pull request #4709 from owncloud/fix_4691 
Use QTokenizer to properly parse netrc
 2016-04-21 12:50:43 +02:00
Daniel Molkentin 7730e826b0 Merge pull request #4580 from owncloud/implement_ep_1136 
Implement EP 1136
 2016-03-24 14:58:09 +01:00
Daniel Molkentin cabeeba7c5 Merge pull request #4582 from owncloud/nsis_uninstall_test 
NSIS: Force uninstall before install #4543
 2016-03-18 16:01:41 +01:00
Daniel Molkentin bd72408e7a Merge pull request #4488 from owncloud/21-updates 
doc updates for 2.1.1 release
 2016-02-19 09:16:37 +01:00
Daniel Molkentin 49ba58e991 Merge pull request #4461 from owncloud/bump-year-to-2016 
Bump year to 2016
 2016-02-10 20:01:54 +01:00
Daniel Molkentin 24920a4ad1 update Changelog 2016-02-08 00:21:57 +01:00
Daniel Molkentin 65655584e9 Doc: Instruct to use sha256 for Authenticode signing 2016-02-06 15:01:31 +01:00
Daniel Molkentin b0acc475b0 Bring build documentation up to date, use docker for Win32 xbuild 2016-02-05 14:55:29 +01:00
Daniel Molkentin 834a971e2a Add Dockerfile that allows cross compiling the client 2016-02-05 12:17:31 +01:00
Daniel Molkentin 6701927840 Move ocdoc to current documentation master to catch up with new design 2016-02-04 14:21:23 +01:00
Daniel Molkentin 4d175ae77b Merge pull request #4247 from owncloud/desktopshare 
added desktop sharing
 2015-12-03 20:19:47 +01:00
Daniel Molkentin 9a252995c2 Merge pull request #4243 from owncloud/more21update 
more updates to 2.1 user manual
 2015-12-03 09:47:02 +01:00
Daniel Molkentin d2f1c141d8 Merge pull request #4224 from owncloud/21update 
updates for 2.1 release
 2015-12-01 15:48:35 +01:00
Daniel Molkentin c8ae54d9e8 Merge pull request #3982 from owncloud/20-update 
update 3-dot menu
 2015-10-21 18:49:38 +02:00
Daniel Molkentin f22535e18a Merge pull request #3931 from owncloud/phil-davis-3dot-menu-doc-20 
Update "..." menu documentation for 2.0
 2015-10-08 08:53:41 +02:00
Daniel Molkentin a08a90a718 Merge pull request #3892 from RealRancor/fix_faq 
Fix registry key syntax in FAQ.
 2015-09-27 20:38:13 +02:00
Daniel Molkentin abfd97949d Merge pull request #3810 from owncloud/phil-davis-remove-all 
Remove all files text edit
 2015-09-14 14:06:56 +02:00
Daniel Molkentin 5347a991cf Merge pull request #3806 from owncloud/phil-davis-sync-remove 
Adjust message box text for sync removal
 2015-09-14 14:05:39 +02:00
Daniel Molkentin 7128b0122e Merge pull request #3807 from owncloud/phil-davis-remove-account 
Adjust message box text for account removal
 2015-09-11 14:44:42 +02:00
Daniel Molkentin 1f55598010 Merge pull request #3801 from phil-davis/src2 
Minor typos in client test section
 2015-09-10 17:04:52 +02:00
Daniel Molkentin 2a8aa8a108 Merge pull request #3800 from phil-davis/src1 
cmd and crashreporter minor typos
 2015-09-10 13:58:26 +02:00
Daniel Molkentin 8e2b9c6f12 Merge pull request #3797 from phil-davis/minorstuff 
Minor build etc typos
 2015-09-10 09:49:16 +02:00
Daniel Molkentin b7061618b1 Merge pull request #3789 from hh-lohmann/Terminology 
/doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
 2015-09-10 01:37:10 +02:00
Daniel Molkentin d823809021 Merge pull request #3781 from phil-davis/FSC 
Coin the term 'folder sync connection'
 2015-09-10 01:35:25 +02:00
Daniel Molkentin 22d87218b7 Merge pull request #3601 from individual-it/master 
checking if file or folder is to be shared to fix issue #3556
 2015-08-18 11:45:31 +02:00
Daniel Molkentin bd39543542 Merge pull request #3623 from owncloud/phil-davis-conffile-20 
Conffile doc typo 2.0
 2015-08-18 11:13:46 +02:00
Daniel Molkentin 49949084fb Merge pull request #3628 from owncloud/phil-davis-FAQ-20 
FAQ Doc typo 2.0
 2015-08-18 11:13:26 +02:00
Daniel Molkentin b584f37906 Merge pull request #3627 from owncloud/phil-davis-troubleshooting-20 
Troubleshooting Doc minor typos 2.0
 2015-08-18 11:13:17 +02:00
Daniel Molkentin 70f3b91a1e Merge pull request #3626 from owncloud/phil-davis-architecture-20 
Architecture Doc typos and formatting 2.0
 2015-08-18 11:10:54 +02:00
Daniel Molkentin 15545168d4 Merge pull request #3625 from owncloud/phil-davis-building-20 
Building Doc minor corrections 2.0
 2015-08-18 11:10:38 +02:00
Daniel Molkentin 2d797c9408 Merge pull request #3624 from owncloud/phil-davis-autoupdate-20 
Autoupdate Doc bullet point rendering 2.0
 2015-08-18 11:10:35 +02:00
Daniel Molkentin 8d5ffccaf1 Merge pull request #3622 from owncloud/phil-davis-navigating-20 
Navigating doc typos 2.0
 2015-08-18 11:10:29 +02:00
Daniel Molkentin 855947751e Merge pull request #3621 from owncloud/phil-davis-installing-20 
Installing doc typo 2.0
 2015-08-18 11:10:04 +02:00
Daniel Molkentin 3ce210f298 Merge pull request #3578 from owncloud/LukasReschke-patch-1 
Use HTTPS links
 2015-08-10 12:29:23 +02:00
Daniel Molkentin 6a20ea5e73 Merge pull request #3472 from owncloud/linux_restart_on_new_version 
On Linux restart if new version is found on disk
 2015-08-06 17:47:10 +02:00
Daniel Molkentin 26cb737bb1 Merge pull request #3558 from owncloud/si-units 
Utility: use SI units for the sizes in bytes
 2015-08-05 17:45:53 +02:00
Daniel Molkentin e21ddfedcb Merge pull request #3513 from owncloud/fix_nautilus_plugin 
Fix nautilus plugin
 2015-07-31 16:06:21 +02:00
Daniel Molkentin 59f93b77c3 Merge pull request #3468 from owncloud/3368 
Win32: Do not silent-update if the application is already up-to-date
 2015-07-16 23:02:06 +02:00
Daniel Molkentin 770ca77673 Merge pull request #3467 from owncloud/remove_nsis_appdata_page 
Win32: Remove confusing option to remove AppData
 2015-07-16 17:09:51 +02:00
Daniel Molkentin 0fb43dbc3a Merge pull request #3397 from owncloud/uselibcpp 
OS X: Force linkage against libc++
 2015-07-02 14:26:55 +02:00
Daniel Molkentin 0610d3ea8d Merge pull request #3347 from jturcotte/shell_integration_findersync 
shell_i: Add a FinderSync-based implementation #2340
 2015-07-02 14:20:24 +02:00
Daniel Molkentin c4bc1da171 Merge pull request #3380 from owncloud/doxygenify 
Structure developer documentation
 2015-06-29 18:57:23 +02:00
Daniel Molkentin 95c04e59fe Merge pull request #3314 from owncloud/typo 
from translators on transifex
 2015-06-07 14:21:49 +02:00
Daniel Molkentin 1bec652822 Merge pull request #3303 from owncloud/new_nsis_modules 
NSIS installer module updates
 2015-06-03 21:05:47 +02:00
Daniel Molkentin b1658cb1cf Merge pull request #3291 from RealRancor/backport_3004_2978_1.8 
Backport #3004 and #2978 to 1.8
 2015-05-28 17:22:06 +02:00
Daniel Molkentin e2a26f0eaf Merge pull request #3289 from RealRancor/backport_3279_1.8 
Backport #3279 to 1.8
 2015-05-28 17:03:27 +02:00
Daniel Molkentin abaf2138cf Merge pull request #2978 from RealRancor/doc_virus_scanner 
Add note for on-access virus scanner solutions
 2015-05-26 10:32:17 +02:00
Daniel Molkentin 265b4415c3 Merge pull request #3277 from vidaren/master 
Adding Norwegian translation to Client
 2015-05-25 18:33:16 +02:00
Daniel Molkentin 5c6a6529a6 Merge pull request #3258 from binwiederhier/bugfix/issue3256-mkcol 
Add 'Content-Length: 0' header to MKCOL request; fixes #3256
 2015-05-20 15:48:33 +02:00
Daniel Molkentin 2518fd7059 Merge pull request #3126 from owncloud/equal_user_agents 
Use identical User Agents for csync and the Qt parts
 2015-04-17 10:16:09 +02:00
Daniel Molkentin f455c71338 Merge pull request #2997 from owncloud/fix_shell-integration-python3 
fix python3 syntax errors
 2015-03-23 11:28:28 +01:00
Daniel Molkentin 1d3100848e Merge pull request #2915 from oostenveld/patch-1 
fixed small typo in read me
 2015-03-18 15:25:54 +01:00
Daniel Molkentin ff68caac24 Merge pull request #2900 from rullzer/qt-4.8-fix 
static member QFileInfo::exists is not available on 4.8
 2015-02-27 08:56:40 +01:00
Daniel Molkentin fedf368c7a Merge pull request #2849 from owncloud/nsis_shortcuts_all_users 
Install shortcuts for all users
 2015-02-17 18:13:11 +01:00
Daniel Molkentin 3dea1eb173 Merge pull request #2785 from owncloud/typos 
some typos, grammar and sentence fixes
 2015-02-14 23:56:10 +01:00
Daniel Molkentin adfb216325 Merge pull request #2793 from glensc/patch-1 
use touch from path
 2015-02-08 00:43:03 +01:00
Daniel Molkentin 46abd47bfe Merge pull request #2787 from cmeh/patch-1 
Orthography: "an folder" corrected to "a folder"
 2015-02-06 10:31:57 +01:00
Daniel Molkentin d2670b8473 Merge pull request #2767 from jdhoek/feature/choose-connection-method 
Add dialog to connection wizard for client-side TLS certificates
 2015-02-02 23:22:19 +01:00
Daniel Molkentin ed05a24cc4 Merge pull request #2749 from vtsingaras/patch-1 
Update Toolchain-mingw32-openSUSE.cmake
 2015-01-28 13:10:42 +01:00
Daniel Molkentin 00ed37dd02 Merge pull request #2709 from rullzer/monochrome-state-info-icon 
Resepct theming when no syncs are configure
 2015-01-20 08:21:42 +01:00
Daniel Molkentin 4de815ad67 Merge pull request #2710 from rullzer/sort_folder_order 
Manged folder list in the tray icon is now sorted
 2015-01-19 18:56:55 +01:00
Daniel Molkentin ff695f08f7 Merge pull request #2704 from remixtj/master 
Fix for issue #2703
 2015-01-14 17:48:08 +01:00
Daniel Molkentin 214f925b2f Merge pull request #2692 from owncloud/typo 
fix typo
 2015-01-11 14:12:43 +01:00
Daniel Molkentin 4a819026df Merge pull request #2634 from ryo-on/netbsd-support 
Support NetBSD like FreeBSD or Linux.
 2015-01-08 22:35:44 +01:00
Daniel Molkentin 94d0c28f69 Merge pull request #2629 from owncloud/accountstate 
Refactor Account in preparation for multi account feature
 2015-01-08 15:39:09 +01:00
Daniel Molkentin 3f5c1d2ade Merge pull request #2678 from chrodan/master 
Hide Ignored files in context menu
 2015-01-08 14:29:36 +01:00
Daniel Molkentin 6e4da53e31 Merge pull request #2638 from owncloud/add-slash-as-ignored-character 
fix link and add slash as bad character
 2015-01-07 15:36:09 +01:00
Daniel Molkentin 3f5887cc03 Merge pull request #2565 from owncloud/accountsettings_itemsontop 
Refactor generic settings dialog
 2014-12-01 15:01:45 +01:00
Daniel Molkentin c5a35ad56f Merge pull request #2499 from owncloud/revert-2412-nsis_shortcuts_all_users 
Revert "Install shortcuts for all users"
 2014-11-15 21:05:05 +01:00
Daniel Molkentin 1e94161ec1 Revert "Install shortcuts for all users" 2014-11-15 21:04:33 +01:00
Daniel Molkentin 6f78ff200c Merge pull request #2412 from owncloud/nsis_shortcuts_all_users 
Install shortcuts for all users
 2014-11-15 20:09:29 +01:00
Daniel Molkentin 7246011b62 Merge pull request #2459 from owncloud/typo 
fix typo
 2014-11-12 00:09:22 +01:00
Daniel Molkentin 9a58d0e559 Merge pull request #2469 from owncloud/fixing_indent 
Fixing indent and make nautilus script python3 compatible.
 2014-11-12 00:08:46 +01:00
Daniel Molkentin 52a63a65ef Merge pull request #2110 from owncloud/crashreporter 
Implement CrashReporter using libcrashreporter-qt
 2014-11-12 00:01:58 +01:00
Daniel Molkentin e579504181 Merge pull request #2370 from owncloud/icons-overlay-doc 
Add section on Overlay Icons to 'Using the Synchronization Client'
 2014-11-07 16:52:26 +01:00
Daniel Molkentin cc6e548a78 Merge pull request #2419 from owncloud/updater 
Update and correct doc/autoupdate.rst
 2014-11-06 19:53:33 +01:00
Daniel Molkentin 47e3da9ebf Merge pull request #2414 from owncloud/fix_2365 
Doc: Fix build documentation, adjust it to 1.7.
 2014-10-27 16:15:14 -04:00
Daniel Molkentin 24b07aaaef Merge pull request #2402 from metrix78/spelling 
correct spelling on user is empty error.
 2014-10-26 21:52:03 -04:00
Daniel Molkentin 1bd1c61c3c Merge pull request #2399 from r2evans/patch-1 
add 64-bit windows registry location
 2014-10-25 10:31:04 -04:00
Daniel Molkentin d0b40bab47 Merge pull request #2391 from owncloud/ignore_windows_reserved_characters 
Ignore reserved words on Windows
 2014-10-24 15:39:21 -04:00
Daniel Molkentin 52a5729298 Merge pull request #2319 from owncloud/sqlite_capi 
Introduce a common sqlite layer across csync and mirall.

This avoids conflicts that both each load different and/or updated sqlite versions.
 2014-10-17 12:11:27 +02:00
Daniel Molkentin 0a96aa3aaf Merge pull request #2307 from owncloud/fix-version-jw 
owncloudcmd --version needs this.
 2014-10-12 20:17:57 +02:00
Daniel Molkentin db3318886e Merge pull request #2214 from owncloud/2211 
Implement (most of) #2211
 2014-09-18 00:09:26 +02:00
Daniel Molkentin 6e42ee1bd4 Merge pull request #2194 from tim-vandecasteele/fix-apple-build 
Fix apple build.
 2014-09-12 14:39:26 +02:00
Daniel Molkentin 2d020b5989 Merge pull request #2138 from owncloud/cleanup_shell_integration_nautilus 
Cleanup and make python3 compatible shell integration nautilus
 2014-09-05 15:48:16 +02:00
Daniel Molkentin 86a00eee3f Merge pull request #2079 from owncloud/nsis_use_installlib 
Use InstallLib to install the overlay icons
 2014-08-20 17:19:40 +02:00