641 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Felix	a3212fcc3f	update project setup	2018-09-08 18:05:39 +02:00
Felix	df5482b238	move common module	2018-09-08 18:04:44 +02:00
Felix	388126d665	Merge remote-tracking branch 'touch/develop'	2018-09-08 18:02:11 +02:00
Felix	b46c694028	move common	2018-09-08 17:59:42 +02:00
Felix	8431194319	Merge remote-tracking branch 'common/develop'	2018-09-08 17:58:37 +02:00
Felix	9e9f042df8	match updates in common	2018-09-08 17:58:08 +02:00
Felix	817a1c06dc	add getAllSync() for WatchlistItem	2018-09-08 17:57:39 +02:00
Felix	46ea3c7541	empty commit	2018-09-08 17:55:32 +02:00
Felix	9c9812873c	update saving and updating of events	2018-09-08 17:37:07 +02:00
Felix	7b54c2bb7d	fix base dao, etc	2018-09-08 17:36:41 +02:00
Felix	e2b0887875	WIP	2018-09-07 15:16:33 +02:00
Felix	a26018e19d	add new db-queries	2018-09-07 15:13:49 +02:00
Felix	ada7d708aa	update gitignore	2018-09-07 08:36:16 +02:00
Felix	a5d0bf621d	start integrating common-2.0.0	2018-09-07 08:35:11 +02:00
Felix	c85903757d	start integrating 2.0.0 into touch	2018-09-07 08:34:49 +02:00
Felix	76a2a204a8	undo database-split and other fixes	2018-09-06 19:47:31 +02:00
Felix	c2a83fae2d	remove RxJava and move Downloader from touch-project	2018-09-06 19:08:08 +02:00
Felix	14609cc907	restructure packages and split databases	2018-09-05 23:32:23 +02:00
Felix	40bfdc1470	start common 2.0	2018-09-05 22:59:45 +02:00
Felix	73e9a71f4a	add integration-test for conferences-wrapper	2018-09-05 21:05:32 +02:00
Felix	9cf4d5cee5	add query to get conferences by guid	2018-09-05 21:05:11 +02:00
Felix	73ba84c9f1	catch NumberFormatException for event-urls that end in the guid	2018-09-05 21:04:54 +02:00
Felix	d3cde6aeff	move constants	2018-09-05 21:03:46 +02:00
Felix	6419bce05c	update version	2018-09-05 21:03:32 +02:00
Felix Bürkle	05782340a6	still WIP	2018-08-24 16:56:55 +02:00
Felix	fceddb5a4d	WIP	2018-08-15 08:10:03 +02:00
Felix	59cd212dba	wrap deletion of old events in try-catch	2018-01-09 17:45:48 +01:00
Felix	ebd66b4c4b	bump version	2018-01-09 17:45:48 +01:00
Felix	fd9fb94212	formatting	2018-01-09 17:45:48 +01:00
Felix	27ba9f9e6f	add Share- and open in external player-actions (fixes NiciDieNase/chaosflix#24)	2018-01-09 17:45:36 +01:00
Felix	bbddc038b6	formatting	2018-01-09 17:40:17 +01:00
Felix	40489904ec	add DB-Migrations	2018-01-09 03:11:13 +01:00
Felix	0f2b5dc4d4	update dependency versions	2018-01-09 03:10:23 +01:00
Felix	9653000e10	add play and share icons	2018-01-09 03:09:53 +01:00
Felix	b7f8f3d412	update extended description to handle HTML, fixes NiciDieNase/chaosflix#23	2018-01-09 03:04:33 +01:00
Felix	83f9459986	add migration from 3 to 4	2018-01-09 01:10:02 +01:00
Felix	3115f8aa4c	update versions and release 1.3	2018-01-09 00:25:17 +01:00
Felix	709ea058f7	Merge branch 'develop' into feature/folderselect	2018-01-08 20:27:57 +01:00
Felix	f3a6162a25	merge dev	2018-01-08 20:16:22 +01:00
Felix	23351d44bc	use jitpack for chaosflix-common dependency as suggested in #18	2018-01-08 19:34:40 +01:00
Erik Tews	368c539be2	Merge branch 'master' into sdCardDownload	2018-01-03 04:11:04 +01:00
Erik Tews	0cdd7169ab	Implemented custom preferences for the download directory.	2018-01-03 03:59:10 +01:00
Erik Tews	c5d7ddb6a7	Some fixes so that it compiles without errors.	2018-01-03 03:57:34 +01:00
Felix	bc552aa667	add HD/SD to recording selection	2018-01-03 02:09:18 +01:00
Felix	8ccf57320e	on conference update, delete events that don't exist in backend	2018-01-03 01:45:31 +01:00
Felix	9e12fb238c	add some synchronous queries	2018-01-03 01:44:43 +01:00
Felix	180882203a	add @ignore for room to parcelable-constructor	2018-01-03 01:44:16 +01:00
Felix	f04c85cc10	add some inices	2018-01-03 01:43:27 +01:00
Felix	acf73efa2f	add delete querys for conferences, events and recordings	2018-01-03 01:12:23 +01:00
Felix	ea7dcd71fe	delete all events for a conference before saving new ones, this should fix #22	2018-01-03 00:10:52 +01:00