Dubslow
d16b6cd283
Merge commit '5a005a1aafe96061301a4e113cb5450770009b88' into profiles
...
Conflicts:
core.cpp
widget/form/settingsform.cpp
widget/form/settingsform.h
2014-09-12 13:53:29 -05:00
apprb
6c5cd7c010
filetransfer: corrected pause/resume behaviour
2014-09-12 01:32:31 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
6440ef8310
Make group <unknown> name translatable
2014-09-11 18:05:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a7c75e63a5
Clean code, improve compilation speed
2014-09-11 15:44:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e91846e821
Fix #205
2014-09-11 13:40:44 +02:00
krepa098
b6848772fc
converted notification.wav to notification.pcm (raw audio) fixes #256
2014-09-10 23:21:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
0ae0d01a61
Generalize #275 to groupchats
2014-09-10 23:00:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c76f6a7e73
Fix #275
2014-09-10 22:53:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
960fbfff48
Remove \n when copying own tox ID
2014-09-10 22:27:56 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c564367354
Fix #234
2014-09-10 22:24:01 +02:00
apprb
db68afe8dd
sometimes names are just incredible
2014-09-11 02:28:43 +07:00
apprb
096874d5f4
HTML table chat representation replaced by QTextTable one
2014-09-11 02:28:43 +07:00
apprb
ff9e0bbf93
autoscroll fix
2014-09-11 01:28:05 +07:00
krepa098
c3e55489b0
don't accept RichText as input
2014-09-10 18:52:54 +02:00
krepa098
1b4afcb937
detect URLs and show them as hyperlink
2014-09-10 18:52:54 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5aa5e266b2
Free some RAM when a file transfer ends
2014-09-10 18:46:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7f2edfae7d
Fix #266
2014-09-10 18:30:19 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
737e76c72f
Undo #266 fix
2014-09-10 16:17:44 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
afa794d92a
Fix #266
2014-09-10 15:42:22 +02:00
Dubslow
05c654373f
Fixed misusing tox_load; profiles are significantly less buggy
2014-09-10 08:12:43 -05:00
Dubslow
e477c4ef64
Merge branch 'master' into profiles
2014-09-10 07:01:05 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
3f35a5a48d
Fix #266
2014-09-09 22:36:34 +02:00
krepa098
a39339e06f
cleanup
2014-09-09 18:29:03 +02:00
krepa098
ddf955afd3
fixed #255
2014-09-09 18:28:07 +02:00
apprb
aa2f67c983
code cleanup
2014-09-07 19:17:47 +07:00
apprb
9970fe293d
files renaming
2014-09-07 00:28:26 +07:00
apprb
b68cc66ede
scroll fix
2014-09-07 00:21:47 +07:00
apprb
db4c84a222
cleanup
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
apprb
502229a6f2
cleanup
2014-09-05 23:35:29 +07:00
apprb
2826e83cef
addMessage moved to parent class
2014-09-05 23:03:26 +07:00
apprb
522d570e62
code cleanup
2014-09-05 23:03:26 +07:00
apprb
02da6803f1
initial merging common parts of chatforms' widget
2014-09-05 23:03:08 +07:00
Dubslow
7aab85251e
Merge branch 'master' into profiles
...
Holy shit first big merge of my career, I'm mildly amazed it even compiles
Conflicts:
core.cpp
widget/form/settingsform.cpp
widget/form/settingsform.h
widget/widget.cpp
2014-09-05 03:53:00 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
627f58087c
Disable status button when disconnected
2014-09-03 00:01:04 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
bedc995659
Merge pull request #248 from apprb/chat_widget
...
FriendWidget and GroupWidget improvements
2014-09-01 21:24:30 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
3c8f39c2ca
Merge pull request #244 from apprb/dev
...
fix #243 : Smileys are broken
2014-09-01 19:48:12 +02:00
apprb
e76464a320
further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer
2014-09-01 23:58:01 +07:00
apprb
35b7ad3a58
Chatroom: common parts moved to the parent class
2014-09-01 23:57:51 +07:00
apprb
24971f50e9
fix #243 : Smileys are broken
2014-09-01 18:55:07 +07:00
krepa098
7e6c4f5129
cleanup
2014-09-01 12:27:41 +02:00
krepa098
1cd954ba42
compatibility with old widgets
2014-09-01 11:16:41 +02:00
krepa098
26c028f416
removed ClickableLabel, EditableLabelWidget, ElideLabel, EscLineEdit,
...
CopyableElideLabel
2014-09-01 11:08:02 +02:00
krepa098
7c0cdd710f
editable CroppingLabel
2014-09-01 11:00:06 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c54cfd6ff3
Reduce precision of human readable, now more readable!
2014-08-31 23:07:07 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
73309d8b90
Fix #235 , Fix #84
2014-08-31 22:26:45 +02:00
apprb
fd4c47cba3
Widget code cleanup: removed isFriendWidgetActive and isGroupWidgetActive
2014-08-31 23:49:15 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
76971f5238
Make notifications consistent
...
Notify of AV and FT requests if we're selected but not active or minimised, and add sound (consistent with how message notifications work)
2014-08-31 18:30:04 +02:00
apprb
f0c8be43db
change status light on incoming file request
2014-08-31 22:02:08 +07:00