7281 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tobiasKaminsky	9544b79197	removed empty if	2017-05-04 14:37:02 +02:00
tobiasKaminsky	b6b8dc1040	enable FAB only if not on searchView	2017-05-03 13:55:27 +02:00
tobiasKaminsky	277704e89f	make file search working again	2017-05-03 13:43:50 +02:00
tobiasKaminsky	e40fd02d72	Merge remote-tracking branch 'remotes/origin/master' into searchViewWrongFiles	2017-05-03 13:38:23 +02:00
tobiasKaminsky	a304f1b0a0	revert check for specific fragment while search, as contactBackup does not have a search	2017-05-03 13:35:22 +02:00
tobiasKaminsky	9f7cd59682	speedup search	2017-05-03 13:14:30 +02:00
Mario Đanić	e55f06ec6e	Merge pull request #941 from nextcloud/suppressLint ... remove suppressLint	2017-05-03 11:56:14 +02:00
Tobias Kaminsky	9e2f33f650	Merge pull request #935 from nextcloud/simplify-gplay-flavour ... Simplify gplay flavour	2017-05-03 11:09:52 +02:00
Andy Scherzinger	68e15fc65e	Merge pull request #934 from nextcloud/fix-push-refactor-leftover ... Fix leftover	2017-05-03 09:27:14 +02:00
Andy Scherzinger	9f6338adec	Merge pull request #936 from nextcloud/fix-fab-changing-from-background ... Fix fab stuff	2017-05-03 09:23:44 +02:00
tobiasKaminsky	c6268a609a	remove suppressLint ... Checkerboard on PNG files is only shown in >= M and thus toggle Background is also used in >= M only	2017-05-03 08:52:25 +02:00
Mario Danic	12f53eaf85	Fix fab stuff	2017-05-03 06:14:34 +02:00
Mario Đanić	e058de967c	Merge pull request #926 from nextcloud/rotationBug ... do not create a new adapter while rotating	2017-05-03 06:05:58 +02:00
Mario Danic	5711f6f0b4	Simplify gplay flavour	2017-05-03 05:59:34 +02:00
Mario Danic	ec5b97f07a	Fix leftover	2017-05-03 05:49:41 +02:00
Mario Đanić	fd67ec912d	Merge pull request #927 from nextcloud/preventCrashOnFingerprint ... prevent crashing if fingerprint is not supported	2017-05-03 05:39:07 +02:00
Mario Đanić	8f5eb1d662	Merge pull request #933 from nextcloud/push-improvements ... Fix stuff	2017-05-03 05:31:21 +02:00
Mario Danic	9186839048	Fix stuff	2017-05-03 05:30:37 +02:00
Mario Đanić	8e7fe636b7	Merge pull request #921 from nextcloud/activityOrientationChangeNPE ... NPE during Activity orientation change	2017-05-03 05:22:40 +02:00
Mario Đanić	7eade9c6dc	Merge pull request #916 from nextcloud/push-improvements ... Push improvements	2017-05-03 05:22:09 +02:00
Mario Danic	c1eeea1dcb	Change name as requested	2017-05-03 05:21:17 +02:00
Nextcloud bot	1246675b0e	[tx-robot] updated from transifex	2017-05-03 00:21:39 +00:00
tobiasKaminsky	7a117ce1f7	prevent crashing if fingerprint is not supported	2017-05-02 16:49:39 +02:00
Mario Danic	1effc4d23e	Fix build	2017-05-02 14:15:36 +02:00
Mario Danic	7f1739f5f7	Improve push / remove push registration	2017-05-02 13:53:19 +02:00
tobiasKaminsky	19c031f722	do not create a new adapter while rotating	2017-05-02 12:18:06 +02:00
tobiasKaminsky	9f7ccae575	do the same for Notification	2017-05-02 09:41:04 +02:00
Nextcloud bot	c9a53cb042	[tx-robot] updated from transifex	2017-05-02 06:46:46 +00:00
Nextcloud bot	d77b446e0d	[tx-robot] updated from transifex	2017-05-02 00:21:53 +00:00
Nextcloud bot	e44a5d690c	[tx-robot] updated from transifex	2017-05-01 00:21:49 +00:00
Mario Đanić	96cd46e34d	Merge pull request #913 from nextcloud/customBuildIndependent ... make custom build 100% independent	2017-04-30 19:53:16 +02:00
Mario Đanić	f07c78221d	Merge pull request #874 from nextcloud/contacts-fragment-replace ... Contacts backup improvements/bugfixes	2017-04-30 19:47:50 +02:00
Mario Danic	a7eab02d08	Fix codacy stuff	2017-04-30 19:40:27 +02:00
Mario Đanić	6a6f5d9ca1	Merge pull request #918 from nextcloud/autoUploadKeepInFolder ... AutoUpload: default to "keep file in original folder"	2017-04-30 19:35:29 +02:00
tobiasKaminsky	13ddc01467	NPE during Activity orientation change	2017-04-30 13:02:31 +02:00
tobiasKaminsky	f9b6417f48	- search view shows data again ... - no crash while rotation during search view is populated	2017-04-30 12:14:39 +02:00
Nextcloud bot	a8230f03c9	[tx-robot] updated from transifex	2017-04-30 00:21:24 +00:00
Tobias Kaminsky	f1e113753b	Merge pull request #915 from nextcloud/privatereese-patch-1 ... "And" Missing	2017-04-29 09:08:17 +02:00
tobiasKaminsky	1f67a9ae14	change log_name	2017-04-29 09:04:40 +02:00
tobiasKaminsky	fb025d17d0	db name also "custom"	2017-04-29 09:03:41 +02:00
tobiasKaminsky	21c4551c45	default to "keep file in original folder"	2017-04-29 08:21:50 +02:00
Nextcloud bot	7b1f251a0d	[tx-robot] updated from transifex	2017-04-29 00:21:08 +00:00
Mario Đanić	e9dc702dfc	Merge pull request #904 from nextcloud/customErrorWebView ... ability to show custom error message for webview	2017-04-28 22:59:07 +02:00
Bernhard Blieninger	299a71e03f	I think the "and" is missing.	2017-04-28 22:38:31 +02:00
Mario Danic	87cb2890ad	Cancel job only for an account	2017-04-28 20:51:47 +02:00
alejandro	887645921f	Fixing duplicated code	2017-04-28 10:22:47 -05:00
tobiasKaminsky	fa84532da7	make custom build 100% independent	2017-04-28 15:05:50 +02:00
tobiasKaminsky	c9c2cdbb4e	add Arbitrary Data table ... use it for multiple account contact backup	2017-04-28 14:52:30 +02:00
tobiasKaminsky	935e795a85	Merge remote-tracking branch 'remotes/origin/contacts-fragment-replace' into contactBackupRestore	2017-04-28 14:12:46 +02:00
tobiasKaminsky	21418cdc2d	Merge remote-tracking branch 'origin/master' into contactBackupRestore	2017-04-28 14:09:32 +02:00