1191 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tux3 / Mlkj / !Lev.uXFMLA	44193da2bc	Merge branch 'pr467'	2014-10-18 11:59:03 +02:00
Zetok Zalbavar	c0c161ede6	Update Polish translation	2014-10-18 10:54:54 +01:00
agilob	65780941ce	version in debug message based on git HEAD	2014-10-18 08:47:42 +01:00
dubslow	e2b4d7280d	tweak speed shown back to recent speed, keep eta avg speed	2014-10-17 23:54:02 -05:00
dubslow	6e15bcb8d8	actually auto accept	2014-10-17 23:53:29 -05:00
dubslow	43ac1dfd0d	add ui for auto accept; fixes #182 and #280	2014-10-17 22:59:59 -05:00
dubslow	3dbbbca587	add backend for autoaccept	2014-10-17 22:30:04 -05:00
dubslow	e10e0087a4	added auto accept settings	2014-10-17 22:02:13 -05:00
dubslow	2d3cb18f58	fix #351 (again)	2014-10-17 21:15:54 -05:00
dubslow	ee0f94a890	fix #461, cleanup	2014-10-17 20:15:26 -05:00
dubslow	4e7a183360	add choose translations (restart required, dynamic changing is lots of work)	2014-10-17 18:06:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	26eb08aa00	Merge branch 'pr452'	2014-10-17 21:00:24 +02:00
krepa098	e7603c724c	Merge pull request #1 from zetok/rm-bloat ... Remove redundancy from settings tabs	2014-10-17 20:28:07 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	54fc9c9601	Merge branch 'pr455'	2014-10-17 19:10:55 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	6d8bdad05b	Merge branch 'pr454'	2014-10-17 19:09:55 +02:00
agilob	2da513e66f	updated all translation files	2014-10-17 18:07:05 +01:00
agilob	2cbae5265b	max value in autoAway time, tooltip for spinbox	2014-10-17 17:57:02 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	be6b693c5c	Merge branch 'pr453'	2014-10-17 18:52:32 +02:00
urras	c4927bb16e	Fix OS X build location	2014-10-17 12:30:37 -04:00
Tux3 / Mlkj / !Lev.uXFMLA	ab996d1aa2	Merge branch 'pr448'	2014-10-17 17:57:08 +02:00
apprb	72aa313605	switch to tox_pass_encrypt/tox_pass_decrypt functions	2014-10-18 00:53:06 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	b13e318886	Merge branch 'pr449'	2014-10-17 17:34:07 +02:00
Zetok Zalbavar	c42b31fb45	Remove redundancy from settings tabs	2014-10-17 16:27:28 +01:00
krepa098	8ccadaad26	avsettings.ui layout changes	2014-10-17 16:18:34 +02:00
apprb	177b27882b	Merge branch 'history_fx' into history ... Conflicts: src/misc/db/encrypteddb.cpp src/misc/db/encrypteddb.h	2014-10-17 22:14:27 +09:00
dubslow	35f95ea501	fix #438	2014-10-17 07:36:10 -05:00
apprb	753edf3c6f	Merge pull request #1 from dubslow/history ... updated history encryption	2014-10-17 21:34:41 +09:00
apprb	1ce4820aa4	clenup	2014-10-17 21:33:00 +09:00
dubslow	9207dfc888	ui tweaks	2014-10-17 07:11:26 -05:00
dubslow	81003b8523	encrypted db uses core encryption	2014-10-17 04:26:31 -05:00
dubslow	041ed3b998	Merge branch 'corencryption' into history, remove file encryption, store key instead of hash ... (I forgot to commit the merge before starting work...) Conflicts: qtox.pro	2014-10-17 04:13:42 -05:00
dubslow	41365ce057	Merge branch 'master' into history ... Conflicts: src/widget/form/genericchatform.h src/widget/widget.cpp	2014-10-17 03:56:59 -05:00
Ansa89	c87a44b710	Italian translation: update	2014-10-17 10:49:16 +02:00
dubslow	18d1ee9f1f	Merge branch 'master' into corencryption ... Conflicts: src/misc/settings.cpp src/misc/settings.h src/widget/widget.h	2014-10-17 03:46:52 -05:00
dubslow	3e8557466c	fix #445	2014-10-17 03:02:19 -05:00
krepa098	ad609d9bc6	css tweaks	2014-10-17 09:12:17 +02:00
krepa098	4679b6b7bf	fixup! NetVideoSource, YUV shader, fixes	2014-10-17 09:11:39 +02:00
krepa098	4582706243	EmoticonsWidget: Do not close on misclick (#393)	2014-10-17 09:11:39 +02:00
krepa098	6b39184915	allow drag&drop on GroupWidget	2014-10-17 09:11:39 +02:00
krepa098	5ae2afb5c6	moved src/widget/camera.* to src/camera.*	2014-10-17 09:11:39 +02:00
krepa098	bd07666275	fixes, cleanup	2014-10-17 09:11:39 +02:00
krepa098	6e61da68e4	Settings: use QTabWidget, IdentityForm: cleanup	2014-10-17 09:11:38 +02:00
krepa098	87132389aa	fixed infinite recursion under certain conditions	2014-10-17 09:09:59 +02:00
krepa098	c4529d4062	fixed css, comments, cleanup	2014-10-17 09:09:59 +02:00
krepa098	e8416a98a2	fixed compilation error + warning	2014-10-17 09:09:59 +02:00
krepa098	2913326fb2	fix #416, cleanup	2014-10-17 09:09:59 +02:00
krepa098	118b67a970	cleanup	2014-10-17 09:09:59 +02:00
krepa098	f2b730cdb9	NetVideoSource, YUV shader, fixes	2014-10-17 09:09:59 +02:00
krepa098	8b8a541826	simplified VideoSource, interface, BRG->YUV conversion changes + more	2014-10-17 09:09:59 +02:00
krepa098	b43d7197ed	CameraWorker: cleanup, poll at 60Hz	2014-10-17 09:09:59 +02:00