apprb
|
6caa9f1e9f
|
Merge remote-tracking branch 'upstream/master' into history
Conflicts:
qtox.pro
src/widget/form/chatform.cpp
src/widget/form/genericchatform.cpp
src/widget/form/genericchatform.h
src/widget/form/settings/identityform.cpp
src/widget/tool/chatactions/messageaction.cpp
src/widget/tool/chatactions/messageaction.h
src/widget/widget.cpp
|
2014-10-22 23:05:04 +09: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 |
|
dubslow
|
41365ce057
|
Merge branch 'master' into history
Conflicts:
src/widget/form/genericchatform.h
src/widget/widget.cpp
|
2014-10-17 03:56:59 -05:00 |
|
krepa098
|
2913326fb2
|
fix #416, cleanup
|
2014-10-17 09:09:59 +02:00 |
|
agilob
|
8788931f36
|
number of messages is more reliable then activities
|
2014-10-16 17:47:19 +02:00 |
|
apprb
|
14a71a0f3f
|
precise timestamps keeping
|
2014-10-14 14:49:27 +09:00 |
|
apprb
|
fc9f8a16f3
|
Merge branch 'master' into history
Conflicts:
qtox.pro
src/widget/form/chatform.cpp
src/widget/form/settings/privacyform.cpp
|
2014-10-12 19:24:05 +09:00 |
|
dubslow
|
3ba95d82ae
|
Move code into src/
|
2014-10-07 23:26:25 -05:00 |
|