9605 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andy Scherzinger	fbe50c6b62	fixes after rebase	2017-11-27 16:27:27 +01:00
masensio	722afd6519	Media player stops when its current file is deleted	2017-11-27 16:27:27 +01:00
Tobias Kaminsky	4e013b5bb6	Merge pull request #1333 from nextcloud/textEncoding ... Auto detect encoding for text preview	2017-11-27 16:26:00 +01:00
tobiasKaminsky	c5822827b4	revert timeout to 60s	2017-11-27 14:53:29 +01:00
Tobias Kaminsky	ad71e28094	Merge branch 'master' into textEncoding	2017-11-27 14:29:13 +01:00
Andy Scherzinger	4f85979351	Merge pull request #1799 from nextcloud/contentDescription ... Set missing content description, RTL support & minor type errors	2017-11-27 13:38:36 +01:00
tobiaskaminsky	d1bf8eb24b	satisfy codacy	2017-11-27 13:17:38 +01:00
tobiaskaminsky	b35e2eaa92	auto detect encoding	2017-11-27 13:17:37 +01:00
nextcloud-android-bot	80b8ba9a40	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-11-27 12:09:55 +00:00
Tobias Kaminsky	60209318f5	Merge e547f37b07 into 1dadf9cb62	2017-11-27 12:02:54 +00:00
tobiaskaminsky	e547f37b07	set content description ... minor type errors	2017-11-27 13:02:37 +01:00
Nextcloud bot	1dadf9cb62	[tx-robot] updated from transifex	2017-11-27 12:01:46 +00:00
Tobias Kaminsky	de86ec1595	Merge pull request #1775 from nextcloud/devVersionAsFlavor ... Dev version as flavor	2017-11-27 12:57:34 +01:00
nextcloud-android-bot	a6f07346c8	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-11-27 11:32:02 +00:00
Tobias Kaminsky	ef17e4ee6d	Merge 1cb184377e into 4a2191dc83	2017-11-27 11:17:11 +00:00
tobiasKaminsky	1cb184377e	fix due to rebase	2017-11-27 12:16:50 +01:00
tobiasKaminsky	54dc0efc1b	hide direct download on fdroid, will be manually enabled for apk pushed on download.nextcloud.com	2017-11-27 12:15:56 +01:00
tobiasKaminsky	a9b231e64d	Replace Test with Snackbar	2017-11-27 12:15:55 +01:00
tobiasKaminsky	86340913a8	versionDev as flavor	2017-11-27 12:15:38 +01:00
Tobias Kaminsky	4a2191dc83	Merge pull request #1813 from nextcloud/libraryNoSnapshot ... No snapshot on library	2017-11-27 12:13:03 +01:00
Tobias Kaminsky	e8c66578b3	Update build.gradle	2017-11-27 11:08:51 +01:00
tobiasKaminsky	66e0e835c1	no snapshot on library	2017-11-27 10:40:04 +01:00
Andy Scherzinger	c65b6b1ed9	move back to master-SNAPSHOT for lib to fix build	2017-11-27 08:47:31 +01:00
Nextcloud bot	a5b0e1c2fb	[tx-robot] updated from transifex	2017-11-27 01:34:53 +00:00
Mario Đanić	c52e33ab9d	Merge pull request #1804 from nextcloud/newSorting ... new sorting, adapted to server	2017-11-24 20:47:23 +01:00
Mario Đanić	508374ff47	Merge pull request #1778 from nextcloud/accentColor ... Limit lightness of accent color to 35%	2017-11-24 20:45:39 +01:00
Mario Đanić	ea3637ac0a	Merge pull request #1777 from nextcloud/privacyURLwithPDF ... if privacy url is set to a pdf file, do not open it inline but external	2017-11-24 20:45:24 +01:00
Mario Đanić	2bb6832719	Merge pull request #1768 from nextcloud/fixedServerUrl ... Fixed fixed server url	2017-11-24 20:42:55 +01:00
Mario Đanić	60f597095f	Merge pull request #1767 from nextcloud/drawerBackgroundColor ... Tint background on drawer/user info as fallback	2017-11-24 20:42:37 +01:00
Mario Đanić	0d89d3e02d	Merge pull request #1762 from nextcloud/enhancedTheming ... Use text-color and element-color whenever possible (>=NC13)	2017-11-24 20:42:22 +01:00
Nextcloud bot	77f7d7cbef	[tx-robot] updated from transifex	2017-11-24 01:35:00 +00:00
Nextcloud bot	2e8788bc3e	[tx-robot] updated from transifex	2017-11-23 01:35:40 +00:00
nextcloud-android-bot	b2118da75c	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-11-22 14:27:04 +00:00
Tobias Kaminsky	9e10ea3aa8	Merge c18c0b3c69 into c82dc89239	2017-11-22 14:18:59 +00:00
tobiaskaminsky	c18c0b3c69	new sorting, adapted to server	2017-11-22 15:18:43 +01:00
Tobias Kaminsky	c82dc89239	Update lint-results.txt ... manually increasing lint as there is some hickup and all PRs are failing, but I cannot see which warnings is new.	2017-11-22 14:55:21 +01:00
Tobias Kaminsky	9b687019f2	Update lint-up-wrapper.sh ... fixed wrong lint-up	2017-11-22 14:41:57 +01:00
Tobias Kaminsky	d4be2be2fe	Merge pull request #1755 from nextcloud/updateMasterLint ... Update master.html only on master branch	2017-11-22 13:38:38 +01:00
tobiasKaminsky	bc82c24c31	if lint fails on master branch, name lint file: master-$date	2017-11-22 13:12:19 +01:00
tobiaskaminsky	1ecb3185b8	check if master branch, then always update master.html	2017-11-22 13:12:19 +01:00
Nextcloud bot	5c28391f36	[tx-robot] updated from transifex	2017-11-21 01:34:42 +00:00
Nextcloud bot	0a8a6c42db	[tx-robot] updated from transifex	2017-11-20 01:35:37 +00:00
Nextcloud bot	3e31fe02fe	[tx-robot] updated from transifex	2017-11-19 01:34:54 +00:00
Nextcloud bot	f0844369c0	[tx-robot] updated from transifex	2017-11-18 01:35:57 +00:00
Nextcloud bot	6e7eb8303a	[tx-robot] updated from transifex	2017-11-17 01:35:02 +00:00
Nextcloud bot	2311bc4f3d	[tx-robot] updated from transifex	2017-11-16 01:35:08 +00:00
Andy Scherzinger	c010992610	Merge pull request #1787 from nextcloud/comradekingu-patch-1 ... "ownCloud" → "Nextcloud"	2017-11-15 10:00:00 +01:00
Allan Nordhøy	3610c68b22	"ownCloud" → "Nextcloud"	2017-11-15 08:25:49 +01:00
Nextcloud bot	590a59f86f	[tx-robot] updated from transifex	2017-11-15 01:35:00 +00:00
Andy Scherzinger	0a5b14a980	Merge pull request #1779 from ymage/patch-1 ... Fix SyncedFolders sorting contract	2017-11-14 11:34:48 +01:00