9269 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Đanić	f8d10b9975	Merge pull request #1581 from nextcloud/suppressInnerClassesWarnings ... suppress annoying "warning: Ignoring InnerClasses"	2017-11-08 21:58:12 +01:00
Mario Đanić	cb3224144a	Merge pull request #1739 from nextcloud/paintWhatsNew ... Paint whats new: use fontColor for brander	2017-11-08 21:57:21 +01:00
Mario Đanić	b5dab66529	Merge pull request #1759 from nextcloud/mailOnDrone ... Test mail on drone	2017-11-08 21:57:02 +01:00
Mario Đanić	dea32bf6a8	Merge pull request #1760 from nextcloud/fix-1743 ... Enlarge hitbox size of file list items	2017-11-08 21:56:31 +01:00
Mario Đanić	32fa287913	Merge pull request #1717 from nextcloud/drone-28 ... Bump to drone image 28	2017-11-08 21:55:00 +01:00
Mario Đanić	f9acbba1b4	Merge pull request #1719 from nextcloud/externalCustomError ... Webviews: better error handling	2017-11-08 21:54:33 +01:00
AndyScherzinger	bd7db8f924	CR fix line length and variable namings	2017-11-08 16:34:02 +01:00
AndyScherzinger	6820bf1dba	CR - remove unused code	2017-11-08 16:34:01 +01:00
AndyScherzinger	234eb83e84	codacy: extract account migration to separate method	2017-11-08 16:34:01 +01:00
AndyScherzinger	831cabbacf	fixes after rebase	2017-11-08 16:34:01 +01:00
AndyScherzinger	762bf62357	make members private	2017-11-08 16:34:00 +01:00
AndyScherzinger	e1c6ffd07c	codacy add private attribute	2017-11-08 16:34:00 +01:00
AndyScherzinger	c9b9b2871f	further extract setup methods	2017-11-08 16:34:00 +01:00
AndyScherzinger	6fb3208bf2	properly extract/name expert mode key	2017-11-08 16:33:59 +01:00
AndyScherzinger	ac982b6f1d	refactor preference categories' distinct methods	2017-11-08 16:33:59 +01:00
AndyScherzinger	4b1fd06b81	cleanup upload list adapter ... # Conflicts: # src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java	2017-11-08 16:33:58 +01:00
AndyScherzinger	d96dee930a	codacy: move listener to own file to reduce file complexity	2017-11-08 16:33:58 +01:00
AndyScherzinger	4804a799e8	codacy: fix reassigning of variable	2017-11-08 16:33:58 +01:00
AndyScherzinger	620e58a283	codacy: replace member with local variable	2017-11-08 16:33:57 +01:00
AndyScherzinger	098241eea8	codacy: Avoid reassigning parameters and extract util methods to proper util class ... # Conflicts: # src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java	2017-11-08 16:33:57 +01:00
nextcloud-android-bot	8d767efe57	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-11-08 16:32:26 +01:00
AndyScherzinger	461c4282e8	fix lint warnings	2017-11-08 16:32:25 +01:00
AndyScherzinger	7082bf7189	Fixes #1743 by enlarging the padding of the icons (hitbox)	2017-11-08 16:32:25 +01:00
Andy Scherzinger	34f303bcc6	Merge pull request #1764 from nextcloud/webloginURL ... Brander: support for custom weblogin urls	2017-11-08 16:30:30 +01:00
tobiasKaminsky	d62524c76f	brander: support for custom weblogin urls	2017-11-08 15:48:10 +01:00
tobiaskaminsky	7251088844	mail on failure	2017-11-08 11:52:48 +01:00
Nextcloud bot	d4b7d264ef	[tx-robot] updated from transifex	2017-11-08 10:11:55 +00:00
Andy Scherzinger	30b650c2ed	Merge pull request #1752 from nextcloud/transifexFastlane ... transifex -> fastlane converter	2017-11-08 09:43:22 +01:00
tobiasKaminsky	1bd344d158	manually increase lint results	2017-11-08 08:23:49 +01:00
tobiasKaminsky	f79152677d	change lint ignore ath	2017-11-08 08:00:57 +01:00
Andy Scherzinger	3867fbb0de	ignore MissingQuantity in values-ka-rGE/strings.xml	2017-11-07 16:52:26 +01:00
tobiaskaminsky	8f73495283	temporary fix to get drone working for merge	2017-11-07 14:47:18 +01:00
tobiaskaminsky	00c1fecf93	satisfy codacy	2017-11-07 14:29:46 +01:00
tobiaskaminsky	98876c6b05	transifex -> fastlane converter	2017-11-07 14:29:45 +01:00
Nextcloud bot	ec0a09616d	[tx-robot] updated from transifex	2017-11-07 01:33:10 +00:00
Nextcloud bot	80a4b22b1c	[tx-robot] updated from transifex	2017-11-06 01:32:49 +00:00
tobiasKaminsky	e686eb6d7b	convert field to local	2017-11-03 09:22:23 +01:00
tobiasKaminsky	a1dffce520	WhatsNew uses fontColor for brander	2017-11-03 09:21:19 +01:00
Nextcloud bot	55593d05c9	[tx-robot] updated from transifex	2017-11-03 01:36:20 +00:00
Nextcloud bot	28f03abfad	[tx-robot] updated from transifex	2017-11-01 01:31:44 +00:00
Nextcloud bot	5d65b62537	[tx-robot] updated from transifex	2017-10-31 01:29:28 +00:00
Andy Scherzinger	b704264f6e	Merge pull request #1725 from nextcloud/narrowQuotaText ... Narrow quota space if no text	2017-10-30 18:31:39 +01:00
tobiaskaminsky	536d6d2b54	narrow quota space if no text	2017-10-30 12:31:50 +01:00
Nextcloud bot	d1cddc1fec	[tx-robot] updated from transifex	2017-10-30 01:29:14 +00:00
Nextcloud bot	732cb5d638	[tx-robot] updated from transifex	2017-10-29 00:29:26 +00:00
Nextcloud bot	e1a39f5fa0	[tx-robot] updated from transifex	2017-10-28 00:29:34 +00:00
tobiaskaminsky	534449247e	if custom_error is empty simply show error page, otherwise show custom error html page	2017-10-27 13:54:26 +02:00
Andy Scherzinger	ed8a51cae2	Merge pull request #1673 from nextcloud/fix-1264 ... Fix #1264	2017-10-27 12:48:42 +02:00
AndyScherzinger	7eecdb3943	remove all obsolete translations of action_clear_finished_uploads	2017-10-27 11:48:25 +02:00
tobiaskaminsky	3b6db07d6b	remove unneeded string	2017-10-27 11:44:54 +02:00