1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

2379 Commits

Author SHA1 Message Date
krepa098
b09805f9bf refactoring 2015-01-04 18:21:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
fbc77864aa
Fix some ChatForm debug spam
Don't log an event if it isn't meant for you
2015-01-04 17:59:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
37ea7c359c
Thread safe, encapsulated audio 2015-01-04 17:55:39 +01:00
krepa098
a74b9ce11c ChatLog: Autoscroll while selecting 2015-01-04 15:18:23 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
14ad87069e
Merge branch 'pr979' 2015-01-04 15:18:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
10a2213e66
Merge branch 'pr978' 2015-01-04 15:07:36 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
96fd00d8b6
Merge branch 'pr972'
Fixes #740

validation.
2015-01-04 14:55:06 +01:00
Nokta-strigo
1ec40b74b7 Contacts changing status to offline and having new events are not moved to the bottom of the list. (see issue #740) 2015-01-04 14:54:22 +01:00
krepa098
64024c77a6 Moved the context menu to GenericChatForm 2015-01-04 14:21:05 +01:00
krepa098
f4c6bc3452 cleanup 2015-01-04 13:33:11 +01:00
krepa098
03ea61079b ChatLine/ChatMessage: use shared_ptr 2015-01-04 13:29:14 +01:00
novist
4b05c10308 Fixed text copying from chat windows
Tiny formatting fix (space after if)
2015-01-04 13:23:28 +02:00
novist
2a8cbd189d Added typing notification support and enabled by default 2015-01-04 13:21:56 +02:00
krepa098
ea467152aa filetransferwidget: fixed pause button, ETA, font size, resource usage 2015-01-04 12:04:30 +01:00
zero-one
672cd42065 Merge remote-tracking branch 'upstream/master' into alphabetize 2015-01-04 01:30:11 -08:00
zero-one
7569003e87 Alphabetizes groupchat user list (fixes #701) 2015-01-04 01:26:53 -08:00
Tux3 / Mlkj / !Lev.uXFMLA
d042c2f346
Filter incoming audio, not sent audio 2015-01-04 02:04:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
ab2f70e452
Fix windows builds: Link with filter_audio 2015-01-04 00:42:54 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
78065ec7d7
Update windows build server IP 2015-01-04 00:01:22 +01:00
krepa098
f630583e59 cleanup 2015-01-03 21:20:51 +01:00
krepa098
b3507152eb fixed eliding (ie. invisible nicknames) 2015-01-03 21:19:28 +01:00
krepa098
64f7f7c45e use resolveToxID 2015-01-03 20:38:06 +01:00
krepa098
d04a79a599 ChatLine: cell spacing 2015-01-03 20:37:40 +01:00
krepa098
99a230ccf5 cleanup 2015-01-03 19:06:10 +01:00
krepa098
698fcb70f0 check "use emoticons" 2015-01-03 19:05:38 +01:00
krepa098
a0a56e32a0 fix no visible line case 2015-01-03 15:32:12 +01:00
krepa098
2938702c1e refactoring, fixes 2015-01-03 15:03:33 +01:00
krepa098
8a1ea18ed4 fixed history 2015-01-03 14:08:04 +01:00
krepa098
d7f5068fbf quoting support, toHtmlChars, fixes 2015-01-03 13:52:56 +01:00
krepa098
f3d5b4bb57 fixed anchors 2015-01-03 13:20:53 +01:00
krepa098
d88aa965fa fixup merge 2015-01-03 13:13:12 +01:00
apprb
64e0116476 honouring aliases in the loaded history
Conflicts:
	src/widget/form/chatform.cpp
2015-01-03 13:10:19 +01:00
krepa098
2ee1363be5 don't set cache mode 2015-01-03 10:24:12 +01:00
krepa098
1945bcc1f6 don't use DesignMetrics 2015-01-03 10:24:04 +01:00
krepa098
b76e9a295d disabled group joined/left messages
Conflicts:
	src/widget/widget.cpp
2015-01-03 10:23:50 +01:00
krepa098
40cc14bd44 respect time format 2015-01-03 10:21:50 +01:00
krepa098
2828a97d54 styled chatlog, cleanup 2015-01-03 10:21:15 +01:00
krepa098
96789182cf chatlog: Don't accept drops 2015-01-03 10:21:05 +01:00
krepa098
5ae111e7c4 chatline: set row and col number 2015-01-03 10:20:53 +01:00
krepa098
b0c3b4032f chatlog: save chat log 2015-01-03 10:20:40 +01:00
krepa098
1c653c5f65 filetransferwidget: use CroppingLabel 2015-01-03 10:20:29 +01:00
krepa098
3c9e071a39 chatlinecontentproxy: scaling behaviour 2015-01-03 10:20:05 +01:00
krepa098
4997788b13 fix selection 2015-01-03 10:19:54 +01:00
krepa098
eecd886745 filetransferwidget layout changes 2015-01-03 10:19:41 +01:00
krepa098
a0ea0675a7 Merge branch 'master' into chatlog_v3_1
Conflicts:
	qtox.pro
	res.qrc
	src/misc/smileypack.cpp
	src/widget/chatareawidget.cpp
	src/widget/chatareawidget.h
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/generalform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/systemmessageaction.cpp
	src/widget/widget.cpp
2015-01-03 10:17:53 +01:00
Dubslow
eb6a563f8b
Merge branch 'pr970' 2014-12-31 19:14:09 -06:00
Dubslow
8ef6e5b9d5
Merge branch 'pr969' 2014-12-31 19:13:53 -06:00
Zetok Zalbavar
86c672b8d7
Update INSTALL.md 2014-12-31 12:43:43 +00:00
krepa098
f1f42fc237 innerStyle, groupchats 2014-12-31 13:42:06 +01:00
krepa098
7a4af239b0 Text: toHtmlChars 2014-12-31 09:59:35 +01:00