6699 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Andy Scherzinger	20bb144533	Merge pull request #718 from nextcloud/fix-search-crash ... Fix crashes	2017-03-05 18:55:24 +01:00
Mario Danic	b801310ce2	Fix crashes	2017-03-05 17:46:20 +01:00
Nextcloud bot	a7be471925	[tx-robot] updated from transifex	2017-03-05 14:47:56 +00:00
Nextcloud bot	6ac769210e	[tx-robot] updated from transifex	2017-03-05 01:18:43 +00:00
Nextcloud bot	6889487e2d	[tx-robot] updated from transifex	2017-03-04 01:18:32 +00:00
Mario Đanić	e883ac19f3	Merge pull request #713 from nextcloud/fix-quota-crash ... Fix quota crash	2017-03-03 19:04:13 +01:00
Mario Danic	657dbcd03e	Fix quota crash	2017-03-03 18:52:10 +01:00
Mario Đanić	f0bbb4b562	Merge pull request #615 from nextcloud/rewrite-auto-upload ... Rewrite auto upload	2017-03-03 16:51:12 +01:00
AndyScherzinger	c5f748dffb	use latest lib version	2017-03-03 16:18:05 +01:00
AndyScherzinger	b6118748d9	Changelog for 1.4.2	2017-03-03 14:37:10 +01:00
Mario Danic	5fee93d975	Declare string where needed	2017-03-03 11:08:13 +01:00
Mario Danic	a53e289a3e	This is useless	2017-03-03 11:08:13 +01:00
Mario Danic	c9749698fa	Fix a bug	2017-03-03 11:08:12 +01:00
Mario Danic	4f461b788e	Fix	2017-03-03 11:08:12 +01:00
AndyScherzinger	35284f93a5	made expected path a local variable since it is only used in one place	2017-03-03 11:08:12 +01:00
Mario Danic	832f2c4733	Put delete file back	2017-03-03 11:08:11 +01:00