14 commits

Author	SHA1	Message	Date
DeepBlueV7.X	c44513614f	Merge branch 'master' into fix-call-bar	2020-11-25 22:01:19 +01:00
trilene	491ca1592a	Fix ActiveCallBar	2020-11-25 15:54:54 -05:00
Nicolas Werner	29625ae253	Fix some issues with completer	2020-11-25 19:05:12 +01:00
Nicolas Werner	a31d3d0816	Add file uploading	2020-11-25 19:05:12 +01:00
DeepBlueV7.X	3ec8a291b6	Merge pull request #327 from kamathmanu/qtBackwardsCompatability ... Make compatible with qt 5.12	2020-11-15 17:07:05 +01:00
kamathmanu	eb72fd2cf9	Make compatible with qt 5.12	2020-11-14 16:38:17 -05:00
trilene	d391404b79	Video calls: add local webcam view	2020-11-09 10:51:17 -05:00
trilene	d9ca5309ac	Merge remote-tracking branch 'upstream/master' into webrtc-video	2020-10-27 15:29:53 -04:00
trilene	d1f3a3ef40	Support video calls	2020-10-27 13:14:06 -04:00
Nicolas Werner	3d64df41da	Split up TimelineView into separate components	2020-10-26 21:34:34 +01:00
Nicolas Werner	1a029112d9	Lint qml with qml-format	2020-10-08 21:11:21 +02:00
Nicolas Werner	99ba1f17d3	Merge remote-tracking branch 'origin/master' into cross-signing	2020-10-08 16:57:03 +02:00
trilene	e57199412a	Allow button colors override	2020-09-25 12:09:22 -04:00
trilene	3f73853e4b	Move ActiveCallBar Qml to separate file	2020-09-25 10:26:36 -04:00