10908 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Kaminsky	73091d7718	daily dev 20180613	2018-06-13 00:32:58 +02:00
Tobias Kaminsky	6c12b573ac	Merge pull request #2671 from nextcloud/fileDetails-3 ... Iteration 3 for file detail & new sharing	2018-06-12 09:27:40 +02:00
AndyScherzinger	62b85e49e2	revert to master lib branch	2018-06-12 08:31:55 +02:00
AndyScherzinger	29fcc56865	Fix CR	2018-06-12 08:28:46 +02:00
AndyScherzinger	1b22eadec0	fix save of share is_password_protected single share persistence	2018-06-12 08:28:46 +02:00
AndyScherzinger	3cbec23774	adding is_password_protected column for shares for initial DB setup	2018-06-12 08:28:45 +02:00
AndyScherzinger	62a53dc3e5	rewrite of sharing logic/persistence to store and use the fact if a share(mail) is password protected	2018-06-12 08:28:45 +02:00
AndyScherzinger	7e5655ce67	use lib branch with updated OCShare file	2018-06-12 08:28:35 +02:00
nextcloud-android-bot	0a087b7328	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2018-06-12 00:56:06 +00:00
Nextcloud bot	174a2691c1	[tx-robot] updated from transifex	2018-06-12 00:53:26 +00:00
Tobias Kaminsky	888b72cbb0	daily dev 20180612	2018-06-12 00:32:08 +02:00
Andy Scherzinger	46ac2c58ea	raise score ... will be decreased automatically as soon as transifex bot is done	2018-06-11 17:15:31 +02:00
Andy Scherzinger	671cb95b84	Merge pull request #2389 from harshika-arya/snackbar ... Refactor : convert toast to snackbar	2018-06-11 17:10:06 +02:00
AndyScherzinger	5c6dd299a1	move further Snackbar calls to Utils implementation	2018-06-11 16:37:34 +02:00
AndyScherzinger	edd9331691	fix string to make lint happy	2018-06-11 16:29:57 +02:00
AndyScherzinger	217fd15857	Fix imports	2018-06-11 16:24:33 +02:00
AndyScherzinger	4e99e9626e	fix type in variable names	2018-06-11 16:21:38 +02:00
AndyScherzinger	f0f566ea66	further aligned javaDoc with Snackbar docs	2018-06-11 16:12:19 +02:00
AndyScherzinger	99225f1282	replace Snackbar calls with utils calls	2018-06-11 12:32:48 +02:00
Harshika	c7c6dea158	fix unnecessary changes	2018-06-11 11:59:30 +02:00
Harshika	7c491ce7ee	refactor: convert toast to snackbar	2018-06-11 11:59:26 +02:00
Nextcloud bot	9173f1345c	[tx-robot] updated from transifex	2018-06-11 00:46:35 +00:00
Tobias Kaminsky	dacfbc8d8e	daily dev 20180611	2018-06-11 00:32:09 +02:00
Andy Scherzinger	0d4fa10676	Merge pull request #2225 from nextcloud/windowNullable ... getWindow(): The current window, or null if the activity is not visual.	2018-06-10 22:35:38 +02:00
tobiasKaminsky	122e2c47ab	remove unneeded 2.x check ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-10 22:28:55 +02:00
tobiasKaminsky	009762cfd0	always use window variable ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-10 22:28:55 +02:00
xXSTrikeXx	e9f524f218	Update ThemeUtils.java ... Fix Codacy	2018-06-10 22:28:39 +02:00
tobiasKaminsky	d996b0d0e8	getWindow(): The current window, or null if the activity is not visual. ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-10 22:28:38 +02:00
Andy Scherzinger	b5bc9b6578	Merge pull request #1657 from rhari991/device-credentials-unlock ... Add support for device credentials	2018-06-10 22:14:33 +02:00
Andy Scherzinger	cd258ab180	Merge pull request #2698 from nextcloud/filedetailsharing-private-constructor ... fragment:util: Added private constructor to hide the inherit public one	2018-06-10 22:04:16 +02:00
AndyScherzinger	6ba8b24c40	fix feature list	2018-06-10 21:36:32 +02:00
AndyScherzinger	f4438afc03	move preference access to manager class	2018-06-10 21:36:32 +02:00
AndyScherzinger	7e338b8ce9	lint: remove unused dimens value	2018-06-10 21:36:32 +02:00
AndyScherzinger	20bc9d21af	remove unused variable	2018-06-10 21:36:31 +02:00
AndyScherzinger	077f486069	fixes after rebase	2018-06-10 21:36:31 +02:00
AndyScherzinger	10dabe7145	cleanup after rebase (removed unused methods, simplified statements)	2018-06-10 21:36:30 +02:00
tobiasKaminsky	19899b0519	do not show document content if protection is enabled ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-10 21:36:30 +02:00
tobiasKaminsky	28c2967739	adjust what's new to 3.2.0 ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-10 21:36:29 +02:00
tobiasKaminsky	2403ed5efe	changes due to merge ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-10 21:36:29 +02:00
tobiaskaminsky	4a3197d8dd	enhance what's new screen ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-06-10 21:36:28 +02:00
tobiaskaminsky	eced47e3f1	ignore unused resources on translated files (done via transifex) ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-06-10 21:36:28 +02:00
tobiaskaminsky	58d62ab204	updated whatsnew image ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-06-10 21:36:27 +02:00
tobiaskaminsky	f85e8e3389	code cleanup ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-06-10 21:36:27 +02:00
tobiaskaminsky	5f89a1f626	- use device credential if fingerprint was used on old version ... - draft for what's new Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-06-10 21:36:26 +02:00
tobiaskaminsky	cadf4c0ba5	- show device credentials only when set up ... - allow press back/cancel during device credentials Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-06-10 21:36:26 +02:00
tobiasKaminsky	2b67067bc9	removed unneeded translations	2018-06-10 21:36:25 +02:00
tobiaskaminsky	e8a4f3736c	remove unused translations	2018-06-10 21:36:24 +02:00
Hari	a98905a9a3	Make lock options mutually exclusive	2018-06-10 21:36:24 +02:00
AndyScherzinger	05869f5796	remove obsolete string	2018-06-10 21:36:23 +02:00
tobiaskaminsky	b1244cad42	remove unneedded translations	2018-06-10 21:36:23 +02:00