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
|
2914a9883c
|
ChatMessage::createTypingNotification, resized images to 18x18, new
(spinning) notification icon
|
2015-01-18 12:20:13 +01:00 |
|
Ildar Akhmetgaleev
|
575247218d
|
Defining link color in chat area css
Fixes #852. Links now visible with white on black system theme.
Defining with a {...}
|
2015-01-11 22:56:41 +07:00 |
|
Ildar Akhmetgaleev
|
416f1565cc
|
Defining link color in chat area css
Fixes #852. Links now visible with white on black system theme.
|
2015-01-11 10:52:57 +07:00 |
|
krepa098
|
904627e50a
|
moved typing notifications to ChatLog
|
2015-01-10 11:57:46 +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 |
|
krepa098
|
f1f42fc237
|
innerStyle, groupchats
|
2014-12-31 13:42:06 +01:00 |
|
Zetok Zalbavar
|
e5b9e8c59c
|
Make quote colour more readable
|
2014-12-17 15:37:07 +00:00 |
|
dubslow
|
aa55dcae1e
|
fix bug, fix actions to be like irc, and a disabled feature for future
|
2014-10-20 06:34:17 -05:00 |
|
dubslow
|
30e2afcc92
|
add alerts on user mention (could use some tweaking, but is plenty fine for now)
|
2014-10-20 06:05:45 -05:00 |
|
apprb
|
339afafa05
|
magic number removed in FileTransferInstance
|
2014-10-13 16:43:20 +09:00 |
|
krepa098
|
b93343bb99
|
tweak
|
2014-10-04 11:03:50 +02:00 |
|
krepa098
|
2ebc583f29
|
fixed #372
|
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 |
|
dubslow
|
30f3866772
|
restore bold names in chat
|
2014-10-01 23:21:43 -05:00 |
|
krepa098
|
5e328d2404
|
more styling
|
2014-10-01 16:45:10 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
b6ccbfc62f
|
Fix greentext
Thanks to dewbasaur for reporting the bug
|
2014-09-12 22:51:13 +02:00 |
|
krepa098
|
39ba354651
|
use "white-space: nowrap" for div.date
|
2014-09-09 18:09:51 +02:00 |
|
apprb
|
aa2f67c983
|
code cleanup
|
2014-09-07 19:17:47 +07:00 |
|
apprb
|
0a1eaac9a4
|
filetransferinstance should use own pictures
|
2014-09-07 15:04:42 +07:00 |
|
apprb
|
92b2848916
|
rewrite
|
2014-09-07 00:21:47 +07:00 |
|
apprb
|
0fe14953c8
|
somehow working example
|
2014-09-07 00:21:47 +07:00 |
|
apprb
|
25ee6a24d9
|
new chat beginning
|
2014-09-07 00:21:39 +07:00 |
|