6715 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Danic	1815ace4d1	Don’t cache changing deps	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
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	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 Đ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
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	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	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 Đ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
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
Andy Scherzinger	fce11e28e8	Merge pull request #740 from nextcloud/Release142 ... Release 1.4.2	2017-03-14 09:53:44 +01:00
AndyScherzinger	320a4bae0d	release 1.4.2	2017-03-14 09:39:31 +01:00
Nextcloud bot	d99f671fda	[tx-robot] updated from transifex	2017-03-13 21:23:06 +00:00
Nextcloud bot	2e90c10811	[tx-robot] updated from transifex	2017-03-13 01:21:39 +00:00
Nextcloud bot	f91e1b3fef	[tx-robot] updated from transifex	2017-03-12 01:21:20 +00:00
M1dgard	2fee510b15	Remove tabs and line breaks from string source ... They were shown in Transifex and appeared to be just artefacts of word wrap and indentation of the XML source, so this commit removes them. Also some spaces at the end of messages were removed while I was at it.	2017-03-11 12:08:53 +01:00
Nextcloud bot	56e4bd70bf	[tx-robot] updated from transifex	2017-03-11 01:20:27 +00:00
Nextcloud bot	3047086e85	[tx-robot] updated from transifex	2017-03-09 01:19:33 +00:00
Nextcloud bot	81d97673e5	[tx-robot] updated from transifex	2017-03-08 01:18:58 +00: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
Nextcloud bot	3590e67813	[tx-robot] updated from transifex	2017-03-06 01:18:48 +00:00
Andy Scherzinger	61b7cbd5c3	Merge pull request #723 from nextcloud/more-search-fixes ... Various search fixes	2017-03-05 22:33:53 +01:00
Mario Danic	d3ec3b3c46	Remove useless import	2017-03-05 22:24:26 +01:00
Mario Danic	cfe8d3c064	Various search fixes	2017-03-05 22:15:27 +01:00
Mario Danic	b7e41eeff1	Fix gradle and supresswarnings issue	2017-03-05 21:20:54 +01:00
Mario Danic	2d3139f8bf	Should revert compile sdk	2017-03-05 21:15:54 +01:00
Mario Danic	e68420002c	Wrapper	2017-03-05 21:14:15 +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