26 commits

Author	SHA1	Message	Date
Mario Danic	b38866ebc7	Lots of magic	2017-04-28 10:39:52 +02:00
Mario Danic	9130635fa1	Progress on Analytics magic	2017-04-26 21:58:00 +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ć	19705ff438	Merge branch 'master' into externalLinks	2017-04-20 22:37:56 +02:00
Flole	043ff2ad8f	Fixing issues mentioned in review.	2017-04-20 09:09:11 +02:00
Flole	99bf76657a	Added Fingerprint Support	2017-04-20 09:09:10 +02: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
AndyScherzinger	8187a2582f	Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore ... # Conflicts: # src/main/res/values/setup.xml # src/modified/res/values/setup.xml	2017-04-19 18:25:51 +02:00
Mario Danic	e429f351a3	Fix drawer menu item	2017-04-19 15:54:54 +02:00
Mario Danic	efeeaf83d9	Make notifications single instance	2017-04-19 15:54:54 +02:00
AndyScherzinger	a382872313	WiP activity for notifications	2017-04-19 15:54:52 +02:00
Mario Danic	9684e89daf	Fix drawer menu item	2017-04-19 15:54:52 +02:00
Mario Danic	537c6a12f4	Make notifications single instance	2017-04-19 15:54:52 +02:00
AndyScherzinger	cb8c8caf7d	WiP activity for notifications	2017-04-19 15:54:49 +02:00
tobiasKaminsky	35e683546c	contact backup & import	2017-04-18 08:23:55 +02:00
Mario Danic	8717832fbb	Remove gcm stuff	2017-04-13 22:54:37 +02:00
tobiasKaminsky	dfbfd051f4	added webview support	2017-04-06 11:45:53 +02:00
Mario Danic	a57cb2e368	Working on everything	2017-03-30 12:10:11 +02:00
AndyScherzinger	95e90cbeae	initial menu add and empty activity	2017-03-27 11:38:52 +02:00
Mario Danic	38f1cc0e28	First bits of user info code	2017-03-26 00:51:07 +01:00
AndyScherzinger	2fbc7d05cf	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-14 21:56:31 +01:00
Mario Danic	21e8f5530b	Merge branch 'master' into branding	2017-03-06 08:10:16 +01:00
Mario Danic	0ffb67c506	Merge branch 'branding' into bring-branding-to-master ... # Conflicts: # .drone.yml # build.gradle # src/main/java/com/owncloud/android/services/SyncedFolderJobService.java # src/main/java/com/owncloud/android/services/observer/SyncedFolderObserver.java # src/main/java/com/owncloud/android/utils/RecursiveFileObserver.java	2017-03-05 21:09:36 +01:00
Mario Danic	05367bf9ab	Fix string	2017-02-25 03:47:31 +01:00
Mario Danic	1052986243	Fix authorities	2017-02-25 03:43:08 +01:00
Mario Danic	16f1243da6	Fix project structure and prepare for branding	2017-02-25 02:44:31 +01:00

Renamed from AndroidManifest.xml (Browse further)