118 Commits

Author	SHA1	Message	Date
Shane McKee	03329d8171	Issue #1119 fixed OS X fullscreen bug	2015-03-08 17:33:55 -05:00
agilob	7a6b8ab256	qlabels will not support richtext, plaintext only ... removes support for HTML, QML, JS and CSS in username/status labels this commit closes #1298(bug) #1295(bug) and #1224(feature request)	2015-02-27 14:05:03 +00:00
agilob	842774ecfc	fix tux3/qtox #891	2015-02-23 23:08:07 +00:00
tux3	dbc3a5b137	Merge branch 'pr1255'	2015-02-22 23:42:00 +01:00
TheLastProject	0726d0f7e1	Clicking the yellow button on an incoming call answers	2015-02-22 20:44:05 +01:00
TheLastProject	398746a129	Make call tooltips depend on status, grey out vol and mic settings when not in a call	2015-02-22 20:37:00 +01:00
TheLastProject	48c58322f3	Fix regression showing is typing too often	2015-02-19 20:35:08 +01:00
TheLastProject	3116e84095	Hide is typing status when friend disconnects	2015-02-18 14:02:10 +01:00
krepa098	deb8440c6a	fix issue #1181	2015-02-16 18:13:22 +01:00
Dubslow	73e51865e7	Merge branch 'chatlog_merge_v3' ... Conflicts: src/chatlog/chatlog.h	2015-02-15 05:24:53 -06:00
krepa098	c57cba21ae	fix issue #14	2015-02-15 11:58:02 +01:00
Dubslow	4dcfec0151	Merge branch 'chatlog_merge_v3' ... "unconfirmed" -> "Waiting to send..."	2015-02-15 04:55:25 -06:00
krepa098	205f950073	refactoring & dark-theme awareness	2015-02-15 10:51:54 +01:00
Dubslow	11d4ec2599	Refactor OfflineMsgEngine, fix potential segfault ... (@apprb take note please)	2015-02-13 00:02:52 -06:00
krepa098	f765daf98d	reverse history entries as they are no longer reversed in ... ChatLog::insertChatlineOnTop	2015-02-12 09:12:14 +01:00
Dubslow	0164b53aba	Fix #1129	2015-02-10 22:43:25 -06:00
krepa098	5506379a97	Merge branch 'master' into chatlog_v3_1	2015-02-07 18:49:06 +01:00
apprb	bf2ebe9220	Offline messaging refactoring: Separated class for this purpose + more reliable resenging	2015-02-08 01:59:10 +09:00
Dubslow	e2fd298d68	chat logs -> chat history, miscellaneous rewordings	2015-02-03 13:56:08 -06:00
krepa098	e67db1575d	fixup! Merge branch 'master' into chatlog_v3_1	2015-02-02 14:50:06 +01:00
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	783caf932c	revert to "[user] is typing"	2015-01-31 19:22:45 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	a62b1dc7ac	Merge branch 'pr1045'	2015-01-27 21:33:44 +01:00
agilob	fe8f6593c7	arrow up to paste previous message	2015-01-26 00:25:45 +00:00
agilob	4b854f86d1	fixed memory leaks	2015-01-25 23:06:44 +00:00
agilob	a6680916b5	undo double polishing in chatform	2015-01-25 22:28:29 +00:00
agilob	17561a8c3b	closes tux3/qtox#850	2015-01-25 22:19:25 +00:00
Tux3 / Mlkj / !Lev.uXFMLA	0eba4fefca	Change some signal connections to new style	2015-01-25 21:51:21 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	b10edb9baf	CallConfirmWidget: don't overflow to the right	2015-01-25 17:53:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	40478d6bac	Show call confirm under video if appropriate	2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	32bf56c7d9	Implement new call confirm widget logic ... Works, but does not have any styling at the moment	2015-01-25 17:39:26 +01:00
Dubslow	2d2522626c	Typing notifications disappear automagically ... Fixes #984	2015-01-20 01:27:48 -06:00
Tux3 / Mlkj / !Lev.uXFMLA	ef64a0ef4c	Check that dropped files are readable&non-sequential ... Fixes #934 No, you're not allowed to send /dev/urandom to your friends. Ever.	2015-01-19 00:22:40 +01:00
krepa098	2914a9883c	ChatMessage::createTypingNotification, resized images to 18x18, new ... (spinning) notification icon	2015-01-18 12:20:13 +01:00
krepa098	882d19d311	"%user is typing..." -> "%user ..."	2015-01-18 11:54:08 +01:00
krepa098	85568337e3	cleanup	2015-01-11 12:02:24 +01:00
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
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
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
krepa098	03ea61079b	ChatLine/ChatMessage: use shared_ptr	2015-01-04 13:29:14 +01:00
novist	2a8cbd189d	Added typing notification support and enabled by default	2015-01-04 13:21:56 +02:00
krepa098	8a1ea18ed4	fixed history	2015-01-03 14:08:04 +01:00
apprb	64e0116476	honouring aliases in the loaded history ... Conflicts: src/widget/form/chatform.cpp	2015-01-03 13:10:19 +01:00