9307 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nextcloud bot	8a8e8428e2	[tx-robot] updated from transifex	2017-12-06 01:38:40 +00:00
tobiaskaminsky	941bb063d9	bugfix	2017-12-05 14:14:42 +01:00
Tobias Kaminsky	44fdff8c4c	Update CONTRIBUTING.md ... no dev version, built from master	2017-12-05 12:11:33 +01:00
Andy Scherzinger	f4a481140f	Merge pull request #1675 from nextcloud/update-android-job-again ... Update Android job	2017-12-05 11:42:05 +01:00
Tobias Kaminsky	d41a9bec8d	Merge branch 'master' into update-android-job-again	2017-12-05 11:19:19 +01:00
Nextcloud bot	445b3a1c2b	[tx-robot] updated from transifex	2017-12-05 01:38:28 +00:00
nextcloud-android-bot	573c11d7bb	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-12-04 18:13:46 +00:00
Mario Đanić	6dd47b2dc5	Merge 7159838b41 into bffa619b28	2017-12-04 18:08:59 +00:00
AndyScherzinger	7159838b41	fix lint warnings	2017-12-04 19:08:11 +01:00
AndyScherzinger	7aaf4954bc	Update android gradle to 3.0.1	2017-12-04 19:08:10 +01:00
AndyScherzinger	f08675382a	Fix Imports from UploadUtils to PowerUtils	2017-12-04 19:08:10 +01:00
Mario Danic	ba7ee747d3	NPE fix ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:10 +01:00
Mario Danic	2d5d8cc1ca	Fixes ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:09 +01:00
Mario Danic	803bf2194e	Oh well ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:09 +01:00
Mario Danic	61cbe88bd0	Fix the way we schedule stuff ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:09 +01:00
Mario Danic	8253595b8a	Fix stuff ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:08 +01:00
Mario Danic	d12af2a342	Update Android job ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-12-04 19:08:00 +01:00
Andy Scherzinger	bffa619b28	Merge pull request #1820 from nextcloud/sql ... Prevent sql injections	2017-12-04 09:19:24 +01:00
Tobias Kaminsky	4f9c397ea4	daily dev 20171204	2017-12-04 09:09:06 +01:00
Tobias Kaminsky	6cdf0e1ba4	Update buildDev ... do not push twice	2017-12-04 08:54:12 +01:00
Tobias Kaminsky	88aef982d7	daily dev 20171204	2017-12-04 08:30:44 +01:00
Tobias Kaminsky	b755ad518b	Update buildDev ... only push build.gradle with updated devVersion number/code	2017-12-04 08:26:20 +01:00
Nextcloud bot	2c13fcb949	[tx-robot] updated from transifex	2017-12-04 01:37:54 +00:00
Nextcloud bot	b383aed42f	[tx-robot] updated from transifex	2017-12-03 01:38:26 +00:00
tobiaskaminsky	c3ff1ccebd	minor formatting	2017-12-02 11:41:17 +01:00
tobiaskaminsky	cfef0c9c90	use displayname for sharing, fallback to userid	2017-12-02 11:41:17 +01:00
Nextcloud bot	46020e8bfb	[tx-robot] updated from transifex	2017-12-02 01:38:27 +00:00
tobiaskaminsky	89f9b34885	remove unused translations	2017-12-01 11:40:56 +01:00
Nextcloud bot	8661a5d3ce	[tx-robot] updated from transifex	2017-12-01 01:38:02 +00:00
Nextcloud bot	6bf42a7481	[tx-robot] updated from transifex	2017-11-30 01:40:00 +00:00
tobiaskaminsky	0dc2633613	Prevent sql injections	2017-11-29 15:28:21 +01:00
Nextcloud bot	2eda05eeb4	[tx-robot] updated from transifex	2017-11-29 01:36:10 +00:00
Tobias Kaminsky	720947f78b	Merge pull request #1795 from nextcloud/externalLinksCrash ... Prevent crash when updating external links	2017-11-28 16:22:48 +01:00
tobiaskaminsky	8d4421b8d6	prevent crash when updating external links	2017-11-28 14:49:13 +01:00
Mario Danic	fd66cdc370	Fix image preview ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-11-28 14:46:21 +01:00
Mario Danic	8593b10c6d	Fix syncing ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-11-28 14:46:21 +01:00
Andy Scherzinger	173fa8b384	Merge pull request #1793 from nextcloud/offlineVideoThumbnail ... Generate video thumbnail for downloaded files	2017-11-28 14:13:27 +01:00
nextcloud-android-bot	b7d9f2de09	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-11-28 10:34:35 +01:00
tobiaskaminsky	2e572e34ec	generate video thumbnail for downloaded files	2017-11-28 10:34:35 +01:00
Tobias Kaminsky	e1966a0095	Merge pull request #1801 from nextcloud/copyMoveOverflowMenu ... Hide item options (share, overflow menu) & overflow items in move/copy dialog	2017-11-28 09:12:34 +01:00
nextcloud-android-bot	38fd3688c3	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-11-28 09:01:38 +01:00
tobiaskaminsky	f3be3ca91c	move order	2017-11-28 09:01:38 +01:00
tobiaskaminsky	4bf1b65f41	hide item options (share, overflow menu) in move/copy dialog	2017-11-28 09:01:38 +01:00
Nextcloud bot	ce1449a375	[tx-robot] updated from transifex	2017-11-28 01:35:32 +00:00
Tobias Kaminsky	9db47fe559	Merge pull request #1816 from nextcloud/devVersionNoPush ... Update buildDev	2017-11-27 17:12:30 +01:00
Tobias Kaminsky	fa217303e7	Update buildDev ... do not push anything to master except tags.	2017-11-27 17:11:58 +01:00
Tobias Kaminsky	63251d6009	Merge pull request #1114 from nextcloud/fix_bug_stop_player_when_delete_file ... Fix bug stop player when delete file	2017-11-27 16:46:49 +01:00
AndyScherzinger	b8f2756ad3	fix after rebase	2017-11-27 16:27:27 +01:00
AndyScherzinger	375a403d55	fix codacy warnings	2017-11-27 16:27:27 +01:00
Andy Scherzinger	edc9c5bdd4	fixes after rebase	2017-11-27 16:27:27 +01:00