6970 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andy Scherzinger	feddb43c5d	Merge pull request #773 from nextcloud/update-android-job ... Update android job	2017-03-26 00:43:44 +01:00
Andy Scherzinger	0313183ea5	Merge pull request #774 from nextcloud/fix-instant-upload-video ... Fix video upload path	2017-03-26 00:43:00 +01:00
Mario Danic	7f0fb21ae8	Fix files search icon	2017-03-24 23:31:21 +01:00
Mario Danic	36b4e168d7	Fix favorites	2017-03-24 19:23:51 +01:00
Mario Danic	a8ed34fe97	Fix list view clicks	2017-03-24 19:12:37 +01:00
Mario Danic	0258811e85	Fix video upload path	2017-03-24 14:04:21 +01:00
Mario Danic	13d62e651e	Remove analytics instance	2017-03-24 09:46:35 +01:00
Mario Danic	0d24f87717	Merge branch 'master' into favourites ... # Conflicts: # src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java	2017-03-24 09:44:50 +01:00
Mario Danic	3e7e7b38fe	Fix a few codacy issues	2017-03-24 09:37:29 +01:00
Mario Danic	7ed5dd7d78	Fix menu stuff	2017-03-24 09:30:03 +01:00
Mario Danic	393e64fcff	Fix menu setup	2017-03-24 02:36:04 +01:00
Mario Danic	2bc4d29f98	Clean up	2017-03-24 02:27:36 +01:00
Mario Danic	c6d6fc82f0	Update android job	2017-03-23 20:58:55 +01:00
Mario Đanić	e21c8dcff9	Merge pull request #679 from nextcloud/branding ... Branding	2017-03-22 21:21:50 +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
Nextcloud bot	aab88d2f10	[tx-robot] updated from transifex	2017-03-22 01:19:41 +00:00
AndyScherzinger	02e94fb21a	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-21 16:48:42 +01:00
Nextcloud bot	e4da41ecfe	[tx-robot] updated from transifex	2017-03-21 01:19:24 +00:00
Mario Danic	a046fead8f	Fix favorites toggle	2017-03-20 00:43:13 +01:00
Mario Danic	62d39e7654	Fix a few favorite things	2017-03-20 00:23:34 +01:00
Mario Danic	d887c08897	Fix loading	2017-03-20 00:18:16 +01:00
Mario Danic	3579c02cee	Fix recently modified sort	2017-03-20 00:06:54 +01:00
Mario Danic	171544c6bb	Progress on search	2017-03-19 23:47:56 +01:00
Mario Danic	58e1208c51	Store favorites in database	2017-03-19 23:02:36 +01:00
Mario Danic	705ea85060	Work a bit on favorites	2017-03-19 22:12:44 +01:00
AndyScherzinger	ca0f1bbb2d	partial click fix	2017-03-19 14:05:50 +01:00
Mario Danic	59c5eccf6a	Grid image favourite focus	2017-03-19 11:18:38 +01:00
Nextcloud bot	81140fae0d	[tx-robot] updated from transifex	2017-03-19 01:19:40 +00:00
Nextcloud bot	0750679f3e	[tx-robot] updated from transifex	2017-03-18 01:19:12 +00:00
Mario Danic	85a37b563f	Revert "Update branding setup" ... This reverts commit d7161474a2.	2017-03-17 19:09:17 +01:00
Mario Danic	f1dcd38faf	Fix gradle	2017-03-17 18:35:17 +01:00
Mario Danic	dd3f303505	Merge branch 'branding' into favourites	2017-03-17 18:28:24 +01:00
Mario Danic	d7161474a2	Update branding setup	2017-03-17 18:28:14 +01:00
Mario Danic	d4af7441fc	Merge branch 'branding' into favourites ... # Conflicts: # build.gradle # gradle/wrapper/gradle-wrapper.properties	2017-03-17 18:26:26 +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	e0a0c503b7	Fix other build	2017-03-16 20:36:11 +01:00
Mario Danic	de29418a76	Fix the build	2017-03-16 18:33:32 +01:00
Mario Danic	8a04689e92	Fix sharing	2017-03-16 18:04:21 +01:00
Nextcloud bot	1f159b65f3	[tx-robot] updated from transifex	2017-03-16 13:59:01 +00:00
Nextcloud bot	8dc5e2a6ac	[tx-robot] updated from transifex	2017-03-16 13:52:59 +00:00
Nextcloud bot	89dbf807a2	[tx-robot] updated from transifex	2017-03-16 13:26:06 +00:00
Nextcloud bot	3450454a79	[tx-robot] updated from transifex	2017-03-16 12:38:06 +00:00
Nextcloud bot	f1ac1c683c	[tx-robot] updated from transifex	2017-03-16 01:19:06 +00:00
Nextcloud bot	3c2c2c9e4f	[tx-robot] updated from transifex	2017-03-15 01:19:16 +00:00
Mario Danic	3c68e865e2	Fix layout issues	2017-03-15 01:18:14 +01:00
Mario Danic	926001bbe7	Hide videos if search isn’t supported	2017-03-15 00:17:17 +01:00
Mario Danic	274aa7e9a8	Fix UI issues	2017-03-15 00:12:17 +01:00
Mario Đanić	f4e17c6941	Merge pull request #732 from M1dgard/remove_newl_tabs ... Remove tabs and line breaks from string source	2017-03-15 00:10:47 +01:00