chylex
/
Nextcloud-Desktop
mirror of https://github.com/chylex/Nextcloud-Desktop.git
1
0
Fork 0
Code
17,272 Commits 4 Branches 173 Tags 91 MiB
Commit Graph

95 Commits

Author SHA1 Message Date
Daniel Molkentin c041ca6163 Fix pot. mem leak found by coverity (CID 96004) 2016-05-24 11:21:33 +02:00
Markus Goetz f7082ee3df sqlite: Update to version 3.12.2 
For OS X and Windows
 2016-04-27 12:22:12 +02:00
Olivier Goffart 4e7c09de83 QTokenizer: fix Qt4 build 
QSharedPointer::reset is new in Qt5
 2016-04-26 10:38:20 +02:00
Daniel Molkentin e29d7e0128 Use QTokenizer to properly parse netrc 
Addresses #4691
 2016-04-21 12:46:03 +02:00
Markus Goetz 06c19b0b6f sqlite: Update to version 3.12.1 
For OS X and Windows.
 2016-04-15 12:02:00 +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 2d24585a8f Implement enforcing a static URL postfix. 
Second part of EP 1136
 2016-03-24 14:18:52 +01:00
Markus Goetz 15f6e133a5 sqlite: Update to version 3.11.1 
For OS X and Windows.
 2016-03-18 10:17:41 +01:00
Markus Goetz c8b3df6668 OS X: Fix alignment of "Copy" button in protocol #4207 2016-01-04 16:16:15 +01:00
Klaas Freitag b896d8aa15 ActivityWidget: Fix type (#4204) 2015-11-26 21:41:31 +01:00
Markus Goetz 0163839cfb OS X: Fix toolbar oddity #3719 2015-11-06 10:18:09 +01:00
Markus Goetz f739d8fdd3 sqlite: Update to version 3.9.1 
For OS X and Windows.
This is in line with the tests/benchmarks Olivier is doing on ArchLinux.
 2015-10-21 15:55:41 +02:00
Felix Böhm 3ebc422bb5 Fix qtmacgoodies submodule 
* was broken by 514372db6b
 2015-08-30 17:51:43 +02:00
Markus Goetz 514372db6b Exclude list: Add entries from other sync programs #2814 2015-08-04 09:40:53 +02:00
Jocelyn Turcotte 73209717ec Update the qtmacgoodies submodule 
Include a fix for an assert.
 2015-07-28 15:19:09 +02:00
Markus Goetz 3d55191573 OS X: Fix settings dialog after multi-account introduction 
For #3459 #3386 #3401
 2015-07-16 14:11:06 +02:00
Olivier Goffart ba65187ad3 Fix compilation with Qt 5.5 
Because of commit 90e7cc172a7521396bb2d49720ee4ceb9a9390b3 in qtbase,
we now need to explicitly include QDataStream

Fixes #2809
 2015-04-19 11:02:43 +02:00
Jocelyn Turcotte a5d29e6d56 Fix missing symbols on XP 
Import a fix from libcrashreporter-qt that should remove
usage of symbols not available in XP's msvcrt.dll

This should help solving #2907 with the crash reporter enabled.
 2015-03-04 09:51:54 +01:00
Olivier Goffart d70e146c1f Merge remote-tracking branch 'origin/ssl_client_cert' 
Conflicts:
	CMakeLists.txt
	csync/src/CMakeLists.txt
	csync/src/csync_owncloud.c
 2015-01-28 14:13:40 +01:00
Christian Kamm 7950eb8ed6 sqlite: Update to version 3.8.8.1. #2750 2015-01-28 11:52:04 +01:00
Joachim Schiele 9abc3e1333 fixes required by upstream 2015-01-23 19:22:56 +00:00
Nourredine ba8b1bbe06 adds 'SSL client certificate' support from n.octeau with qknight changes as: 
* removed broken QSsl::SslV3 default
* rewrote slotHandleErrors(): no longer claim errors which are none.
* hack reverted: lib64 was not the cause for NixOS issues related to libraries.
* refactored csync/src/csync_owncloud.c and discovered+fixed why the dav_connect was never getting the certPath+certPassoword
* cleanup of code but seems this crushed the ssl client certificate support
* fixes the https://github.com/owncloud/client/issues/69#issuecomment-69358377 issue
* lots of cleanup
* From TODO list : translate all french comments into english
* changed _pemCertificate type from QString to QByteArray
 2015-01-21 23:55:11 +00:00
Daniel Molkentin cdac8d56d5 Merge remote-tracking branch 'origin/master' into crashreporter 
Conflicts:
	src/libsync/utility.cpp
	src/libsync/utility.h
 2014-11-11 23:53:38 +01:00
Christian Kamm 7ae0338f5c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/socketapi.h
	src/libsync/syncengine.h
	test/CMakeLists.txt
 2014-10-22 10:41:55 +02:00
Markus Goetz 1d5b3aadea sqlite3: Bundle 3.8.6 for Mac and Windows 
it is linked into ocsync.
 2014-10-16 17:38:45 +02:00
Tim Vandecasteele f3cc614427 Fix apple build. 
The apple build was broken because the elseif in the CMakeLists is never triggered.

Some code was not properly adapted for the new qtmacgoodies.

Some paths were not adapted to new split.
 2014-09-12 14:24:26 +02:00
Dominik Schmidt 2b4849a2fa Add crash reporter using libcrashreporter-qt 2014-08-26 18:15:13 +02:00
Markus Goetz faa502163e OS X: Finally(?) fix stay-on-top behaviour of settings dialog 
Fixes #1795
 2014-08-12 14:48:42 +02:00
Olivier Goffart bcfa34357b Add Q_DECL_OVERRIDE for all function that are overriding something 
This was made automatically with
clang-modernize -override-macros -add-override
 2014-07-09 23:31:56 +02:00
Daniel Molkentin 485a6926c5 FancyLineEdit: initialize all members 
This fixes Coverity CID 12912
 2014-06-20 13:46:57 +02:00
Daniel Molkentin 3db3c7b876 Update QtSingleApplication and QtLockedFile 
Fixes stale temp file issues, and is needed for blocking support.
 2014-05-21 11:19:38 +02:00
Denis Dzyubenko 000e0bb600 Fast forwarded qtmacgoodies 2014-03-27 10:39:56 +01:00
Denis Dzyubenko 6c28151e0f Fast forwarded qtmacgoodies submodule 2014-03-26 10:15:35 +01:00
Denis Dzyubenko a51cb0982b Added Mac-specific settings dialog that looks more native 2014-02-18 02:22:16 +01:00
Olivier Goffart c7227297af Make it compile with the merge of csync mirall 2014-01-15 12:20:03 +01:00
Daniel Molkentin a25d55a265 Add QtJson to 3rdparty, use it in ownCloudInfo 2013-10-18 02:00:19 +02:00
Klaas Freitag 59bf8740a0 Add c_jhash.h header from csync to 3rdparty. 2013-10-03 16:41:23 +02:00
Klaas Freitag 82cd79c004 Add unify defines to header. 2013-10-01 13:58:00 +02:00
Olivier Goffart bf6d0a521c Compile with Qt5 2013-08-28 20:58:22 +02:00
Daniel Molkentin 54e4217216 Add Missing LGPL_EXCEPTION.txt 
Fixes #671
 2013-06-10 07:38:35 +02:00
Klaas Freitag 3f3f6c0f39 Move setPlaceholderText to correct class. 2013-04-29 14:09:05 +02:00
Klaas Freitag 5dd53b48ef Add missing lineedit method for ancient Qt versions 2013-04-29 11:08:37 +02:00
Daniel Molkentin 311bd39100 Add simplified FancyLineEdit from Qt Creator to 3rdparty 2013-04-24 13:36:25 +02:00
Klaas Freitag 09e7f5c618 Add qprogressindicator widget 2013-04-24 11:45:53 +02:00
Klaas Freitag 5275238f51 Added 3rdpart QtSingleApplication class. Fixed some overall-status 
issues.
 2012-07-30 17:10:48 +03:00