krepa098
|
f574a43581
|
FileTransferWidget: fixed autoaccept
|
2015-01-11 11:57:33 +01:00 |
|
krepa098
|
904627e50a
|
moved typing notifications to ChatLog
|
2015-01-10 11:57:46 +01:00 |
|
krepa098
|
d9e15fb0ba
|
Merge branch 'master' into chatlog_v3_1
Conflicts:
src/widget/chatareawidget.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
|
2015-01-09 19:41:16 +01:00 |
|
Bruno Kühnen Meneguello
|
2e38a1fdb8
|
Add Portuguese translation
|
2015-01-08 10:28:53 -02:00 |
|
krepa098
|
0f52bf3f5c
|
moved history loading to FriendWidget::setAsActiveChatroom()
|
2015-01-07 13:16:09 +01:00 |
|
krepa098
|
f7be91c6d0
|
change previousId on action
|
2015-01-06 10:05:01 +01:00 |
|
apprb
|
017c59bd82
|
more userfriendly history load dialog
|
2015-01-05 20:37:10 +06:00 |
|
krepa098
|
5399b40874
|
history: fixed regression
|
2015-01-05 14:05:01 +01:00 |
|
krepa098
|
77fe3f7256
|
ChatLog::insertChatlineOnTop: overload taking a list
|
2015-01-05 10:51:01 +01:00 |
|
krepa098
|
c7fe34c077
|
history: require markAsSent
|
2015-01-05 10:02:41 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
8813d6e4ca
|
Fix #909
|
2015-01-05 09:54:03 +01:00 |
|
Zetok Zalbavar
|
d36c471f4f
|
Some wording improvements
|
2015-01-04 20:25:37 +00:00 |
|
krepa098
|
27e967b67e
|
cleanup
|
2015-01-04 19:58:14 +01:00 |
|
krepa098
|
6711fd6ee4
|
history fixes
|
2015-01-04 19:29:06 +01:00 |
|
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
|
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 |
|
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
|
64f7f7c45e
|
use resolveToxID
|
2015-01-03 20:38:06 +01:00 |
|
krepa098
|
8a1ea18ed4
|
fixed history
|
2015-01-03 14:08:04 +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
|
b76e9a295d
|
disabled group joined/left messages
Conflicts:
src/widget/widget.cpp
|
2015-01-03 10:23:50 +01:00 |
|
krepa098
|
2828a97d54
|
styled chatlog, cleanup
|
2015-01-03 10:21:15 +01:00 |
|
krepa098
|
b0c3b4032f
|
chatlog: save chat log
|
2015-01-03 10:20:40 +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 |
|
Dubslow
|
f7bef8d5c3
|
Merge branch 'pr966'
|
2014-12-31 00:55:59 -06:00 |
|
Dubslow
|
75331af311
|
Merge branch 'pr965'
|
2014-12-31 00:50:03 -06:00 |
|
apprb
|
1194df2f78
|
renaming: Direct Connect -> None
|
2014-12-30 22:02:26 +06:00 |
|
apprb
|
f8bdaac121
|
messages splitting fix
|
2014-12-28 23:32:19 +06:00 |
|
apprb
|
a14da15d79
|
fix #963
|
2014-12-28 18:32:25 +06:00 |
|
novist
|
30d9862c4f
|
Removed explanations from tray menu
|
2014-12-18 20:32:28 +02:00 |
|
Dubslow
|
54e8be75d2
|
Merge branch 'pr938'
|
2014-12-17 14:43:34 -06:00 |
|
agilob
|
5861c6daa5
|
removing fixed size from mic/volume buttons so they align nicely
|
2014-12-17 12:36:34 +01:00 |
|
agilob
|
f8d870f374
|
removing spacing from microphone layout
|
2014-12-17 12:00:41 +01:00 |
|
Dubslow
|
fc749880eb
|
minor style tweaks
|
2014-12-16 18:05:13 -06:00 |
|
Maximilian Wuttke
|
e0cb122abe
|
Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio
Added some `#ifdef QTOX_FILTER_AUDIO`s.
Conflicts:
qtox.pro
Conflicts:
src/coreav.cpp
|
2014-12-14 10:55:38 +01:00 |
|
krepa098
|
3190530686
|
filling the gaps
|
2014-12-13 21:11:03 +01:00 |
|
Dubslow
|
84dea5e12c
|
Revert "fix #902"
@apprb #932
This reverts commit 13306031e2 .
|
2014-12-13 12:18:43 -06:00 |
|
Dubslow
|
a8b1f60256
|
Merge branch 'pr923'
|
2014-12-12 18:40:24 -06:00 |
|
Dubslow
|
cc4cc7d7a8
|
Merge branch 'pr922'
|
2014-12-12 18:37:06 -06:00 |
|
novist
|
e2bf37c139
|
Light tray icon option
|
2014-12-12 12:12:12 +02:00 |
|
Zetok Zalbavar
|
e0993a72f6
|
Style corrections
'if()' → 'if ()'
'for()' → 'for ()'
|
2014-12-11 18:05:52 +00:00 |
|