56 commits

Author	SHA1	Message	Date
Mario Danic	64ccfe8c0d	Add user display name support	2017-03-26 00:51:21 +01:00
Mario Danic	708b48c785	First bits of user info code	2017-03-26 00:51:20 +01:00
Mario Danic	db02da1409	Fix codacy issues	2017-03-26 00:51:19 +01:00
Mario Danic	df44118185	Implement user information magic	2017-03-26 00:51:18 +01:00
Mario Danic	d010a71308	Add user display name support	2017-03-26 00:51:17 +01:00
Mario Danic	3ec59a89a0	First bits of user info code	2017-03-26 00:51:16 +01:00
Mario Danic	e507f06606	Implement user information magic	2017-03-26 00:51:16 +01:00
Mario Danic	28d6ccb7d6	Add user display name support	2017-03-26 00:51:15 +01:00
Mario Danic	5339fd7587	First bits of user info code	2017-03-26 00:51:14 +01:00
Mario Danic	eaae09877f	Fix codacy issues	2017-03-26 00:51:13 +01:00
Mario Danic	3e21b5b0dd	Implement user information magic	2017-03-26 00:51:12 +01:00
Mario Danic	e224cb0f2a	First bits of user info code	2017-03-26 00:51:12 +01:00
Mario Danic	98782994f0	Implement user information magic	2017-03-26 00:51:12 +01:00
Mario Danic	2ba88eed79	First bits of user info code	2017-03-26 00:51:11 +01:00
Mario Danic	7ccac590f0	Fix codacy issues	2017-03-26 00:51:10 +01:00
Mario Danic	f4ab569226	Implement user information magic	2017-03-26 00:51:09 +01:00
Mario Danic	5c94246275	Add user display name support	2017-03-26 00:51:08 +01:00
Mario Danic	38f1cc0e28	First bits of user info code	2017-03-26 00:51:07 +01:00
Andy Scherzinger	feddb43c5d	Merge pull request #773 from nextcloud/update-android-job ... Update android job	2017-03-26 00:43:44 +01:00
Mario Danic	0258811e85	Fix video upload path	2017-03-24 14:04:21 +01:00
Mario Danic	c6d6fc82f0	Update android job	2017-03-23 20:58:55 +01:00
Mario Danic	adfb581ef6	Merge branch 'master' into branding	2017-03-22 21:16:12 +01:00
tobiasKaminsky	71ea26df31	remove firebase from branding branch and put it into branch "analytics"	2017-03-22 20:18:37 +01:00
AndyScherzinger	02e94fb21a	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-21 16:48:42 +01:00
Mario Danic	85a37b563f	Revert "Update branding setup" ... This reverts commit d7161474a2.	2017-03-17 19:09:17 +01:00
Mario Danic	d7161474a2	Update branding setup	2017-03-17 18:28:14 +01:00
Mario Danic	105f609a3f	Properly remove add account	2017-03-17 17:13:25 +01:00
AndyScherzinger	4077980ea0	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-16 23:09:58 +01:00
Mario Danic	8a04689e92	Fix sharing	2017-03-16 18:04:21 +01:00
Mario Danic	f0249be463	Fix search users	2017-03-14 22:59:35 +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	f14d340dae	Add all required screen names	2017-03-06 12:08:51 +01:00
Mario Danic	1732f7dc73	Some work on Firebase integration	2017-03-06 09:58:50 +01:00
Mario Danic	21e8f5530b	Merge branch 'master' into branding	2017-03-06 08:10:16 +01:00
Mario Danic	b7e41eeff1	Fix gradle and supresswarnings issue	2017-03-05 21:20:54 +01:00
Mario Danic	db829c5e56	Remove useless files	2017-03-05 21:11:29 +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	72349b5ef9	Merge branch 'master' into branding	2017-03-02 12:46:00 +01:00
Mario Danic	5b4b8bd20f	Remove enable_analytics magic	2017-03-02 12:40:25 +01:00
Mario Danic	27e486458a	Put quota text back to its place	2017-03-02 12:36:28 +01:00
Mario Danic	364d82c0c0	Clean up things	2017-02-27 11:10:34 +01:00
Mario Danic	6b1cf6895d	Merge branch 'master' into branding	2017-02-27 10:17:00 +01:00
Mario Danic	ad357ef071	Add missing string to main strings	2017-02-25 10:16:38 +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	088e345ea5	custom variables	2017-02-25 02:44:32 +01:00
Mario Danic	10102c0f2d	Remove currently unused variable	2017-02-25 02:44:32 +01:00
Mario Danic	7b57687fed	Remove majority of custom folder	2017-02-25 02:44:32 +01:00
Mario Danic	749cbcf31c	Move the generic MainApp	2017-02-25 02:44:31 +01:00
Mario Danic	dba8c4ed6e	Move things around	2017-02-25 02:44:31 +01:00