16343 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christian Kamm	89376e14d6	Nicer fix for the security issue #3283.	2015-06-03 11:37:26 +02:00
Christian Kamm	e32bd5a59f	Merge remote-tracking branch 'origin/1.8'	2015-06-03 11:36:52 +02:00
Klaas Freitag	53154bcd1e	Merge pull request #3301 from owncloud/fix_3283 ... Abort the request and reset the QNAM if user does not ACK a new cert.	2015-06-03 10:22:13 +02:00
Daniel Molkentin	1d600ceecc	Adjust to new version of NSIS UAC	2015-06-03 08:21:10 +02:00
Daniel Molkentin	e1a36b53dc	NSIS: depend on nsProcess instead of Processes NSIS plugin ... The Processes plugin is no longer maintained, and OBS compiles an up-to-date version of nsProcess for us.	2015-06-03 08:21:10 +02:00
Jenkins for ownCloud	5f91abd7c6	[tx-robot] updated from transifex	2015-06-03 02:18:34 -04:00
Olivier Goffart	12f760535d	Fix folder concatenation with Qt4 ... QUrl in Qt4 do not simplify double slashes like Qt5 does, so we have to take in account different slashes possibilities	2015-06-02 20:47:06 +02:00
Olivier Goffart	e1f94cea4f	FolderStatusModel: handle network error in the LSCol	2015-06-02 20:47:06 +02:00
Olivier Goffart	fc23e810fd	folderstatusmodel: clean includes	2015-06-02 20:01:13 +02:00
Olivier Goffart	e587c8e2dc	multi-account: compile with Qt4	2015-06-02 19:57:41 +02:00
Olivier Goffart	984434c728	AccountSettings: move the progress handling in FolderStatusModel ... This is required to compile with Qt4 because signals were protected. And the logic anyway belongs to the model	2015-06-02 19:45:23 +02:00
Klaas Freitag	75b38d1a2f	Abort the request and reset the QNAM if user does not ACK a new cert. ... This is supposed to fix bug #3283	2015-06-02 12:21:49 +02:00
Jenkins for ownCloud	7f597e5dd2	[tx-robot] updated from transifex	2015-06-01 02:18:41 -04:00
Jenkins for ownCloud	e3be1a176d	[tx-robot] updated from transifex	2015-05-30 02:18:51 -04:00
Lukas Reschke	7880f4da94	Add information how to report security bugs	2015-05-29 19:28:13 +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
RealRancor	6ba3324035	Backport #3004 and #2978 to 1.8	2015-05-28 17:11:03 +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
RealRancor	8cfb17bca6	Backport #3279 to 1.8	2015-05-28 17:00:59 +02:00
Carla Schroder	524aa507e6	Merge pull request #3279 from RealRancor/fix_docs ... Fix syntax issues in troubleshooting docs	2015-05-28 07:32:03 -07:00
Jenkins for ownCloud	211e5ec82e	[tx-robot] updated from transifex	2015-05-28 02:18:51 -04:00
Christian Kamm	2435ba7e7d	Windows: Fix unit test build.	2015-05-27 14:59:28 +02:00
Jenkins for ownCloud	be77e4f57e	[tx-robot] updated from transifex	2015-05-27 02:18:51 -04:00
Olivier Goffart	28a66cb393	SettingsDialogMac: adapt to multi-account	2015-05-26 17:37:15 +02:00
Olivier Goffart	507206367f	Merge branch 'master' into new-ui	2015-05-26 14:56:08 +02:00
Olivier Goffart	9e17ddffae	Confirm feature: document the white/black/unconfirmed lists	2015-05-26 14:41:29 +02:00
Olivier Goffart	a621223cc8	SyncEngine: add an api to set the maximum size of new shared folder that do not require confirmation	2015-05-26 14:41:01 +02:00
RealRancor	d0f81f466e	Fix syntax issues in troubleshooting docs	2015-05-26 12:55:49 +02:00
Olivier Goffart	7bb2834d8b	Confirm feature (The sync engine part)	2015-05-26 12:34:07 +02:00
Olivier Goffart	10d9e53159	Confirm feature: Use selective sync in the database	2015-05-26 12:34:07 +02:00
Olivier Goffart	2c67692958	JournalDb: add a table in the db for the selective sync	2015-05-26 12:33:54 +02:00
Olivier Goffart	5cb10bf6a1	PropfindJob: fix parsing of properties that have a sub element ... The default argument of readElementText is ErrorOnUnexpectedElement which abort the parsing of remaining elements	2015-05-26 12:33:54 +02:00
Olivier Goffart	54a42e401b	More compilation fixes after the merge	2015-05-26 12:33:19 +02:00
Olivier Goffart	6b27d2e703	Merge remote-tracking branch 'origin/1.8'	2015-05-26 12:28:31 +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
Jenkins for ownCloud	f344b42aa9	[tx-robot] updated from transifex	2015-05-26 02:19:54 -04:00
Jenkins for ownCloud	90f4a20a50	[tx-robot] updated from transifex	2015-05-26 01:15:28 -04:00
Daniel Molkentin	793130a533	Win32: Make Setup/Update Mutex theme-unique (2/2) ... Fixes #3272	2015-05-25 21:54:03 +02:00
Vidar Tysse	1ddb162338	Adding Norwegian translation to Client	2015-05-25 21:50:33 +02:00
Daniel Molkentin	070d9d3147	NSIS Installer: Fix Basque, Galician, Slovak, Turkish ... Not sure when this broke, but those languages could never have worked...	2015-05-25 21:48:21 +02:00
Daniel Molkentin	9b73308edd	NSIS: Add Norwegian (Bokmål) translation	2015-05-25 21:41:23 +02:00
Daniel Molkentin	b46a8239e2	NSIS installer tx: Sort/de-whitespace translation file config	2015-05-25 19:45:02 +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
Vidar Tysse	f8b52ffdd3	Adding Norwegian translation to Client	2015-05-25 18:11:00 +02:00
Jenkins for ownCloud	e9d0f5a022	[tx-robot] updated from transifex	2015-05-25 02:18:46 -04:00
Jenkins for ownCloud	5721d8eb64	[tx-robot] updated from transifex	2015-05-24 02:18:48 -04:00
Daniel Molkentin	e708c145fa	Win32: Make Setup/Update Mutex theme-unique ... Fixes #3272	2015-05-23 09:40:31 +02:00
Jenkins for ownCloud	713beeb2a5	[tx-robot] updated from transifex	2015-05-23 02:18:53 -04:00
Klaas Freitag	6c46713701	include qtconcurrentrun header rather than QtConcurrent for Qt4	2015-05-22 14:46:29 +02:00
Olivier Goffart	3754e6c781	Disable the curruption workaround on mac and windows ... The binaries we ship have a patched Qt	2015-05-22 14:19:44 +02:00