170 Commits

Author	SHA1	Message	Date
apprb	9ace74087a	typos	2014-10-12 18:44:03 +09:00
apprb	02092c9a90	cleanup	2014-10-11 20:52:29 +09:00
apprb	b0ef7e8152	Merge remote-tracking branch 'upstream/master' into history ... Conflicts: qtox.pro	2014-10-11 18:26:47 +09:00
apprb	625cb32b32	History: retrieve history from save	2014-10-11 16:26:52 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	4e9d802d1f	Merge pull request #410 from krepa098/camera ... Improved (self) camera	2014-10-10 21:03:01 +02:00
apprb	6860790205	clear chat area	2014-10-11 01:54:21 +09:00
apprb	2ede886c7d	add insert chatlog capability (not finished)	2014-10-11 01:22:57 +09:00
apprb	7069e2cd74	History: keep unencrypted history	2014-10-09 23:36:35 +09:00
krepa098	88ece1b213	renamed SelfCamView to VideoSurface	2014-10-08 16:44:32 +02:00
krepa098	de1445cdd8	cleanup, split	2014-10-08 16:37:42 +02:00
apprb	5c1e3360fe	privacy setting form added	2014-10-08 23:32:19 +09:00
krepa098	c5f5e4ffa9	volume stubs	2014-10-08 16:25:21 +02:00
agilob	1d31244273	support for hiding in tray ... also new setting, autostart in tray	2014-10-08 15:17:05 +01:00
apprb	beed30b156	history: base working implementation	2014-10-08 22:55:00 +09:00
krepa098	200b7bc395	set/get props, cleanup	2014-10-08 15:48:02 +02:00
krepa098	3e234bd076	progress	2014-10-08 14:25:32 +02:00
krepa098	7f839b473b	camera controls	2014-10-07 16:59:21 +02:00
krepa098	af210d4d98	camera: initial PBO support, mode probing	2014-10-07 14:17:35 +02:00
apprb	f5c6194656	Introduced "Connection Settings" group in GeneralSettings widget	2014-10-07 09:24:52 +07:00
apprb	ddf7a7edfd	added "Use Proxy" checkbox	2014-10-07 09:24:29 +07:00
Tux3 / Mlkj / !Lev.uXFMLA	3de960b2aa	Merge pull request #385 from dubslow/master ... Simplify groupchat names	2014-10-06 20:28:53 +02:00
dubslow	dc73d5658a	add tooltip	2014-10-06 10:04:27 -05:00
dubslow	d093679d03	Add proxy support	2014-10-06 10:04:17 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	a85372a5c0	Merge pull request #381 from apprb/newsettings_v2 ... Newsettings v2	2014-10-06 13:29:44 +02:00
dubslow	9e2195c03c	simplify groupchat names, fix #379, more simplification is possible	2014-10-06 01:46:30 -05:00
apprb	35aeca5dd0	cosmetic fixes	2014-10-06 03:02:12 +09:00
apprb	866f986d04	small fixes	2014-10-06 01:30:31 +09:00
apprb	0c2bf63b1a	add missed files	2014-10-06 01:17:20 +09:00
apprb	8fa9457305	base refactoring	2014-10-06 01:17:01 +09:00
krepa098	51f24115d7	GenericChatForm: use correct fontmetrics	2014-10-05 17:34:34 +02:00
krepa098	23a64ef45f	removed broken custom window decoration	2014-10-04 11:03:50 +02:00
dubslow	cfa39460bf	added sending actions, and tested both ways	2014-10-02 02:00:06 -05:00
dubslow	5f106ab618	add receive actions (no one to test with currently)	2014-10-02 01:01:23 -05:00
krepa098	8db22973e9	fixed merge	2014-10-01 17:03:59 +02:00
krepa098	5e328d2404	more styling	2014-10-01 16:45:10 +02:00
krepa098	04f56cc9ec	unmessification	2014-10-01 16:41:17 +02:00
krepa098	a4cd2d34db	cleanup, applied some of the "Tox User Interface Guidelines"	2014-10-01 16:41:17 +02:00
dubslow	8d9d53b9e9	fix double free	2014-09-30 22:55:07 +02:00
dubslow	6649ae568e	Merge branch 'master' into newsettings ... Conflicts: core.h qtox.pro widget/form/genericchatform.cpp widget/settingsdialog.cpp widget/tool/chataction.cpp widget/widget.cpp widget/widget.h	2014-09-30 04:57:05 -05:00
dubslow	8212a3dad0	Added all current settings except cam test, which segfaults on init...	2014-09-30 04:44:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	c266c317dd	Merge pull request #342 from dubslow/avatarhash ... implement avatar hash caching instead of getting full avatar each time	2014-09-29 20:32:54 +02:00
dubslow	767f164a14	fix file mvs	2014-09-29 13:28:59 -05:00
apprb	904de559e5	FileTransferInstance responce on broken filetransfer state	2014-09-30 00:22:19 +07:00
apprb	a18070d7c5	Wrap name and date fix	2014-09-28 23:39:26 +07:00
Tux3 / Mlkj / !Lev.uXFMLA	63252d2fc0	Fix merge	2014-09-27 20:22:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	1d978f1871	Merge branch 'pr321'	2014-09-27 20:15:01 +02:00
krepa098	de7ade033a	MaskablePixmapWidget: white background, removed circular mask	2014-09-27 16:37:16 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	d684fca868	Fix #322	2014-09-26 21:26:31 +02:00
krepa098	5662aa933f	Added MaskablePixmapWidget, improved avatar rendering	2014-09-26 19:13:08 +02:00
apprb	5e90955e7d	ChatForm: avatar scale	2014-09-26 19:17:27 +07:00