912 Commits

Author	SHA1	Message	Date
Dubslow	2805737b8d	Merge branch 'pr1015' ... also minor re-reword	2015-01-18 19:55:15 -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
Zetok Zalbavar	a23d2acf21	Re-word 'Compact layout' → 'Compact contact list' ... Apparently it can be worded better, to be more self-explanatory for users	2015-01-16 06:36:20 +00:00
Dubslow	33dfb88962	Merge branches 'pr990', 'pr1008', 'pr1009' and 'pr1011'	2015-01-15 01:48:11 -06:00
Dubslow	1ab9bb77e6	Fix OS X bug with overlapping buttons ... Fixes #910	2015-01-15 01:45:42 -06:00
derMart	4540fb09aa	fix resetting AVForm resolution combobox index to get change signal always fired during init	2015-01-14 23:44:38 +01:00
derMart	c018165497	fix missing showEvent in AVForm	2015-01-14 15:27:57 +01:00
derMart	def43706eb	fix incompatibility of MSAA (SampleBuffers) and SingleBuffer mode in VideoSurface	2015-01-14 15:26:02 +01:00
derMart	290f6d4697	refactoring audio device initialization in av setting to prevent opening devices twice	2015-01-12 18:08:25 +01:00
derMart	7d11e9192c	0x0 resolution removed ... better camera initializing in av settings	2015-01-12 18:08:14 +01:00
derMart	e5d736e6c0	fix videosurface flipping buffers	2015-01-12 18:07:58 +01:00
derMart	3a107e33c8	fix utf8 audio device specifier names on windows	2015-01-12 18:07:30 +01:00
Dubslow	d74b95a7b7	Merge branches 'pr920', 'pr1001', 'pr1003' and 'pr1005'	2015-01-12 06:01:50 -06: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
minj	97a78d5c14	add lt.ts	2015-01-10 07:27:31 +02: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
agilob	cbfe94d6a2	closes tux3/qtox#988	2015-01-06 14:36:03 +00:00
krepa098	f7be91c6d0	change previousId on action	2015-01-06 10:05:01 +01:00
Dubslow	139cd3f4a6	Merge branch 'encryption' into master ... Conflicts: src/core.cpp src/misc/settings.cpp src/widget/widget.cpp src/widget/widget.h	2015-01-05 20:55:47 -06: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