8889 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andy Scherzinger	a8b524e9d4	Merge pull request #1604 from stalker314314/two_different_sentences_needed ... Fixes #1600	2017-09-29 15:44:08 +02:00
stalker314314	6e4c14c8d4	Fixes #1600 ... Change "Set as available offline" text to "Available offline" for switch widget in file details dialog, to differnetiate between this and "Set as available offline" in menu	2017-09-29 15:20:49 +02:00
AndyScherzinger	bedaba60e6	add plurals warning	2017-09-29 15:18:00 +02:00
Nextcloud bot	28771accbb	[tx-robot] updated from transifex	2017-09-29 00:29:46 +00:00
Andy Scherzinger	4e7961dba6	Merge pull request #1596 from nextcloud/tintExternalIcons ... tint external icons	2017-09-28 23:11:04 +02:00
tobiasKaminsky	f489711bbe	tint external icons	2017-09-28 11:20:05 +02:00
Nextcloud bot	fb8e538855	[tx-robot] updated from transifex	2017-09-28 00:29:45 +00:00
Nextcloud bot	66cd3646c3	[tx-robot] updated from transifex	2017-09-27 00:28:43 +00:00
Nextcloud bot	2eafbcb53c	[tx-robot] updated from transifex	2017-09-26 00:28:46 +00:00
Andy Scherzinger	1d6afe34e3	Merge pull request #1593 from nextcloud/NPE_OCFileListFragment ... Prevent NPE in OCFileListFragment	2017-09-25 16:55:03 +02:00
AndyScherzinger	4743545c82	resolves #1590 by checking for null	2017-09-25 13:30:18 +02:00
Andy Scherzinger	41ea468d66	Merge pull request #1589 from nextcloud/fixDatabase23 ... Database upgrade #23 skipped entire remaining upgrades	2017-09-25 10:41:09 +02:00
tobiasKaminsky	43a2b4dd2a	database upgrade #23 skipped entire remaining upgrades	2017-09-25 08:39:20 +02:00
Nextcloud bot	b90a3a009a	[tx-robot] updated from transifex	2017-09-24 00:27:39 +00:00
Tobias Kaminsky	0b7d7c224d	Merge pull request #1576 from nextcloud/200rc7 ... RC7	2017-09-23 09:48:19 +02:00
tobiasKaminsky	b49a1120ef	RC7	2017-09-23 09:36:03 +02:00
tobiasKaminsky	054df29443	RC7	2017-09-23 09:36:03 +02:00
Tobias Kaminsky	2dde6e7b61	Merge pull request #1578 from nextcloud/fix-4g-retry ... Fix 4g retry	2017-09-23 09:35:18 +02:00
tobiasKaminsky	69faf69b63	satisfy codacy: correct indentation	2017-09-23 09:20:54 +02:00
tobiasKaminsky	1da39384d8	revert test	2017-09-23 09:11:19 +02:00
tobiasKaminsky	1a9c64c046	fix lint-up when 0 errors 🎉	2017-09-23 09:10:08 +02:00
nextcloud-android-bot	7aba61068b	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-09-23 06:37:28 +00:00
Mario Đanić	1f7f521403	Merge f606e88a89 into f6ae6784e9	2017-09-23 06:20:22 +00:00
Mario Danic	f606e88a89	Fix 4g retry ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-09-23 08:20:13 +02:00
Nextcloud bot	f6ae6784e9	[tx-robot] updated from transifex	2017-09-23 00:27:13 +00:00
Mario Đanić	c8438e446b	Merge pull request #1575 from nextcloud/gridDefaultThreeColumns ... Grid view: default to 4 columns	2017-09-22 16:09:42 +02:00
Tobias Kaminsky	081fb7a8c8	Update PreferenceManager.java	2017-09-22 15:49:06 +02:00
tobiasKaminsky	045b285438	default to 3 columns	2017-09-22 15:49:06 +02:00
Tobias Kaminsky	185cdce908	Merge pull request #1539 from nextcloud/fix-search-issues ... Make search work again	2017-09-22 15:48:22 +02:00
Mario Danic	d90cdaf202	Make search work again ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-09-22 15:34:53 +02:00
Andy Scherzinger	f2cdedd15c	Merge pull request #1560 from nextcloud/pushWarning ... Show info messages for push	2017-09-22 13:40:51 +02:00
tobiaskaminsky	8c272da8c8	bump lib	2017-09-22 12:49:45 +02:00
tobiaskaminsky	631869e2a2	renamed ResultCode	2017-09-22 12:49:45 +02:00
tobiaskaminsky	0aa2aaaab1	use result code to determinate if old login	2017-09-22 12:49:45 +02:00
AndyScherzinger	46535cdc02	shrtening of string	2017-09-22 12:49:44 +02:00
AndyScherzinger	86ca866fa4	shortened, changed strings	2017-09-22 12:49:44 +02:00
tobiaskaminsky	a1b4923418	Show messages if ... - no push possible (fdroid) - push possible, but old login	2017-09-22 12:49:13 +02:00
Nextcloud bot	98a1ca5c42	[tx-robot] updated from transifex	2017-09-22 00:28:47 +00:00
Andy Scherzinger	8950439d55	Merge pull request #1567 from nextcloud/license_sourcecode ... add license/source code link	2017-09-21 18:37:27 +02:00
tobiaskaminsky	90dc587300	add license/source code link	2017-09-21 11:37:40 +02:00
Nextcloud bot	3722a3f2c4	[tx-robot] updated from transifex	2017-09-21 00:28:24 +00:00
Andy Scherzinger	119391994e	Merge pull request #1562 from nextcloud/drone24 ... Bump to 24 to support gradle beta 6	2017-09-20 22:18:41 +02:00
tobiaskaminsky	98020f6feb	bump to 24	2017-09-20 21:43:55 +02:00
Andy Scherzinger	6dafecf753	Merge pull request #1565 from nextcloud/vCardURL ... Fix bug if photo is URL	2017-09-20 21:26:55 +02:00
tobiaskaminsky	2e69377c52	fix bug if photo is URL	2017-09-20 15:25:44 +02:00
Nextcloud bot	4654f0064c	[tx-robot] updated from transifex	2017-09-20 00:28:40 +00:00
Tobias Kaminsky	7100d9f92d	Merge pull request #1554 from nextcloud/noAccountWarningOnFreshStart ... Do not show warning on very first start of fresh installation	2017-09-19 13:35:33 +02:00
tobiasKaminsky	0f38520417	do not show warning on very first start	2017-09-19 12:51:55 +02:00
Andy Scherzinger	4ca26607ac	Merge pull request #1558 from nextcloud/fixNpeOnAccountRemoval ... NPE if pending uploads exists on account removal	2017-09-19 12:31:00 +02:00
tobiaskaminsky	5a843a538c	NPE if pending uploads exists	2017-09-19 11:59:46 +02:00