14781 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nextcloud bot	34b93be4e0	[tx-robot] updated from transifex	2020-04-14 03:29:25 +00:00
Chris Narkiewicz	16bb8d3dfc	Don't put User model into ConflictsResolveActivity account extra ... User model has been put into Intent instead of Account, causing a crash. Convert User into Account before setting extras parameters. Fixes #5849 Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>	2020-04-12 13:26:08 +01:00
Nextcloud bot	a9ea2b5e32	[tx-robot] updated from transifex	2020-04-12 08:11:50 +00:00
techydevil	b4db8d8f95	[FIX: #5752] Upload files: too much whitespace	2020-04-11 16:20:37 +05:30
Nextcloud bot	34e7dbd5de	[tx-robot] updated from transifex	2020-04-11 03:33:17 +00:00
Tobias Kaminsky	517437eba9	Merge pull request #5761 from nextcloud/ezaquarii/migrate-file-downloader-service-to-user-model ... Migrate FileDownloader server to User model	2020-04-09 15:08:26 +02:00
Tobias Kaminsky	1013b6b977	Merge pull request #5707 from nextcloud/fixOOMduringImages ... Fix OOM during image browsing	2020-04-09 13:27:09 +02:00
tobiasKaminsky	45315f1486	Fix OOM during image browsing ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-09 10:16:58 +02:00
Andy Scherzinger	d251fbb556	Merge pull request #5838 from nextcloud/tintSSO ... Do not tint dialog	2020-04-09 09:13:48 +02:00
tobiasKaminsky	d10403bd3c	show all files when clicking on show files ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-09 09:06:29 +02:00
tobiasKaminsky	886e28bfc2	Do not tint dialog ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-09 08:07:41 +02:00
Andy Scherzinger	a445602f2d	Merge pull request #5760 from nextcloud/ezaquarii/migrate-choose-rich-documents-template-dialot-to-new-user-model ... Migrate ChooseRichDocumentsTemplateDialogFragment to User	2020-04-08 20:52:20 +02:00
Andy Scherzinger	4914f4ec42	Merge pull request #5835 from nextcloud/ezaquarii/contacts-import-log-whole-exception ... Log exception in ContactsImportWork catch block	2020-04-08 20:51:11 +02:00
Chris Narkiewicz	a07cc68573	Migrate FileDownloader server to User model ... Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>	2020-04-08 15:03:49 +01:00
Chris Narkiewicz	29cffa4a24	Log exception in ContactsImportWork catch block ... Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>	2020-04-08 14:34:57 +01:00
Tobias Kaminsky	1d8e5a2648	Merge pull request #5757 from nextcloud/ezaquarii/migrate-edit-share-fragment-to-user ... Migrate EditShareFragment to new User model	2020-04-08 13:47:35 +02:00
Tobias Kaminsky	43c6daadcc	Merge pull request #5756 from nextcloud/ezaquarii/migrate-contacts-import-job-to-worker-api ... Migrate contacts import job to new API	2020-04-08 13:47:20 +02:00
Andy Scherzinger	167011caf1	Merge pull request #5652 from nextcloud/codacy ... Codacy improvements	2020-04-08 13:13:05 +02:00
Andy Scherzinger	ca2420e1d6	codacy: Avoid unused local variables ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2020-04-08 12:39:37 +02:00
Andy Scherzinger	e9bdd81029	codacy: Avoid unused method parameters ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2020-04-08 12:39:36 +02:00
Andy Scherzinger	6fc6b6e4a3	reformat code ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2020-04-08 12:39:35 +02:00
Andy Scherzinger	86ca6d5cf8	codacy: Unnecessary use of fully qualified name ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2020-04-08 12:39:34 +02:00
Andy Scherzinger	92ae5122b0	codacy: Avoid unused private fields	2020-04-08 12:39:33 +02:00
Andy Scherzinger	4795aa1571	codacy: Avoid unused imports ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2020-04-08 12:39:22 +02:00
Andy Scherzinger	2c9b0758e4	Merge pull request #5748 from nextcloud/ezaquarii/remove-deprecated-contacts-backup-job ... Remove deprecated contacts backup job	2020-04-08 12:37:45 +02:00
Andy Scherzinger	f1c8d40817	Merge pull request #5829 from nextcloud/checkAccountBeforeReceivingFiles ... check if at least one account is set up, before receiving files	2020-04-08 12:36:13 +02:00
Tobias Kaminsky	7469f8dfb5	Merge pull request #5796 from nextcloud/changePDF ... Change pdf icon	2020-04-08 08:21:57 +02:00
tobiasKaminsky	3b13c7156a	check if at least one account is set up, before receiving files ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-08 08:13:01 +02:00
Tobias Kaminsky	2ae9b70c49	Merge pull request #5697 from nextcloud/dependabot/gradle/androidx.work-work-runtime-ktx-2.3.4 ... Bump work-runtime-ktx from 2.3.3 to 2.3.4	2020-04-08 07:53:10 +02:00
Tobias Kaminsky	f8a5643eca	Merge pull request #5754 from nextcloud/empty ... Show loading instead of empty content	2020-04-08 07:49:18 +02:00
Tobias Kaminsky	9aa8ec066b	Merge pull request #5788 from linuxluser/patch-1 ... Ninja-fix formatting of CONTRIBUTING.md	2020-04-08 07:48:05 +02:00
nextcloud-android-bot	2734e5382b	Drone: update Lint results to reflect reduced error/warning count [skip ci] ... Signed-off-by: nextcloud-android-bot <android@nextcloud.com>	2020-04-08 05:41:42 +00:00
drone	3035a03955	Merge commit '0259a331343616320a752d069adf16816fcfc759'	2020-04-08 05:32:19 +00:00
Tobias Kaminsky	92d69de551	Merge pull request #5791 from nextcloud/ignore-changelog-in-changelogs ... Ignore CHANGELOG.md while generating changelogs	2020-04-08 07:30:13 +02:00
tobiasKaminsky	0259a33134	Change pdf icon ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-08 07:29:01 +02:00
dependabot-preview[bot]	a7c7d8de0b	Bump work-runtime-ktx from 2.3.3 to 2.3.4 ... Bumps work-runtime-ktx from 2.3.3 to 2.3.4. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-08 05:15:20 +00:00
Tobias Kaminsky	ade73c3e57	Merge pull request #5822 from nextcloud/conflictToast ... Fix crash while showing ConflictDialog	2020-04-08 07:12:25 +02:00
tobiasKaminsky	6f5b671d8c	Directly show loading spinner ... show "no files" only if folder is known to be empty Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-08 06:56:18 +02:00
tobiasKaminsky	949a5c3a4f	Fix crash while showing ConflictDialog ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-08 06:38:22 +02:00
Tobias Kaminsky	676e41092f	Merge pull request #5803 from nextcloud/disableRichWorkspace ... Rich workspaces: can be null (if disabled), or string (empty or with content)	2020-04-07 17:58:09 +02:00
tobiasKaminsky	c43b234ae4	Rich workspaces: can be null (if disabled), or string (empty or with content) ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-07 16:57:40 +02:00
Andy Scherzinger	b413d942ad	Merge pull request #5823 from nextcloud/npeSearch ... Search: only parse search if search event is there	2020-04-07 14:40:08 +02:00
tobiasKaminsky	54134c43b2	Search: only parse search if search event is there ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-07 13:33:26 +02:00
Tobias Kaminsky	b73040ec62	Merge pull request #5817 from nextcloud/GroupUserExpire ... NC18+: add possibility to set expiration date on user/group shares	2020-04-07 10:37:03 +02:00
Nextcloud bot	d423baa0a3	[tx-robot] updated from transifex	2020-04-07 03:27:56 +00:00
tobiasKaminsky	4ea0892630	NC18+: add possibility to set expiration date on user/group shares ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-04-06 15:34:09 +02:00
Andy Scherzinger	e0d4a9df26	Merge pull request #5811 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.7.4 ... Bump detekt-gradle-plugin from 1.7.3 to 1.7.4	2020-04-06 06:53:40 +02:00
Nextcloud bot	34ee2dd4a9	[tx-robot] updated from transifex	2020-04-06 03:30:22 +00:00
dependabot-preview[bot]	6b851a73df	Bump detekt-gradle-plugin from 1.7.3 to 1.7.4 ... Bumps detekt-gradle-plugin from 1.7.3 to 1.7.4. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-06 01:12:21 +00:00
Nextcloud bot	5cd1feaf7b	[tx-robot] updated from transifex	2020-04-04 03:30:19 +00:00