7212 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tobiasKaminsky	5319a63c33	always refresh ocShares prior listing them to have an uptodate ocFile	2017-04-21 15:36:44 +02:00
tobiasKaminsky	42f2ed267d	disable FAB on searchViews	2017-04-21 13:49:39 +02:00
Mario Danic	ca1355bf10	Tweak davdroid config option	2017-04-21 12:36:43 +02:00
Mario Đanić	618c472a72	Merge pull request #861 from nextcloud/renameNightlyToDev ... change all namings of beta/nightly to new "dev"	2017-04-21 10:03:20 +02:00
Mario Đanić	1e47bc41b8	Merge pull request #863 from nextcloud/bumpLibraryTo1_0_15 ... bump library to 1.0.15	2017-04-21 10:02:36 +02:00
Mario Đanić	847eaa9a9a	Merge pull request #864 from nextcloud/fixMediaplayer2 ... fix mediaplayer for real this time	2017-04-21 10:01:59 +02:00
tobiasKaminsky	f33e022e7b	fix mediaplayer for real this time	2017-04-21 08:28:17 +02:00
tobiasKaminsky	197ccb7094	bump library ... unify build.gradle files	2017-04-21 08:02:49 +02:00
tobiasKaminsky	550ae613a1	change all namings of beta/nightly to new "dev"	2017-04-21 07:32:24 +02:00
Nextcloud bot	dcc216b316	[tx-robot] updated from transifex	2017-04-21 00:20:51 +00:00
Andy Scherzinger	601c0aeef9	Merge pull request #860 from nextcloud/fix-build ... Fix prefs	2017-04-20 23:22:24 +02:00
Mario Danic	f725ada65e	Fix prefs	2017-04-20 23:17:25 +02:00
Mario Đanić	9739edbbec	Merge pull request #624 from Flole998/master ... Added fingerprint support	2017-04-20 22:40:50 +02:00
Mario Đanić	5d50a1cc44	Merge pull request #858 from nextcloud/favoritesSwitchToGrid ... prevent NPE if trying to store grid preference for favorites/shared	2017-04-20 22:39:48 +02:00
Mario Đanić	5baf7860b2	Merge pull request #854 from nextcloud/swipeToRefreshSearch ... Swipe to refresh search	2017-04-20 22:39:34 +02:00
Mario Đanić	27150277a7	Merge pull request #853 from nextcloud/fixLongClicking ... fix missing long click in "search"	2017-04-20 22:39:01 +02:00
Mario Đanić	c19644f86b	Merge pull request #852 from nextcloud/preventCrashWhileRotating ... prevent crash when fetching search event while rotating	2017-04-20 22:38:47 +02:00
Mario Đanić	165f421984	Merge pull request #806 from nextcloud/externalLinks ... External links	2017-04-20 22:38:24 +02:00
Mario Đanić	19705ff438	Merge branch 'master' into externalLinks	2017-04-20 22:37:56 +02:00
Mario Đanić	89f4d81ff1	Merge pull request #824 from nextcloud/contactBackupRestore ... Contact backup & import	2017-04-20 22:36:00 +02:00
AndyScherzinger	299f08694f	fixes due to code review	2017-04-20 21:51:08 +02:00
tobiasKaminsky	fe6171571f	prevent NPE if trying to store grid preference for favorites/shared	2017-04-20 15:34:36 +02:00
tobiasKaminsky	9377f22f51	swipe to refresh for "search"	2017-04-20 11:26:22 +02:00
tobiasKaminsky	95d9ea014c	fix missing long click in "search"	2017-04-20 11:21:25 +02:00
tobiasKaminsky	9c1339b1e4	prevent crash when fetching search event while rotating	2017-04-20 10:32:45 +02:00
AndyScherzinger	ed59604d3f	fixes after rebase	2017-04-20 09:09:14 +02:00
AndyScherzinger	744a1fc549	fix remove line	2017-04-20 09:09:13 +02:00
AndyScherzinger	8bdb8614e6	fixes after rebase due to project structure changes	2017-04-20 09:09:13 +02:00
Flole	674b20364a	Fixed crashes when OEM removes Fingerprintmanager from system	2017-04-20 09:09:13 +02:00
Flole	cbb29e23eb	Removed useless check and double inverse	2017-04-20 09:09:12 +02:00
Flole998	b291d6b3c1	Update strings.xml	2017-04-20 09:09:12 +02:00
Flole998	10f787b186	Update strings.xml	2017-04-20 09:09:12 +02:00
Flole	043ff2ad8f	Fixing issues mentioned in review.	2017-04-20 09:09:11 +02:00
Flole	ace94f1876	Made fingerprintmanager private	2017-04-20 09:09:11 +02:00
Flole	8365ef8073	Fixed some issues	2017-04-20 09:09:11 +02:00
Flole	b6d6208bb8	Fixed some issues	2017-04-20 09:09:10 +02:00
Flole	3b670ce175	Fixed some issues	2017-04-20 09:09:10 +02:00
Flole	99bf76657a	Added Fingerprint Support	2017-04-20 09:09:10 +02:00
Flole	8da1057f3b	Added Fingerprint Support	2017-04-20 09:08:59 +02:00
Nextcloud bot	fb4374d9fc	[tx-robot] updated from transifex	2017-04-20 00:21:12 +00:00
AndyScherzinger	cf7ccdfc65	Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore ... # Conflicts: # src/main/res/values/strings.xml	2017-04-19 23:38:31 +02:00
Mario Đanić	c050e52c6f	Merge pull request #783 from nextcloud/notifications ... Notifications	2017-04-19 20:09:35 +02:00
Mario Đanić	053e7da685	Merge pull request #849 from nextcloud/fix-drone ... Fix drone	2017-04-19 19:58:02 +02:00
Mario Danic	54f920a4d7	Fix drone	2017-04-19 19:57:38 +02:00
Mario Danic	b4a218e9d6	Update drone	2017-04-19 19:57:14 +02:00
Mario Danic	ba9a3a2886	Push	2017-04-19 19:48:50 +02:00
Mario Đanić	24ed2a1249	Merge pull request #848 from nextcloud/fix-drone ... Fix drone	2017-04-19 19:47:47 +02:00
Mario Danic	4cd4af9824	Fix drone	2017-04-19 19:46:58 +02:00
AndyScherzinger	22976389c2	add generic circular avatars for contacts and use slightly smaller, more material like font size	2017-04-19 19:08:59 +02:00
AndyScherzinger	f9c0e1ca09	align text to the right	2017-04-19 18:31:20 +02:00