2051 commits

Author	SHA1	Message	Date
tobiaskaminsky	2b0dd3209c	use cancelContactBackupJobForAccount to disable all backup jobs ... switched if branches, according to findBugs Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-09 08:37:37 +01:00
tobiasKaminsky	2655d6f87b	code enhancement ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-09 08:37:37 +01:00
tobiasKaminsky	f1731f889d	on account removal also disable contacts backup job ... remove unneeded function Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-09 08:37:36 +01:00
Tobias Kaminsky	4914b11bc1	Merge branch 'master' into contactsBackupNPE	2018-01-09 08:19:57 +01:00
Tobias Kaminsky	a1e0173e9c	Merge branch 'master' into userinfoButterknife	2018-01-09 08:12:42 +01:00
Nextcloud bot	ae6c33c9fa	[tx-robot] updated from transifex	2018-01-09 01:40:56 +00:00
tobiasKaminsky	62f74a8ff5	do not use id twice ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-08 15:47:44 +01:00
tobiaskaminsky	e6d597e172	code formatting ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-08 14:23:14 +01:00
tobiaskaminsky	9733b886af	fix potential NPEs ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-08 14:21:11 +01:00
tobiaskaminsky	138e35c512	add roundIcon to Manifest	2018-01-08 09:22:09 +01:00
AndyScherzinger	84d40f0421	fix compile error	2018-01-08 09:22:09 +01:00
AndyScherzinger	487407fb49	codacy: combine if blocks	2018-01-08 09:22:09 +01:00
AndyScherzinger	9111fa0555	use vector xml for launcher icon background	2018-01-08 09:22:09 +01:00
AndyScherzinger	9d029de12e	fix folder name -v26	2018-01-08 09:22:08 +01:00
AndyScherzinger	505306cbf5	try moving background to v26 directory for lint	2018-01-08 09:22:08 +01:00
AndyScherzinger	346c5ca9a3	move vector launcher foreground file to v26 directory	2018-01-08 09:22:08 +01:00
AndyScherzinger	4b87a0d109	properly enforce round launcher icon	2018-01-08 09:22:08 +01:00
tobiasKaminsky	5b6f0354f6	extract channel creation	2018-01-08 09:22:08 +01:00
AndyScherzinger	95f2b488f9	fix positioning of Nc logo within icons	2018-01-08 09:22:07 +01:00
AndyScherzinger	dbf753cce3	enforce round launcher icon on pre Oreo devices	2018-01-08 09:22:07 +01:00
AndyScherzinger	0137ec8ef6	reworked Nc13 style launcher icon work	2018-01-08 09:22:07 +01:00
AndyScherzinger	a5eb437a30	linebreaks added	2018-01-08 09:22:06 +01:00
AndyScherzinger	80a2f76f51	round & adaptive icon added	2018-01-08 09:22:06 +01:00
tobiasKaminsky	4ea1a907f4	add notification channel support, with only one initially set-up	2018-01-08 09:22:06 +01:00
tobiasKaminsky	1da1f11ea5	change sdk versions	2018-01-08 09:21:51 +01:00
Nextcloud bot	583cc6cdd6	[tx-robot] updated from transifex	2018-01-08 01:41:16 +00:00
Mario Đanić	24cd4fce11	Merge pull request #1923 from nextcloud/fix-1911 ... Fix #1911	2018-01-07 20:29:29 +01:00
Mario Danic	7cce49af2a	Remove extra parentheses ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-07 20:24:59 +01:00
Nextcloud bot	a4b3ddf9d8	[tx-robot] updated from transifex	2018-01-07 01:40:29 +00:00
Nextcloud bot	fbd97a9439	[tx-robot] updated from transifex	2018-01-06 01:40:46 +00:00
Nextcloud bot	ee811e2749	[tx-robot] updated from transifex	2018-01-05 14:58:54 +00:00
Tobias Kaminsky	9a9ea0af85	Merge branch 'master' into uploadsStorageManagerNPE	2018-01-05 13:11:30 +01:00
Tobias Kaminsky	7a997c0544	Merge branch 'master' into notificationManager	2018-01-05 11:39:33 +01:00
Tobias Kaminsky	38d6706ea6	Merge branch 'master' into NotificationActivity	2018-01-05 10:58:34 +01:00
Tobias Kaminsky	b7370297e7	Merge branch 'master' into mFileNeverNull	2018-01-05 10:41:26 +01:00
Tobias Kaminsky	0b22058db3	Merge branch 'master' into screenshots	2018-01-05 10:29:23 +01:00
Tobias Kaminsky	b41962da42	Merge branch 'master' into screenshots	2018-01-05 09:15:10 +01:00
tobiasKaminsky	f8efb31a27	code formatting	2018-01-05 08:48:53 +01:00
tobiasKaminsky	8d6e32b43d	extraText can be null ... getWindow can be null action bar can be null getType() or getAction on intent can be null code enhancements	2018-01-05 08:48:53 +01:00
Nextcloud bot	cfa9bfe700	[tx-robot] updated from transifex	2018-01-05 01:41:24 +00:00
Mario Danic	8a865ee638	Fix 1911 ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-04 22:22:30 +01:00
Tobias Kaminsky	eb0028d2cf	Merge branch 'master' into autoUploadWithoutPermission	2018-01-04 12:18:46 +01:00
Nextcloud bot	a86c3bfa5b	[tx-robot] updated from transifex	2018-01-04 11:15:53 +00:00
Tobias Kaminsky	0863719f46	Merge branch 'master' into fdroidMetadata	2018-01-04 10:52:39 +01:00
Tobias Kaminsky	d341b89eef	Update strings.xml	2018-01-04 10:39:41 +01:00
Nextcloud bot	7de5242a26	[tx-robot] updated from transifex	2018-01-04 01:33:44 +00:00
tobiasKaminsky	37ce53db5c	minor code cleanup	2018-01-03 10:12:10 +01:00
tobiasKaminsky	a6474c32aa	make auto upload safe with no storage permission	2018-01-03 10:06:17 +01:00
tobiasKaminsky	c3a0a38db1	account possible can be null	2018-01-03 08:38:54 +01:00
tobiasKaminsky	d5f0aa7db1	account possible can be null	2018-01-03 08:35:32 +01:00
Nextcloud bot	ec246eac59	[tx-robot] updated from transifex	2018-01-03 01:31:19 +00:00
tobiasKaminsky	576fb79f67	get notification manager if it does not exist	2018-01-02 15:05:51 +01:00
tobiasKaminsky	b4b2500b75	mFiles is never null	2018-01-02 13:07:33 +01:00
tobiaskaminsky	7d8633a0bc	prevent NPE	2018-01-02 11:51:03 +01:00
tobiasKaminsky	f6c7ccfedc	add mocked devices for phone and tablet	2018-01-02 09:37:37 +01:00
tobiasKaminsky	ba18ef206f	add davdroid screenshot ... add translation	2018-01-02 09:37:31 +01:00
Nextcloud bot	ad6509bdb5	[tx-robot] updated from transifex	2018-01-02 07:40:51 +00:00
Nextcloud bot	6f27269f47	[tx-robot] updated from transifex	2018-01-02 01:31:44 +00:00
Nextcloud bot	deada3f594	[tx-robot] updated from transifex	2018-01-01 01:31:26 +00:00
Nextcloud bot	df15f85cfe	[tx-robot] updated from transifex	2017-12-31 01:32:03 +00:00
Nextcloud bot	e5f8ef7df0	[tx-robot] updated from transifex	2017-12-30 01:32:33 +00:00
tobiasKaminsky	0d9386a52d	rebas	2017-12-29 08:58:52 +01:00
tobiasKaminsky	33a8af0fca	resolve merge conflicts	2017-12-29 08:57:07 +01:00
tobiasKaminsky	1b200a5bad	versionDev as flavor	2017-12-29 08:56:40 +01:00
Nextcloud bot	56685d9b5a	[tx-robot] updated from transifex	2017-12-29 01:28:51 +00:00
Mario Đanić	3ebc31db17	Merge pull request #1792 from nextcloud/combineSendShare ... Combine send share	2017-12-29 00:54:47 +01:00
Mario Đanić	df67ba4149	Merge pull request #1862 from nextcloud/lastRTL ... Lint: last RTL	2017-12-29 00:53:06 +01:00
Mario Đanić	2fc82eef67	Merge pull request #1885 from nextcloud/fix-1877 ... Clicking checkbox image should also check list item	2017-12-29 00:52:45 +01:00
Mario Đanić	c4e6c3a172	Merge pull request #1883 from nextcloud/codacy ... Fix further codacy issues	2017-12-29 00:52:23 +01:00
Mario Đanić	c11478c983	Merge pull request #1861 from nextcloud/unusedResources ... Lint: remove unused resources	2017-12-29 00:52:08 +01:00
Nextcloud bot	95a1d69d39	[tx-robot] updated from transifex	2017-12-28 01:29:21 +00:00
tobiasKaminsky	b307c6b7cc	remove unused resources	2017-12-27 13:24:46 +01:00
tobiasKaminsky	0cd81c31b4	last RTL	2017-12-27 13:17:14 +01:00
AndyScherzinger	88df7842e5	fixes #1877 - click checkbox image should also check list item	2017-12-27 12:55:57 +01:00
AndyScherzinger	abcf14ec4a	fix lint: remove sdk<14 check	2017-12-27 12:53:48 +01:00
AndyScherzinger	73cba5519c	fixes after rebase	2017-12-27 12:53:48 +01:00
AndyScherzinger	ae24c3c534	fix some lint issues	2017-12-27 12:53:47 +01:00
AndyScherzinger	b8260646da	add content description to activity icon	2017-12-27 12:53:47 +01:00
AndyScherzinger	ab575359f6	remove unused translation	2017-12-27 12:53:46 +01:00
AndyScherzinger	c42f2d4d61	extract theming method	2017-12-27 12:53:46 +01:00
Tobias Kaminsky	adf12d2222	Update SendShareDialog.java ... fix c&p mistake	2017-12-27 12:53:45 +01:00
AndyScherzinger	1d3c5421ca	extract logic into separate methods	2017-12-27 12:53:45 +01:00
AndyScherzinger	0d864eed96	uses dimens values	2017-12-27 12:53:44 +01:00
tobiaskaminsky	114f4c9e80	reformat	2017-12-27 12:53:44 +01:00
tobiaskaminsky	c023b932ca	rename tag	2017-12-27 12:53:43 +01:00
AndyScherzinger	89ac5a0843	optimized share layout	2017-12-27 12:53:42 +01:00
tobiaskaminsky	a199abb381	hide dialog if not needed	2017-12-27 12:53:42 +01:00
tobiaskaminsky	3a692e65f6	removed extra translation	2017-12-27 12:53:41 +01:00
tobiaskaminsky	12f837e205	- correctly tint white, black theme ... - moved link image a bit to the right	2017-12-27 12:53:41 +01:00
tobiaskaminsky	e08049341c	Tint round buttons	2017-12-27 12:53:40 +01:00
AndyScherzinger	672c0a1509	circular background	2017-12-27 12:53:40 +01:00
tobiaskaminsky	3debd2f0f1	align both icon	2017-12-27 12:53:39 +01:00
tobiasKaminsky	2168e5a344	- make image & text clickable ... - show snackbar correctly if resharing is not allowed, then also grey out image&text if not folder	2017-12-27 12:53:39 +01:00
tobiaskaminsky	dc2d7edc56	combine send/share	2017-12-27 12:53:35 +01:00
AndyScherzinger	31e2c4901b	codacy: Avoid empty catch blocks	2017-12-27 09:07:10 +01:00
AndyScherzinger	096ff43004	codacy: remove unused code, fix java warnings	2017-12-27 09:07:00 +01:00
tobiasKaminsky	e2c5bf4170	length is -1 (unknown) or 0 (null)	2017-12-27 07:54:58 +01:00
Nextcloud bot	f4707f5e20	[tx-robot] updated from transifex	2017-12-27 01:28:47 +00:00
Nextcloud bot	9311864157	[tx-robot] updated from transifex	2017-12-25 01:29:08 +00:00
Nextcloud bot	2d3f45d17c	[tx-robot] updated from transifex	2017-12-23 01:29:16 +00:00
Nextcloud bot	76c60064f3	[tx-robot] updated from transifex	2017-12-22 01:30:10 +00:00
tobiasKaminsky	1fa3bfbdba	mimetype lookup assumes to have lowercase mimetypes	2017-12-21 11:20:35 +01:00
Abhishek Tiwari	4a0ad491ec	Merge branch 'master' of https://github.com/nextcloud/android	2017-12-21 13:13:32 +05:30
Nextcloud bot	ca73d82c42	[tx-robot] updated from transifex	2017-12-21 01:29:04 +00:00
Abhishek Tiwari	4a09b3d9c5	Merge branch 'master' of https://github.com/nextcloud/android	2017-12-20 18:45:30 +05:30
Abhishek Tiwari	a8b1566264	changed resouce directory of values-en-rGB to value-b+en+001	2017-12-20 18:45:00 +05:30
Nextcloud bot	ab805b1888	[tx-robot] updated from transifex	2017-12-20 01:29:23 +00:00
Abhishek Tiwari	7eb148342f	renaming values-es-rUS to values-b+es+419	2017-12-19 16:31:34 +05:30
Nextcloud bot	c059ab7465	[tx-robot] updated from transifex	2017-12-19 09:31:47 +00:00
AndyScherzinger	1ccb8bebb8	fix Spanish translation directory name	2017-12-19 10:00:14 +01:00
Allan Nordhøy	2b249045e7	most recent, log out, reworked dev version strings	2017-12-19 05:01:21 +01:00
Nextcloud bot	b21f5a6700	[tx-robot] updated from transifex	2017-12-19 01:30:54 +00:00
tobiasKaminsky	8fe2b9b82c	moved spanish for 419/us to values-es-rUS	2017-12-18 07:52:45 +01:00
Nextcloud bot	2c12c901ee	[tx-robot] updated from transifex	2017-12-18 01:28:36 +00:00
Nextcloud bot	bf1b7caa46	[tx-robot] updated from transifex	2017-12-17 01:29:17 +00:00
Nextcloud bot	c0dd7bcbef	[tx-robot] updated from transifex	2017-12-15 11:41:50 +00:00
tobiaskaminsky	6c78627c3f	further rtl support	2017-12-13 08:06:43 +01:00
AndyScherzinger	3a7a82238e	fix cr comments and replace anonymous listeners with lambdas	2017-12-12 09:48:03 +01:00
AndyScherzinger	bc9eac9b43	run sync visualization on UI thread	2017-12-12 09:31:39 +01:00
AndyScherzinger	7d6e50f6a3	adapt refresh animation to standard animation for refresh of file lists within the app	2017-12-12 09:31:39 +01:00
AndyScherzinger	7d4669a71f	don't clear list when adding next page of activities to make it an endless scrolling list	2017-12-12 09:31:39 +01:00
Joas Schilling	e58042d6aa	Load more activities when reaching the end of the stream ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2017-12-12 09:31:30 +01:00
tobiaskaminsky	aed532d408	get rid of gallery API and use internal one	2017-12-11 23:03:45 +01:00
tobiaskaminsky	297c6024bc	- replace Toast with Snackbar ... - remove not used code	2017-12-11 21:57:54 +01:00
tobiaskaminsky	e93eb51ffe	"set picture as" with resized images	2017-12-11 21:57:51 +01:00
tobiaskaminsky	acdd470c95	proper handling when switching to an account with disabled external links	2017-12-11 21:47:02 +01:00
Mario Đanić	f04220e6af	Merge pull request #1815 from nextcloud/oldLoginTimeout ... revert timeout to 60s	2017-12-11 19:47:32 +01:00
Mario Đanić	ee5e2843d2	Merge pull request #1826 from nextcloud/shareViaLinkUseDisplayName ... Share via link use display name	2017-12-11 19:46:25 +01:00
Mario Đanić	2f222f168e	Merge pull request #1847 from nextcloud/alwaysLint ... always push lint results	2017-12-11 19:40:59 +01:00
tobiaskaminsky	e7ad1ddb4b	further hardening of Content Provider	2017-12-11 19:17:17 +01:00
Mario Đanić	b11a77c44e	Merge pull request #1834 from nextcloud/sqlBugfix ... File content provider: if selection and selectionArgs are null, let them pass	2017-12-11 16:27:25 +01:00
tobiasKaminsky	28579d5a0e	reduce one warning to have an updated master	2017-12-11 15:43:09 +01:00
AndyScherzinger	96a2dd8e71	fix log statement	2017-12-11 13:42:16 +01:00
Mario Danic	27954c4287	Fix for the fix xD ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-11 13:42:16 +01:00
Mario Danic	ce7dbb437f	CRC32 magic ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-11 13:42:16 +01:00
Mario Danic	dcc31bb7ca	Simplify ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-11 12:49:29 +01:00
Mario Danic	f74f9a1061	Update ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-11 12:49:28 +01:00
Mario Danic	ed93595112	Only retry jobs if we cn do it ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-11 12:49:28 +01:00
tobiasKaminsky	05dbcab908	fix walledGarden with resized images	2017-12-11 09:48:41 +01:00
Nextcloud bot	88b24c391b	[tx-robot] updated from transifex	2017-12-11 08:40:51 +00:00
tobiasKaminsky	54e973e58c	re-add translation	2017-12-11 07:39:49 +01:00
Nextcloud bot	0f97af26b9	[tx-robot] updated from transifex	2017-12-11 01:38:42 +00:00
Andy Scherzinger	a4bab355d7	Merge pull request #1823 from nextcloud/removeUnusedTranslations ... Remove unused translations from values/strings.xml	2017-12-10 22:18:38 +01:00
Nextcloud bot	7a9f4d0de1	[tx-robot] updated from transifex	2017-12-09 01:38:13 +00:00
Nextcloud bot	9ed0f5a64c	[tx-robot] updated from transifex	2017-12-08 14:01:44 +00:00
Nextcloud bot	4d92a3fd0f	[tx-robot] updated from transifex	2017-12-08 01:37:21 +00:00
Nextcloud bot	59801bb551	[tx-robot] updated from transifex	2017-12-07 01:38:06 +00:00
Andy Scherzinger	f043232af0	Merge pull request #1672 from nextcloud/detect-walled-garden ... Detect walled garden	2017-12-06 19:03:18 +01:00
Andy Scherzinger	00104aa263	Merge pull request #1655 from nextcloud/fix-syncing ... Fix syncing	2017-12-06 18:56:48 +01:00
tobiaskaminsky	2e4c49202f	fixed it for plain http connections	2017-12-06 13:13:03 +01:00
Mario Danic	c3889f2afc	Fix casting ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-06 13:13:03 +01:00
tobiaskaminsky	626f2b68a2	use own route for NC13 and parse status.php for NC12	2017-12-06 13:13:03 +01:00
Mario Danic	cbea9bde94	Fixes ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-06 13:12:46 +01:00
Mario Danic	9924bcc50e	Fix bug ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-06 13:12:46 +01:00
Mario Danic	ca348a6880	Fix a typo ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-06 13:12:46 +01:00
Mario Danic	d190b21cae	Detect walled garden ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-06 13:12:45 +01:00
Nextcloud bot	8a8e8428e2	[tx-robot] updated from transifex	2017-12-06 01:38:40 +00:00
tobiaskaminsky	941bb063d9	bugfix	2017-12-05 14:14:42 +01:00
Tobias Kaminsky	d41a9bec8d	Merge branch 'master' into update-android-job-again	2017-12-05 11:19:19 +01:00
Nextcloud bot	445b3a1c2b	[tx-robot] updated from transifex	2017-12-05 01:38:28 +00:00
AndyScherzinger	f08675382a	Fix Imports from UploadUtils to PowerUtils	2017-12-04 19:08:10 +01:00
Mario Danic	ba7ee747d3	NPE fix ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:10 +01:00
Mario Danic	2d5d8cc1ca	Fixes ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:09 +01:00
Mario Danic	803bf2194e	Oh well ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:09 +01:00
Mario Danic	61cbe88bd0	Fix the way we schedule stuff ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:09 +01:00
Mario Danic	8253595b8a	Fix stuff ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:08 +01:00
Mario Danic	d12af2a342	Update Android job ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:00 +01:00
Andy Scherzinger	bffa619b28	Merge pull request #1820 from nextcloud/sql ... Prevent sql injections	2017-12-04 09:19:24 +01:00
Nextcloud bot	2c13fcb949	[tx-robot] updated from transifex	2017-12-04 01:37:54 +00:00
Nextcloud bot	b383aed42f	[tx-robot] updated from transifex	2017-12-03 01:38:26 +00:00
tobiaskaminsky	c3ff1ccebd	minor formatting	2017-12-02 11:41:17 +01:00
tobiaskaminsky	cfef0c9c90	use displayname for sharing, fallback to userid	2017-12-02 11:41:17 +01:00
Nextcloud bot	46020e8bfb	[tx-robot] updated from transifex	2017-12-02 01:38:27 +00:00
tobiaskaminsky	89f9b34885	remove unused translations	2017-12-01 11:40:56 +01:00
Nextcloud bot	8661a5d3ce	[tx-robot] updated from transifex	2017-12-01 01:38:02 +00:00
Nextcloud bot	6bf42a7481	[tx-robot] updated from transifex	2017-11-30 01:40:00 +00:00
tobiaskaminsky	0dc2633613	Prevent sql injections	2017-11-29 15:28:21 +01:00
Nextcloud bot	2eda05eeb4	[tx-robot] updated from transifex	2017-11-29 01:36:10 +00:00
tobiaskaminsky	8d4421b8d6	prevent crash when updating external links	2017-11-28 14:49:13 +01:00
Mario Danic	fd66cdc370	Fix image preview ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-11-28 14:46:21 +01:00
Mario Danic	8593b10c6d	Fix syncing ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-11-28 14:46:21 +01:00
tobiaskaminsky	2e572e34ec	generate video thumbnail for downloaded files	2017-11-28 10:34:35 +01:00
tobiaskaminsky	f3be3ca91c	move order	2017-11-28 09:01:38 +01:00
tobiaskaminsky	4bf1b65f41	hide item options (share, overflow menu) in move/copy dialog	2017-11-28 09:01:38 +01:00
Nextcloud bot	ce1449a375	[tx-robot] updated from transifex	2017-11-28 01:35:32 +00:00
AndyScherzinger	b8f2756ad3	fix after rebase	2017-11-27 16:27:27 +01:00
AndyScherzinger	375a403d55	fix codacy warnings	2017-11-27 16:27:27 +01:00
Andy Scherzinger	edc9c5bdd4	fixes after rebase	2017-11-27 16:27:27 +01:00
masensio	b5c1cf9fe9	Media player stops when its current file is deleted	2017-11-27 16:27:27 +01:00
AndyScherzinger	5c9d3a306d	fix codacy warnings	2017-11-27 16:27:27 +01:00
Andy Scherzinger	fbe50c6b62	fixes after rebase	2017-11-27 16:27:27 +01:00
masensio	722afd6519	Media player stops when its current file is deleted	2017-11-27 16:27:27 +01:00
tobiasKaminsky	c5822827b4	revert timeout to 60s	2017-11-27 14:53:29 +01:00
Tobias Kaminsky	ad71e28094	Merge branch 'master' into textEncoding	2017-11-27 14:29:13 +01:00
tobiaskaminsky	d1bf8eb24b	satisfy codacy	2017-11-27 13:17:38 +01:00
tobiaskaminsky	b35e2eaa92	auto detect encoding	2017-11-27 13:17:37 +01:00
tobiaskaminsky	e547f37b07	set content description ... minor type errors	2017-11-27 13:02:37 +01:00
Nextcloud bot	1dadf9cb62	[tx-robot] updated from transifex	2017-11-27 12:01:46 +00:00
tobiasKaminsky	1cb184377e	fix due to rebase	2017-11-27 12:16:50 +01:00
tobiasKaminsky	54dc0efc1b	hide direct download on fdroid, will be manually enabled for apk pushed on download.nextcloud.com	2017-11-27 12:15:56 +01:00