8570 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Kaminsky	ebccea21f7	Merge branch 'master' into untrustedCerts	2017-08-18 09:05:26 +02:00
Tobias Kaminsky	bad6f34829	Merge pull request #1356 from nextcloud/deleteCookiesException ... CookieManager.getInstance() can throw an Exception without saying so	2017-08-18 09:04:37 +02:00
Tobias Kaminsky	371a09c572	Merge branch 'master' into mediaFolderNPE	2017-08-18 09:04:14 +02:00
Tobias Kaminsky	312208462b	Merge pull request #1352 from nextcloud/userInfoCrash ... Check if background string is empty	2017-08-18 09:02:56 +02:00
Tobias Kaminsky	6826f9dda3	Merge pull request #1348 from nextcloud/activitiesThumbnails ... Use ocs api header for thumbnails	2017-08-18 09:02:38 +02:00
Tobias Kaminsky	09de435ebc	Merge pull request #1342 from nextcloud/errorDuringDbUpgrade ... Check if columns exists prior adding them	2017-08-18 09:02:17 +02:00
Tobias Kaminsky	6cc81e2ea7	Merge pull request #1367 from nextcloud/validFilePath ... Check if valid path	2017-08-18 08:58:04 +02:00
Tobias Kaminsky	c670bc13bb	Merge branch 'master' into removeGCMagain	2017-08-18 08:52:45 +02:00
tobiaskaminsky	b0738fff2c	use gcm on gplay, modified as dependency	2017-08-18 08:08:50 +02:00
Tobias Kaminsky	14fcf2f133	Update lint-results.txt	2017-08-18 08:06:41 +02:00
nextcloud-android-bot	423f42738b	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-18 05:42:39 +00:00
Nextcloud bot	a4e6076261	[tx-robot] updated from transifex	2017-08-18 05:40:46 +00:00
Tobias Kaminsky	f7034e2f8a	Merge pull request #980 from nextcloud/changelog ... Start working on 2.0.0 changelog	2017-08-18 07:38:59 +02:00
Tobias Kaminsky	ab961ca8e9	Merge ce12e6e398 into ea3f8d07db	2017-08-18 05:32:40 +00:00
tobiaskaminsky	ce12e6e398	check if valid path	2017-08-18 07:31:48 +02:00
Nextcloud bot	ea3f8d07db	[tx-robot] updated from transifex	2017-08-18 00:28:33 +00:00
AndyScherzinger	4d4e7a5606	fix lint for the merge (will be removed by transifex afterwards)	2017-08-17 15:24:26 +02:00
tobiaskaminsky	a4350b9ff2	add slides	2017-08-17 15:00:15 +02:00
tobiaskaminsky	9e7a4cb594	add whats new screen for version 1.5	2017-08-17 15:00:14 +02:00
tobiaskaminsky	e499e393e4	- using versionCode instead of string ... - changed branch that it is mergeable into master for translation	2017-08-17 15:00:14 +02:00
tobiaskaminsky	7f7fd3ae6a	wording	2017-08-17 15:00:14 +02:00
tobiaskaminsky	ae4ef70e36	add slides	2017-08-17 15:00:13 +02:00
tobiasKaminsky	71e16238e5	center title	2017-08-17 15:00:13 +02:00
tobiaskaminsky	b95aeeb51c	add whats new screen for version 1.5	2017-08-17 15:00:13 +02:00
nextcloud-android-bot	4f2184d93a	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-17 15:00:12 +02:00
AndyScherzinger	8eea18803d	set version to 2.0.0RC3	2017-08-17 15:00:12 +02:00
AndyScherzinger	73b0ca3bd6	set final/stable release version to 2.0.0	2017-08-17 15:00:11 +02:00
AndyScherzinger	f9dbe7d0d3	theming support added to 1.5.0	2017-08-17 15:00:11 +02:00
AndyScherzinger	34d19db0bf	further changes for 1.5.0 added	2017-08-17 15:00:11 +02:00
Mario Danic	bbb8d79c3c	Start working on 1.5.0 changelog ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-17 15:00:08 +02:00
nextcloud-android-bot	8d00c1dfc9	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-17 12:36:39 +00:00
Tobias Kaminsky	61f82437f3	Merge ec568b7483 into 31547ccb14	2017-08-17 12:28:41 +00:00
tobiaskaminsky	ec568b7483	handle foreign broadcast	2017-08-17 14:25:24 +02:00
nextcloud-android-bot	0547a8c428	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-17 09:34:55 +00:00
Tobias Kaminsky	2551c62813	Merge fe6a549532 into 31547ccb14	2017-08-17 09:16:03 +00:00
tobiaskaminsky	fe6a549532	fix rare case: ssl cert is ok for checkServer, but not for webview -> show untrustedDialog	2017-08-17 11:13:02 +02:00
nextcloud-android-bot	c03e955c11	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-17 07:52:34 +00:00
Tobias Kaminsky	553f15adad	Merge 5cead89381 into 31547ccb14	2017-08-17 07:29:56 +00:00
AndyScherzinger	5cead89381	hardening of video retrieval according to image hardening	2017-08-17 09:29:36 +02:00
tobiaskaminsky	caf9242e10	prevent NPE on absolutePath	2017-08-17 09:29:36 +02:00
nextcloud-android-bot	3b76cb55cb	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-17 06:58:57 +00:00
Tobias Kaminsky	0cd4492f11	Merge faf4d80fce into 31547ccb14	2017-08-17 06:50:21 +00:00
tobiaskaminsky	faf4d80fce	remove gcm again	2017-08-17 08:48:35 +02:00
Nextcloud bot	31547ccb14	[tx-robot] updated from transifex	2017-08-17 00:28:02 +00:00
tobiaskaminsky	2af14be41b	appearantly CookieManager.getInstance() can throw an Exception without saying so...	2017-08-16 16:30:00 +02:00
tobiaskaminsky	8a21a1ad21	re-add user theming columns if they do not exist yet	2017-08-16 16:00:02 +02:00
tobiaskaminsky	a44475d15f	check if background string is empty	2017-08-16 11:09:00 +02:00
tobiaskaminsky	0454ab14f3	use ocs api header	2017-08-16 10:50:16 +02:00
Tobias Kaminsky	e77962d1bb	Update lint-results.txt ... manually change lint results as somehow warnings increased	2017-08-16 07:33:34 +02:00
Nextcloud bot	0e763b9397	[tx-robot] updated from transifex	2017-08-16 00:28:16 +00:00