12363 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Roeland Jago Douma	33b6d0473a	Merge pull request #399 from nextcloud/upstream/pr/6333 ... Use std::chrono::milliseconds to represent milliseconds	2018-06-06 20:09:48 +02:00
Olivier Goffart	073a5184cb	Use std::chrono::milliseconds to represent milliseconds	2018-06-06 17:26:53 +02:00
Julius Härtl	ea58a1038b	Merge pull request #363 from nextcloud/upstream/pr/6468 ... More Button: Use SVG and fix size so it renders good in highdpi	2018-06-06 14:44:24 +02:00
Olivier Goffart	c4af4a5a85	More Button: Use SVG and fix size so it renders good in highdpi ... When the more button was changed from using a text to an icon, the size computation was not adjusted proerly to that of a button with an icon. And using svg allows it to be rendered correctly with high-dpi It looks much much nicer now	2018-06-06 13:55:34 +02:00
Roeland Jago Douma	ad43d88fde	Merge pull request #360 from nextcloud/upstream/pr/6428 ... Uploads: Don't delete unexisting chunks	2018-06-06 13:34:55 +02:00
Olivier Goffart	012c638d4e	Uploads: Don't delete unexisting chunks ... Since commit 4dc49ff3, we store an entry in the upload info table even for non chunked uploads. However, if this fails we don't want to remove non-existant stale chunks if the upload fails. Without this commit, we would send a DELETE command to clean non-existant chunks in the dav/uploads/ namespace.	2018-06-06 09:52:02 +02:00
Roeland Jago Douma	27e1efb8a3	Merge pull request #358 from nextcloud/upstream/pr/6434 ... SocketApi/Sharing: Add "copy public link" to menu #6356	2018-06-06 09:34:19 +02:00
Christian Kamm	de9fb7dc9a	Silence warning by removing unnecessary this capture	2018-06-06 09:15:25 +02:00
Christian Kamm	550b845037	SocketApi/Sharing: Add "copy public link" to menu #6356 ... * The new menu option will fetch shares and create a new link share if no "context menu share" currently exists. * Various cleanup of common operations in socketapi happened as well, in particular there's now FileData::get() that calculates all the relevant paths that are useful for most socketapi actions.	2018-06-06 09:15:23 +02:00
Roeland Jago Douma	d7ce92b017	Merge pull request #357 from nextcloud/upstream/notifications ... Notifications: Lower hiding timeout	2018-06-05 21:45:37 +02:00
Markus Goetz	eb097cbffb	Notifications: Lower hiding timeout ... With the 4.5sec timeout, it was very easy to accidently hit the wrong notification when the previous one dissapeared so late.	2018-06-05 21:24:56 +02:00
Roeland Jago Douma	4e4ec48bbc	Merge pull request #356 from nextcloud/upstream/qunused ... Q_UNUSED: Sprinkle around	2018-06-05 21:20:09 +02:00
Markus Goetz	de1032ebd7	Q_UNUSED: Sprinkle around	2018-06-05 20:45:51 +02:00
Roeland Jago Douma	27826ddee0	Merge pull request #355 from nextcloud/upstream/pr/6450 ... macOS: Implement new dynamic Finder menu items #6328	2018-06-05 20:45:11 +02:00
Markus Goetz	d3cbe63801	macOS: Implement new dynamic Finder menu items #6328	2018-06-05 20:40:40 +02:00
Roeland Jago Douma	5b0a1d4c79	Merge pull request #354 from nextcloud/upstream/pr/6444 ... macOS: Unload the Finder extension on exit #5382 #3819	2018-06-05 20:39:43 +02:00
Markus Goetz	648911f3ab	macOS: Unload the Finder extension on exit #5382 #3819	2018-06-05 20:22:02 +02:00
Roeland Jago Douma	eda221227f	Merge pull request #353 from nextcloud/upstream/pr/6448 ... Simple permanent logging	2018-06-05 20:21:25 +02:00
Christian Kamm	4a81ae75cf	Logging: Add persistent auto-logdir option #6442	2018-06-05 20:07:53 +02:00
Christian Kamm	428cfc5e1c	LogDir: Compress log when switching files #6442	2018-06-05 20:07:53 +02:00
Christian Kamm	9319b6594e	LogDir: Go to new file on Problem/Abort too #6442	2018-06-05 20:07:53 +02:00
Roeland Jago Douma	a7b7344659	Merge pull request #352 from nextcloud/upstream/pr/6438 ... Folders: Use "Problem" icon for unresolved conflicts #6277	2018-06-05 20:07:00 +02:00
Christian Kamm	63c2474b70	Folders: Use "Problem" icon for unresolved conflicts #6277	2018-06-05 19:59:19 +02:00
Roeland Jago Douma	f9f1f8bda6	Merge pull request #351 from nextcloud/upstream/pr/6437 ... Share link: Update permission wording #6192	2018-06-05 19:58:40 +02:00
Christian Kamm	ed5e413751	Share link: Update permission wording #6192	2018-06-05 19:46:04 +02:00
Roeland Jago Douma	7c4c3b0493	Merge pull request #349 from nextcloud/upstream/macOS ... macOS: build/installer changes	2018-06-05 13:39:36 +02:00
Roeland Jago Douma	4ddbb35d77	Fix debian patch ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-05 13:29:51 +02:00
Markus Goetz	16bf765818	macOS: Don't hardcode path in Installer source	2018-06-05 13:29:51 +02:00
Markus Goetz	5667408c58	macOS: Offer only standard installation in installer	2018-06-05 13:29:51 +02:00
Markus Goetz	a0e17ce221	create_mac.sh: Also name properly in source dir	2018-06-05 13:29:51 +02:00
Markus Goetz	3defc30e12	macosx.pkgproj; This is a .cmake preprocessed file	2018-06-05 13:29:51 +02:00
Roeland Jago Douma	3ce41c71c1	Merge pull request #350 from nextcloud/upstream/pr/6436 ... SyncJournalDb::setSelectiveSyncList: Always use a transaction	2018-06-05 11:30:24 +02:00
Olivier Goffart	613fd30021	SyncJournalDb::setSelectiveSyncList: Always use a transaction ... Issue #6431	2018-06-05 11:15:51 +02:00
Roeland Jago Douma	0afcb23734	Merge pull request #331 from nextcloud/upstream/pr/6412 ... Blacklisting must prevent parent etag updates #6411	2018-06-05 10:18:53 +02:00
Christian Kamm	c57e4dcf03	Blacklisting must prevent parent etag updates #6411	2018-06-05 10:12:11 +02:00
Roeland Jago Douma	5309694b34	Merge pull request #394 from nextcloud/fix/master/info ... Fix output add E2E again	2018-06-05 09:39:06 +02:00
Roeland Jago Douma	a0c458d937	Fix output add E2E again ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-05 09:02:41 +02:00
Roeland Jago Douma	a035b9b10b	Merge pull request #393 from ivaradi/master ... Re-encoded Ubuntu/Debian upload keys	2018-06-05 09:02:23 +02:00
István Váradi	92de0770bc	Re-encoded Ubuntu/Debian upload keys	2018-06-05 08:34:41 +02:00
Roeland Jago Douma	2eb87e769c	Merge pull request #330 from nextcloud/upstream/pr/6408 ... FolderStatusModel: fix potential assert	2018-06-05 08:19:01 +02:00
Olivier Goffart	f4f228de3e	FolderStatusModel: fix potential assert ... OCC::FolderStatusModel::slotUpdateDirectories: ASSERT: "parentInfo->_fetching" in file /home/olivier/kdegit/owncloud/mirall/src/gui/folderstatusmodel.cpp, line 599 This can happen if the structure of a folder is change while the user expands the root folder. In this case, resetSubs() is called which resets _fetching to false. Instead, we need to keep a pointer to the job so we can abort it by deleting it.	2018-06-05 08:12:58 +02:00
Roeland Jago Douma	6872cbda7e	Merge pull request #329 from nextcloud/upstream/pr/6416 ... csync_update: add the checksum in the discovery log	2018-06-05 08:12:00 +02:00
Olivier Goffart	3e508329b5	csync_update: add the checksum in the discovery log ... Issue #6414	2018-06-05 07:52:29 +02:00
Roeland Jago Douma	69aa077212	Merge pull request #338 from ivaradi/master ... Patch the OSX CMakeLists.txt for Xenial	2018-06-05 07:51:46 +02:00
István Váradi	d0e4c67459	Merge branch 'master' of github.com:nextcloud/client	2018-06-05 06:58:12 +02:00
Nextcloud bot	f8d0cbd468	[tx-robot] updated from transifex	2018-06-05 00:47:52 +00:00
Roeland Jago Douma	dfed78a665	Merge pull request #328 from nextcloud/upstream/issue/5932 ... macdeployqt: Adjust minimum version based on our Qt #5932	2018-06-04 20:23:38 +02:00
Markus Goetz	0d182280c4	macdeployqt: Adjust minimum version based on our Qt #5932	2018-06-04 20:02:43 +02:00
Roeland Jago Douma	8477c5a565	Merge pull request #327 from nextcloud/upstream/pr/6271 ... postinstall macOS: check if Finder is running	2018-06-04 20:00:58 +02:00
Roeland Jago Douma	32ae670c4e	Merge pull request #325 from nextcloud/upstream/ssl-button-speed ... SslButton: Improve speed (especially on macOS) #6031	2018-06-04 17:14:38 +02:00