10829 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tobiasKaminsky	4da8a94a75	delete local file on restore ... refresh file list / activity list on succesfull restore Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-14 23:44:15 +02:00
tobiasKaminsky	86da82f7b7	changes due to codacy ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-14 23:44:15 +02:00
tobiasKaminsky	74b832c958	remove local copy ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-14 23:44:14 +02:00
tobiasKaminsky	075b0f52b8	Add file version to activity stream ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-14 23:44:14 +02:00
tobiasKaminsky	941ab7c023	fix not needed try/catch blocks ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-14 23:44:13 +02:00
tobiasKaminsky	78055cbf21	add avatar icons on sharee list ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-14 23:44:13 +02:00
AndyScherzinger	7df8a18d6b	butterknife for details fragment + proper empty content handling	2018-06-14 23:44:12 +02:00
Andy Scherzinger	b3d3d3c047	Merge pull request #2700 from nextcloud/emailShare ... Iteration 4 for File detail & new sharing - email share	2018-06-14 23:38:08 +02:00
Andy Scherzinger	5bb48d0a69	revert back to master lib	2018-06-14 23:34:17 +02:00
Andy Scherzinger	2f68a6ef85	Merge pull request #2706 from nextcloud/preferencesCrash ... Crash on preferences: NPE check	2018-06-14 23:31:43 +02:00
Andy Scherzinger	2c4f859e6d	Merge pull request #2704 from nextcloud/changelog320 ... 3.2.0 Changelog added	2018-06-14 23:31:15 +02:00
AndyScherzinger	4ac524e244	adjust javaDoc	2018-06-14 15:32:04 +02:00
AndyScherzinger	8d924a720e	display email icon for email addresses in the suggestions for share searches	2018-06-14 15:32:03 +02:00
AndyScherzinger	c0e116a298	simplify if-clauses	2018-06-14 15:32:03 +02:00
AndyScherzinger	16e6e75a45	codacy: organize imports	2018-06-14 15:32:02 +02:00
tobiasKaminsky	f8bc830f9b	user lib branch ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-14 15:32:02 +02:00
tobiasKaminsky	3a08be4406	add sharing to email ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-14 15:31:58 +02:00
Nextcloud bot	1fc02c03ff	[tx-robot] updated from transifex	2018-06-14 00:49:46 +00:00
tobiasKaminsky	57f901bee6	bump version to 3.3.0 alpha1 ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-13 16:48:17 +02:00
tobiasKaminsky	82679c70f2	NPE check ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-06-13 16:39:20 +02:00
Andy Scherzinger	0bfdc45811	3.2.0 Changelog added	2018-06-13 12:42:24 +02:00
Nextcloud bot	d65050b303	[tx-robot] updated from transifex	2018-06-13 00:47:58 +00:00
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