13240 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Roeland Jago Douma	9eabd2a32a	Merge pull request #6 from nextcloud/mergeWithOrigin ... Update master from current owncloud master	2017-10-09 08:50:13 +02:00
Jenkins for ownCloud	3eb2642b11	[tx-robot] updated from transifex	2017-10-09 02:18:35 +02:00
Jenkins for ownCloud	99192a6dec	[tx-robot] updated from transifex	2017-10-08 02:18:36 +02:00
Jenkins for ownCloud	cffc1fd1c4	[tx-robot] updated from transifex	2017-10-07 02:18:37 +02:00
Olivier Goffart	b8f7c6daae	CMakeLists.txt: Put -pie as a linker flag were it belongs ... Fixes warning introduced by PR #6040	2017-10-06 14:35:56 +02:00
Markus Goetz	cd07865da6	Settings Dialog: Fix display name compilation for macOS #6078	2017-10-06 13:34:40 +02:00
Thomas Müller	315e38e814	Use display-name from the ocs call in the settings dialog	2017-10-06 10:59:20 +02:00
Jenkins for ownCloud	95b90271b6	[tx-robot] updated from transifex	2017-10-06 02:18:35 +02:00
Christian Kamm	19c6757a0f	Rename detection: File size must be equal ... Comparison of file sizes for potential conflicts was added in 0eb9401c62, but did not extend to checking the file size in case of potential local moves. This commit adds this check and adds tests for various move+change scenarios.	2017-10-05 22:01:42 +02:00
Christian Kamm	3636a59830	t9.pl: Make more reliable ... Sometimes the 'touch' didn't change the mtime since too little time had passed!	2017-10-05 22:01:42 +02:00
Markus Goetz	548302c367	ChangeLog: Re-format and re-order	2017-10-05 22:01:42 +02:00
Markus Goetz	a64a33c589	ChangeLog: More 2.4.0 changes	2017-10-05 22:01:42 +02:00
Christian Kamm	01bbbb7d08	Excludes: Fix bug with escapes in the regex, add tests	2017-10-05 22:01:42 +02:00
Christian Kamm	f609ea3bef	Excludes: optimize csync_is_windows_reserved_word	2017-10-05 22:01:42 +02:00
Markus Goetz	91223b1a3d	Excludes: During directory traversal, use QRegularExpression ... On Mac, this halves the time spent in csync_excluded_traversal when using check_csync_excluded_performance. A similar performance increase is seen on linux.	2017-10-05 22:01:42 +02:00
Jenkins for ownCloud	ca0f9825ce	[tx-robot] updated from transifex	2017-10-05 22:01:42 +02:00
Markus Goetz	f202593ce4	sqlite: Update bundled version to 3.20.1 ... For OS X and Windows.	2017-10-05 22:01:42 +02:00
Jürgen Weigert	d8ed9e5bde	use IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin ... We need to test presence of admin folder using ${CMAKE_SOURCE_DIR}, or it is always false. Bad for ox, (good for everything else)	2017-10-05 22:01:39 +02:00
Jenkins for ownCloud	c436b36b89	[tx-robot] updated from transifex	2017-10-05 22:01:39 +02:00
Jenkins for ownCloud	980bab422a	[tx-robot] updated from transifex	2017-10-05 22:01:39 +02:00
Jenkins for ownCloud	6fbd3cf61a	[tx-robot] updated from transifex	2017-10-05 22:01:39 +02:00
Jenkins for ownCloud	e6e1f765bd	[tx-robot] updated from transifex	2017-10-05 22:01:39 +02:00
Jenkins for ownCloud	b2fe501706	[tx-robot] updated from transifex	2017-10-05 22:01:38 +02:00
rockihack	2bfd85e3c7	Linux Hardening ... see: https://wiki.debian.org/Hardening#User_Space	2017-10-05 22:01:38 +02:00
Jenkins for ownCloud	e1eb374ac3	[tx-robot] updated from transifex	2017-10-05 22:01:38 +02:00
Jürgen Weigert	ea2c3828cb	Update clean_tarball.sh ... warning against removing sqlite. it is used with Linux with cmake switch on CentOS6 USE_OUR_OWN_SQLITE3=TRUE	2017-10-05 22:01:38 +02:00
Jürgen Weigert	c1e2bdc3d2	Update CMakeLists.txt ... Make admin folder optional. It is needed for osx, but it is deleted from Linux builds for the sake of easier license review as discussed in https://github.com/owncloud/client/issues/6005	2017-10-05 22:01:38 +02:00
Jürgen Weigert	09c3043c85	support old sqlite before 3.7.7 ... quickfix: define the symbol for backwards compat or FIXME: better solution #ifdef SQLITE_IOERR_SHMMAP where needed...	2017-10-05 22:01:38 +02:00
Olivier Goffart	0a8c394ee9	fixup! [tx-robot] updated from transifex	2017-10-05 22:01:38 +02:00
Olivier Goffart	cd44d8ed77	Test OAuth2 ... Include a test for PR #6057	2017-10-05 22:01:38 +02:00
Olivier Goffart	cfc38753b4	SyncEngine: _hasNoneFiles should be set when there are INSTRUCTION_UPDATE_METADATA	2017-10-05 22:01:38 +02:00
Olivier Goffart	c424dec7d4	OAuth: fix compilation with old gcc ... We need to used QPointer::data in the signal slot connection Relates to pr #6065	2017-10-05 22:01:38 +02:00
Jenkins for ownCloud	78078b714e	[tx-robot] updated from transifex	2017-10-05 22:01:38 +02:00
Markus Goetz	36117336e7	Updater: Rudimentary support for beta channel ... So we can get people update from our alpha to the beta and rc	2017-10-05 22:01:38 +02:00
Olivier Goffart	d59c146488	Fix encoding of version string	2017-10-05 22:01:38 +02:00
Olivier Goffart	6583ebdcd9	csync_rename: optimize lookup ... Avoid many memory allocations in reconcile	2017-10-05 22:01:38 +02:00
Olivier Goffart	917e2e43c6	csync_reconcile: Optimize reconcile by avoiding alocations ... Fix performence regression from commit d66c2b5fae For every new file we would look up every parent directories. Allocating a new QByteArreay for every parent riectory just to know if it is in the other tree is wasting lots of CPU. Use a ByteArrayRef trick, similar to QStringRef	2017-10-05 22:01:37 +02:00
Dominik Schmidt	bdd3dc743b	Set CMAKE_INSTALL_RPATH as RPATH for installed executables	2017-10-05 22:01:37 +02:00
Christian Kamm	9143ddd0ad	Packaging: Add options for fine-grained builds #5957 ... Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt	2017-10-05 22:01:37 +02:00
Christian Kamm	f46440eb67	Packaging: Adjust APPNAME handling #5957 ... Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt	2017-10-05 22:01:37 +02:00
Christian Kamm	96a6d64500	Packaging: Make check for theme.qrc more specific #5957 ... Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt	2017-10-05 22:01:37 +02:00
Christian Kamm	08bc21937b	Packaging: Change directory for docs #5957 ... Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt	2017-10-05 22:01:37 +02:00
Christian Kamm	f64519bfbd	Move the --version output text to Theme #5957 ... Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt	2017-10-05 22:01:37 +02:00
Jenkins for ownCloud	494df32ee4	[tx-robot] updated from transifex	2017-10-05 22:01:37 +02:00
Olivier Goffart	bbbd2319ed	Use QDateTime::currentDateTimeUtc instead of the non utc version ... QDateTime::currentDateTime is terribly slow.	2017-10-05 22:01:37 +02:00
Olivier Goffart	79c775bcd8	OAuth: Fix crash when closing the browser while identifying ... To reproduce, log in and click "authorize" on the browser, then close the browser before the client has replied, (but after redirected to localhost, i.e. when the client is asking the server for the token) The problem is that socket can be destroyed so we don't need to answer on a destroyed socket.	2017-10-05 22:01:37 +02:00
Olivier Goffart	a3b1597d17	OwnSQL: don't parse the error message when we are done	2017-10-05 22:01:37 +02:00
Jocelyn Turcotte	ecb4e96794	SyncJournalDb: Reimplement the db_is_empty logic from csync ... This reduces the initial sync local discovery time from 2.0 to 0.6 seconds in LargeSyncBench on my machine.	2017-10-05 22:01:37 +02:00
Jocelyn Turcotte	185cb2e39a	Use SyncJournalDb in csync ... This gets rid of the csync_statedb sqlite layer and use the same code and same connection as the rest of the SyncEngine. Missing functions are added to SyncJournalDb and change a few minor things (like changing SyncJournalFileRecord::_modtime to be an int64 instead of a QDateTime, like it was in csync).	2017-10-05 22:01:37 +02:00
Jocelyn Turcotte	c6610f6fbf	SyncJournalDB: Allow callers of getFileRecord if the query failed ... The current implementation would return the same value whether the query failed or if no row would be found. This is something that is currently checked by csync and needs to be provided if we want to use SyncJournalDB there. Adjusted all call sites to also check the return value even though they could still just rely on rec.isValid(), but makes it more explicit as to what happens for database errors in those cases, if we ever want to gracefully handle them.	2017-10-05 22:01:37 +02:00