80 Commits

Author	SHA1	Message	Date
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
krepa098	2828a97d54	styled chatlog, cleanup	2015-01-03 10:21:15 +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
apprb	f8bdaac121	messages splitting fix	2014-12-28 23:32:19 +06:00
krepa098	3190530686	filling the gaps	2014-12-13 21:11:03 +01:00
Zetok Zalbavar	e0993a72f6	Style corrections ... 'if()' → 'if ()' 'for()' → 'for ()'	2014-12-11 18:05:52 +00:00
Sascha Brendel	17bcd969b2	Update chatform.cpp ... Improved that line of code. Thanks to @dubslow	2014-12-08 20:28:34 +01:00
Lednerb	dfb51d7d29	Added Translation for error message on sending a file. Also included the German Version.	2014-12-08 19:07:51 +01:00
agilob	561f5f9895	fixing bug #891	2014-12-04 15:51:01 +00:00
dubslow	bc381a8459	warn on can't read file, fixes #860	2014-11-27 15:00:04 -06:00
Carsten Brandt	b1b1c468e3	adjusted translation messages ... as discusses here: https://github.com/tux3/qTox/pull/848#discussion_r20851990	2014-11-25 21:39:21 +01:00
apprb	465da29a43	minor fixes in ChatAction's creation/processing	2014-11-25 01:58:57 +09:00
apprb	451d0c7999	check incoming data from DB	2014-11-19 22:46:50 +09:00
dubslow	845216fa2f	set aliases from chat form (half of #780)	2014-11-17 20:15:44 -06:00
krepa098	3a567d962e	more work on filetransferwidget	2014-11-17 20:08:55 +01:00
krepa098	27cb075dbb	hooked up filetransferwidget	2014-11-17 16:05:14 +01:00
apprb	8f3e1c2ef3	fix #775	2014-11-17 19:11:51 +09:00
krepa098	1cf9fe3474	filetransferwidget: first steps	2014-11-16 20:01:37 +01:00
apprb	664c762625	using ToxID instead of bare QString + proper alias using during widget creation	2014-11-17 00:17:46 +09:00
krepa098	4ca45fd4f9	progress	2014-11-16 13:13:39 +01:00
krepa098	808f8b1cc5	progress	2014-11-13 18:27:32 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	eac712e68a	Add GUI for audio groupchats	2014-11-13 13:14:27 +01:00
krepa098	3a34678900	progress	2014-11-12 16:45:24 +01:00
apprb	ec2e19e4bb	split message fix	2014-11-12 22:13:46 +09:00
krepa098	de52bad1db	initial commit	2014-11-12 14:11:25 +01:00
apprb	5d50ea36d0	Faux offline messaging: enable/disable	2014-11-10 22:06:35 +09:00
apprb	cee1bcc8d1	faux offline messaging	2014-11-10 20:49:42 +09:00
apprb	a6b95e7b4f	group messages	2014-11-10 20:49:42 +09:00
apprb	44fb8a360e	displaying undelivered messages in chat area	2014-11-10 20:49:42 +09:00
apprb	977649f686	ChatAction refactoring	2014-11-10 20:49:42 +09:00
apprb	f7a855aa20	store delivering status in the DB	2014-11-10 20:49:41 +09:00
dubslow	f2d358f222	switch to relevant chat room when minimized ... fixes #688, except that for me it doesn't actually unminimize	2014-11-10 10:37:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	3d9cc86e30	Show the date for each new day when loading history	2014-11-09 00:08:28 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	a158aed643	Autoload last week of history on startup ... Only if keeping history is enabled, of course	2014-11-08 22:43:33 +01:00
apprb	b316f6e13f	only public key is necessary	2014-11-07 23:56:14 +09:00
apprb	59748886de	struct Friend refactoring	2014-11-07 23:56:14 +09:00
agilob	c702e18ccf	global autoaccept files	2014-11-05 21:59:29 +00:00
agilob	a07c83466c	another unused opration	2014-11-05 12:14:39 +00:00