17 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerben Droogers	f83a23771f	When sync delay and timeout are not set use default	2017-12-09 22:41:07 +01:00
Gerben Droogers	eb6224ed63	Set the default sync delay and timout in config	2017-12-09 22:39:44 +01:00
Gerben Droogers	50b0a1565f	Merge branch 'master' of https://github.com/tijder/SmsMatrix	2017-12-09 22:24:14 +01:00
Gerben Droogers	9099d8f0df	Dont create a new room for a incomming call	2017-12-09 22:23:42 +01:00
Gerben Droogers	269061fe43	updated android studio	2017-12-09 22:18:33 +01:00
Gerben Droogers	2bbabc9ce4	Dynamic long polling intervals #11	2017-10-12 23:36:26 +02:00
Gerben Droogers	c89ce40c4f	Ask permissions in the app but not all at the same time #6	2017-10-12 22:50:09 +02:00
Gerben Droogers	c7d2a14801	Add Android call events as notice in the contact room #10	2017-10-12 22:16:03 +02:00
Gerben Droogers	3f8141c2dc	Fix bug with HS url different then HS name	2017-10-12 20:07:20 +02:00
Gerben Droogers	bacd9e10da	Read contact name #2	2017-10-12 16:27:11 +02:00
Gerben Droogers	55949e9097	Merge branch 'master' of https://github.com/tijder/SmsMatrix	2017-10-12 11:05:23 +02:00
Gerben Droogers	c37b63ca64	added .idea files	2017-10-12 11:04:29 +02:00
tijder	4b52a3028e	Merge pull request #5 from erdnaxeli/msgType ... Set message type to m.text	2017-10-12 10:58:48 +02:00
Alexandre Morignot	69029d44de	Set message type to m.text	2017-10-12 10:11:29 +02:00
Gerben Droogers	db893c9d35	Update README.md	2017-10-11 00:01:05 +02:00
tijder	d9076b40c8	Create README.md	2017-10-10 23:44:18 +02:00
Gerben Droogers	3bf00e3ed3	First commit	2017-10-10 23:26:41 +02:00