12535 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christian Kamm	60bde048c6	User shares: Fix missing label when there are only link shares ... The "not shared with users or groups" label only appeared if there were no shares at all.	2017-11-21 16:33:03 +01:00
Christian Kamm	3b961204e1	Avatars in user share dialog: Minor tweaks	2017-11-21 16:33:03 +01:00
Christian Kamm	e9907bc8ae	AvatarJob improvements ... * Drop AvatarJob2 * Allow AvatarJob to retrieve different sizes and users * Make creating a circular avatar into a function (maybe all avatars should be made into that shape in the first place)	2017-11-21 16:33:03 +01:00
Roeland Jago Douma	6b9b5252de	User shares: Show avatars ... [Sharing] Show placeholders for avatars Just like on the web show placeholders for avatars in the sharing dialog [Sharing] Show avatars! [Sharing] Show same avatar placeholder for group/federated shares as on web	2017-11-21 16:33:03 +01:00
Roeland Jago Douma	84a093e450	Merge pull request #53 from nextcloud/build_appimage ... Automatically start building AppImages on PR's	2017-11-21 14:27:53 +01:00
Roeland Jago Douma	be8b99bf3a	Build AppImage on all pushes ... This allows quickly testing of the appimages for feedback Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-21 14:20:09 +01:00
Christian Kamm	d949ec6877	Protocol: Introduce context menu with "open in browser" #6121 ... To do this conveniently a bunch of functionality that's common to IssueWidget and ProtocolWidget is moved to ProtocolItem. Also the convenience function to asynchronously retrieve the private link url is moved from the socket api to the network jobs.	2017-11-21 12:42:10 +01:00
Olivier Goffart	96dede4e84	TestChunkingNG: Test that resuming does not send past data.	2017-11-21 11:19:14 +01:00
Roeland Jago Douma	e7b7b8923f	Merge pull request #52 from nextcloud/single_drone ... No double building on PR's	2017-11-21 10:18:01 +01:00
Tomaz Canabrava	a118419f0c	[CSE] buildfix, use the correct type.	2017-11-21 09:55:44 +01:00
Roeland Jago Douma	407d71b305	Merge pull request #50 from nextcloud/correct_app_password_link ... Have correct app password link	2017-11-21 09:48:01 +01:00
Roeland Jago Douma	d63e18aa9d	Merge pull request #51 from nextcloud/no_jenkins ... We don't use Jenkins	2017-11-21 09:38:37 +01:00
Roeland Jago Douma	26ba89c2a8	No double building on PR's ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-21 09:27:52 +01:00
Roeland Jago Douma	7c5150421c	We don't use Jenkins ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-21 09:20:17 +01:00
Roeland Jago Douma	462353d0ee	Have correct app password link ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-21 09:17:42 +01:00
Jenkins for ownCloud	72783aa068	[tx-robot] updated from transifex	2017-11-21 02:18:35 +01:00
Tomaz Canabrava	d31aa7836a	[CSE] Add job to find what folders are encrypted. ... This still needs to be correctly setuped in the call chain. The job returns a QVariantMap with the folder-webdav-url and the encrypted status.	2017-11-20 21:38:17 +01:00
Jürgen Weigert	0abe7a77fb	Update release_template.md	2017-11-20 18:12:18 +01:00
Jürgen Weigert	ad408c5717	post release checks added ... this fixes https://github.com/owncloud/client/issues/5836	2017-11-20 18:12:18 +01:00
Tomaz Canabrava	34e6534813	Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3	2017-11-20 18:01:48 +01:00
Tomaz Canabrava	6d464d9dc6	Merge branch 'master-nextcloud' into clientSideEncryptionV3	2017-11-20 18:00:58 +01:00
Roeland Jago Douma	2236d05d25	Merge pull request #49 from nextcloud/nc_theme ... Nextcloud theme	2017-11-20 16:47:31 +01:00
Roeland Jago Douma	f0537b20d1	Update with NC icons ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-20 16:14:40 +01:00
Roeland Jago Douma	9878559002	Move to NC theme ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-20 15:46:18 +01:00
Markus Goetz	658a8c0609	mirall.desktop.in: Clean bogus comments #5767	2017-11-20 15:29:39 +01:00
Olivier Goffart	e7a91a1169	AccountSettings: Use the proper position to show the menu over sub-folder ... The menu can be open with the keyboard shortcut. (Fixup for the fix of #5596) Also use popup instead of exec to show the menu: it's safer as it does not re-enter the event loop.	2017-11-20 15:22:45 +01:00
Roeland Jago Douma	6b3006b325	OwnCloudCPack.cmake to NextcloudCPack.cmake ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-20 14:12:52 +01:00
Roeland Jago Douma	5dc73ffd8b	OWNCLOUD.cmake => NEXTCLOUD.cmake ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-20 14:12:52 +01:00
Roeland Jago Douma	b835bdc55b	Merge pull request #48 from nextcloud/oc_master ... Bump to oc master	2017-11-20 13:43:34 +01:00
Roeland Jago Douma	725be9ff54	Merge branch 'master' of https://github.com/owncloud/client into oc_master	2017-11-20 13:29:59 +01:00
Christian Kamm	14a51458ab	Link share: Move 'delete' button to the bottom #6163	2017-11-20 12:42:41 +01:00
Christian Kamm	aafe7c4732	Merge remote-tracking branch 'origin/2.4'	2017-11-20 11:54:56 +01:00
Christian Kamm	86c2e9e825	Tray: Fix 'Open folder' action creation ... It looks like the action was created but not added to the menu. Did this work with previous Qt versions?	2017-11-20 11:48:55 +01:00
Olivier Goffart	480932a58a	Checksum: Ignore unkown OC-Checksum header when downloading... ... And if there are several checksums, pick the "best" one. The case of several checksum was reported in https://github.com/nextcloud/client_theming/issues/213	2017-11-20 10:51:15 +01:00
Jenkins for ownCloud	529bcab009	[tx-robot] updated from transifex	2017-11-20 02:18:34 +01:00
Jenkins for ownCloud	9a4871abeb	[tx-robot] updated from transifex	2017-11-19 02:18:36 +01:00
Jenkins for ownCloud	40665c05ac	[tx-robot] updated from transifex	2017-11-18 02:18:36 +01:00
Michael Stingl	d832312acc	Add 2.3.3 System Requirements to client repo (#5996) ... I would like to maintain the System Requirements in the client repo.	2017-11-17 15:05:42 +01:00
Jenkins for ownCloud	63cf0e347b	[tx-robot] updated from transifex	2017-11-17 02:18:37 +01:00
Olivier Goffart	2192386d86	test/testsyncengine: test for PR #6168	2017-11-16 13:31:54 +01:00
Christian Kamm	e694ffcd03	PropagateDownload: Adjustments to skipping downloads #6153 ... Previously we required matching mtimes but that's actually unnecessary when the question is about whether to skip the download. We will still update the file's metadata. Also, adjust behavior when the checksum is weak (Adler32): in these cases we still depend on equal mtimes.	2017-11-16 13:31:54 +01:00
Christian Kamm	eff401d418	Share links: Confirm deletion explicitly #6163 ... Also add the "Delete" action to the "..." menu.	2017-11-16 11:16:47 +01:00
Roeland Jago Douma	9394fe6e84	Use openssl functions to get random words ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-16 10:45:57 +01:00
Jenkins for ownCloud	7049ccd7ab	[tx-robot] updated from transifex	2017-11-16 02:18:53 +01:00
Markus Goetz	8fb2167fca	sqlite: Update bundled version to 3.21 ... For OS X and Windows.	2017-11-15 21:53:53 +01:00
Markus Goetz	d0b8528022	Changelog: 2.4 changes up to now	2017-11-15 21:47:34 +01:00
Samuel Alfageme	13d80beb83	Changelog Updated with latest changes ... Web equivalent PR: https://github.com/owncloud/owncloud.org/pull/1318	2017-11-15 13:37:25 +01:00
Christian Kamm	06ce8dd8bd	Wizard: Add explanation text when server error is shown #6157 ... Just showing a box with the message can be surprising.	2017-11-15 11:01:44 +01:00
Olivier Goffart	9a1ea67a35	Theme: Update the wizard size on high dpi screen ... Issue #6156	2017-11-15 10:46:08 +01:00
Christian Kamm	e616f904b6	Share link: Add tooltip to delete button #6163	2017-11-15 10:16:33 +01:00