2361 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dubslow	864d1297e7	More descriptive dialog text	2015-02-03 18:22:05 -06:00
krepa098	7321127794	set the correct wrap mode	2015-02-03 22:06:31 +01:00
Dubslow	e2fd298d68	chat logs -> chat history, miscellaneous rewordings	2015-02-03 13:56:08 -06:00
krepa098	bc21af4fa2	ChatLog: don't start the resize worker if the width doesn't change	2015-02-03 17:28:42 +01:00
Dubslow	a572ccff27	Merge branch 'encryption' into master ... Conflicts: src/core.cpp src/historykeeper.h	2015-02-03 10:21:59 -06:00
krepa098	e4c52e6118	use QPainter::setClipRect	2015-02-03 16:17:37 +01:00
krepa098	0af05929f7	fixup! Merge branch 'master' into chatlog_v3_1	2015-02-03 16:15:51 +01:00
novist	b7dd4bf829	Tray icon notification of new messages	2015-02-03 12:20:26 +02:00
krepa098	5c01f1585b	change color for precise selection on focus-in/out	2015-02-03 10:33:46 +01:00
Dubslow	9c1cbb7a4d	Reword opening password dialog per srkunze's suggestion	2015-02-02 21:31:56 -06:00
Dubslow	625eb3cf5b	Code cleanup	2015-02-02 21:28:20 -06:00
Dubslow	8d999efae7	Fix the previous todo	2015-02-02 17:56:51 -06:00
Dubslow	ca5e9c324d	When enabling history encryption, check for and use previously-ignored encrypted history ... Should close dubslow/qTox#5 and close dubslow/qTox#6 Note that the GUI isn't updated with the ignored history, that's a TODO	2015-02-02 17:19:43 -06:00
krepa098	8d7a32f4ec	selection rect: change color on focus-in/out, action cleanup	2015-02-02 18:11:29 +01:00
krepa098	39b2771b8d	tweaked ChatLog::getSelectedText	2015-02-02 15:05:27 +01:00
krepa098	e67db1575d	fixup! Merge branch 'master' into chatlog_v3_1	2015-02-02 14:50:06 +01:00
krepa098	52f220c9e4	Merge branch 'master' into chatlog_v3_1 ... Conflicts: qtox.pro res.qrc src/widget/form/chatform.cpp src/widget/form/chatform.h src/widget/form/genericchatform.cpp src/widget/tool/chatactions/chataction.h src/widget/tool/chatactions/messageaction.cpp src/widget/widget.cpp ui/chatArea/innerStyle.css	2015-02-02 14:31:44 +01:00
krepa098	53ba982203	optimizations and tweaks	2015-02-02 11:11:09 +01:00
novist	6c477a0a19	Use svg for taskbar/tray icons	2015-02-02 08:07:36 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	5bd3cd041d	Windows installer: Fix x64 install path ... Program Files instead of Program Files (x86)	2015-02-01 22:30:13 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	aa3134c09f	Merge branch 'pr1082'	2015-02-01 17:33:16 +01:00
Christoffer Sterner	aee04c92e4	Playback audio slider support non-group call	2015-02-01 17:18:45 +01:00
Christoffer Sterner	866c38e7df	Add support for playback audio slider setting	2015-02-01 16:58:59 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	58b3e66c6b	Merge branch 'pr1081'	2015-02-01 15:59:19 +01:00
Zetok Zalbavar	32370128df	Update Polish translation	2015-02-01 14:24:02 +00:00
Tux3 / Mlkj / !Lev.uXFMLA	a2ef070f73	Merge branch 'pr1079'	2015-02-01 13:16:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	2f8d512a2f	Merge branch 'pr1078'	2015-02-01 13:14:32 +01:00
Zetok Zalbavar	c2eaa3cdb4	Some tweaks for tooltips in settings	2015-02-01 10:56:28 +00:00
Ansa89	81155da0e6	Italian translation: update	2015-02-01 11:28:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	d6b34aef78	Update for toxcore API break	2015-02-01 01:25:22 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	4d5b924d0d	Merge branch 'pr1077'	2015-02-01 00:57:08 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	c1f41cd7ec	Merge branch 'pr1070-rebase'	2015-02-01 00:52:59 +01:00
Sascha Brendel	f43f09e568	Updated German translation ... Conflicts: translations/de.ts	2015-02-01 00:51:11 +01:00
Christoffer Sterner	627768b83a	Added sudo to yum install	2015-02-01 00:29:19 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	efef2b2178	Merge branch 'pr1073'	2015-02-01 00:09:20 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	8ccd3bb3bf	Fix spurious quitting when dialog closed and in tray	2015-02-01 00:03:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	dc36bf379f	Merge branch 'pr1076'	2015-01-31 23:06:06 +01:00
Christoffer Sterner	0290aea47b	Fix keypad enter not sending message ... Issue #1068	2015-01-31 22:54:52 +01:00
krepa098	783caf932c	revert to "[user] is typing"	2015-01-31 19:22:45 +01:00
krepa098	f15b9da1e1	fix a render artifact	2015-01-31 19:19:13 +01:00
krepa098	f288fe5c1e	tweaks	2015-01-31 18:37:20 +01:00
krepa098	740d62ec49	change ChatLine::isVisible to false, rename Text::isVisible to ... Text::keepInMemory	2015-01-31 18:12:51 +01:00
krepa098	2206db1406	comparators should be public	2015-01-31 17:50:35 +01:00
krepa098	1d6f3858d9	renamed ChatLine::boundingSceneRect to ChatLine::sceneBoundingRect	2015-01-31 17:49:19 +01:00
krepa098	6a50add547	ChatLineContent: removed boundingSceneRect()	2015-01-31 17:46:25 +01:00
krepa098	5668606159	Speed-up rendering	2015-01-31 17:39:25 +01:00
krepa098	7ec54c972c	set ChatLine::isVisible to true	2015-01-31 17:32:41 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	c745bc4513	Merge branch 'pr1070'	2015-01-31 11:51:49 +01:00
Zetok Zalbavar	13bd334d78	Add tooltips in settings ... some tooltips changed to be more helpful/reflect reality	2015-01-31 09:53:12 +00:00
Ansa89	58eb8d3ec1	Italian traslation: update	2015-01-31 09:54:57 +01:00