3733 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
tux3	b69f8425c6	Fix qTox on OSX, closes #2447	2015-10-23 15:21:47 +02:00
tux3	1f61534841	Merge branch 'pr2343'	2015-10-23 15:20:58 +02:00
agilob	8185893ab5	Merge remote-tracking branch 'rowenstipe/master'	2015-10-22 07:12:33 +01:00
Rowen Stipe	e107de12c0	Compile on Mac ... This set up added to current master compiles properly on Mac. Includes pull #2436 fixes suggested by @antis81	2015-10-22 01:57:46 -04:00
Zetok Zalbavar	d2aa9441bf	Merge pull request #2364 from PKEv:fix_write_to_db ... fix write to DB	2015-10-22 05:50:25 +01:00
Dmytro Shynkevych	b887072bc4	systemtrayicon: switched to manual memory management for pixmap data	2015-10-21 23:42:14 -04:00
Nils Fenner	33e54b841a	Merge pull request #2415 from antis81:ngf/mic	2015-10-21 22:19:37 +02:00
Nils Fenner	cf8fa7b29c	remove unused include and forward declarations	2015-10-21 22:18:47 +02:00
agilob	4a64790b52	Merge remote-tracking branch 'bitok/Fix2167'	2015-10-21 19:13:10 +01:00
agilob	ecbda91764	Merge remote-tracking branch 'bitok/fix_performance_issues'	2015-10-21 19:12:15 +01:00
agilob	61ef6429e2	Merge remote-tracking branch 'zetok/fix-warning-no-profile'	2015-10-21 19:05:48 +01:00
agilob	33334dd83e	Merge remote-tracking branch 'codedust/pr-loginbutton-focus'	2015-10-21 19:04:36 +01:00
Zetok Zalbavar	16ad60a570	README.md: correct location of the Gentoo overlay	2015-10-21 17:25:17 +01:00
Zetok Zalbavar	0c34b079a5	Unlock mutex before returning history instance ... fix #2428	2015-10-21 13:17:42 +01:00
codedust	91b712f62c	Add :focus selector for the login button in loginScreen.css	2015-10-21 14:12:18 +02:00
Nils Fenner	e1c2a80e82	switch colors in mic gain indicator gradient	2015-10-20 23:14:37 +02:00
Nils Fenner	82e1644d67	cleanup Audio::openOutput	2015-10-20 23:14:07 +02:00
Nils Fenner	3eb7b48d1c	cleanup Audio::openInput	2015-10-20 23:12:55 +02:00
Nils Fenner	ab41bf92ba	don't open audio in/out twice	2015-10-20 23:10:14 +02:00
Zetok Zalbavar	c07aee18ad	Merge pull request #2346 from PKEv:save_avatar_in_DB ... Save avatar in DB add import avatars update delete avatar action correct import avatar for user without history add multithreaded make import run once	2015-10-20 21:01:20 +01:00
Nils Fenner	b7cf4df13f	Get rid of static methods and bugs	2015-10-20 03:46:44 +02:00
Nils Fenner	54547af7cf	warn when trying to start audio thread twice	2015-10-20 03:42:02 +02:00
Nils Fenner	a675725a5e	change wording in docs	2015-10-20 03:41:18 +02:00
Nils Fenner	2bc3798aa0	remove dead & unfinished code	2015-10-19 21:59:47 +02:00
Nils Fenner	c8e003decb	further cleanup	2015-10-18 22:21:08 +02:00
Nils Fenner	8530acf079	fix asserts when (un-)subscribing input	2015-10-18 22:21:08 +02:00
Nils Fenner	59ca97e9b6	move docs to cpp	2015-10-18 22:21:08 +02:00
Nils Fenner	1c205b7c16	the big code cleanup ... * Get rid of static vars and methods and move mutexes to right places. * Use static wrappers for the moment to retain compatibility.	2015-10-18 22:21:08 +02:00
Nils Fenner	2a2cba3cf2	remove outcommented code	2015-10-18 22:21:08 +02:00
Nils Fenner	932d9b7c9b	Audio: Fix device open only when needed	2015-10-18 22:21:08 +02:00
TheSpiritXIII	dc2c6532a5	Audio: Fix unclosed audio when hanging up	2015-10-18 22:21:08 +02:00
TheSpiritXIII	bbbd450b6a	Audio: Only open mic when requested	2015-10-18 22:21:08 +02:00
TheSpiritXIII	868381fe3f	Audio: Don't need this?	2015-10-18 22:21:08 +02:00
TheSpiritXIII	61eb302ff7	Audio: Fix crash when no devices available	2015-10-18 22:21:08 +02:00
TheSpiritXIII	a311b96376	Audio: Open output only when necessary	2015-10-18 22:21:08 +02:00
Nils Fenner	a2a32b61c4	Audio: persistent volume sliders, mic feedback and volume	2015-10-18 22:21:08 +02:00
Nils Fenner	1fc703c281	fix warnings	2015-10-18 22:20:16 +02:00
Zetok Zalbavar	a948a69ca0	Merge pull request #2417 from zetok:translation-ru ... Update Russian translation	2015-10-18 21:18:51 +01:00
Zetok Zalbavar	ae5ca1ae53	Merge pull request #2418 from antis81:ngf/login-screen ... use native dialog buttons in message boxes	2015-10-18 21:07:12 +01:00
agilob	7117083e86	Merge remote-tracking branch 'origin/new_video_view'	2015-10-18 20:55:01 +01:00
Nils Fenner	ad373d0362	use native dialog buttons in message boxes	2015-10-18 21:23:26 +02:00
PKEv	e5a5074f91	make import run once ... and rename function	2015-10-18 22:15:49 +03:00
Alexey Suvorov	33e3e5a9bc	Update Russian translation ... thanks to @alexeysvrv	2015-10-18 18:18:12 +01:00
PKEv	20d0eb06f6	add multithreaded	2015-10-18 20:04:37 +03:00
Zetok Zalbavar	d60cfe07b6	Remove an empty line and unneeded slash	2015-10-18 17:04:49 +01:00
PKEv	ec5e9c7350	correct import avatar for user without history	2015-10-18 16:50:00 +03:00
agilob	cde9721600	qunused on event	2015-10-18 10:18:13 +01:00
agilob	ec3ccc7ca3	remove qdebug from audio.cpp:270	2015-10-18 10:18:13 +01:00
agilob	d2e09ead7a	one more line to remove	2015-10-18 10:18:13 +01:00
agilob	d875221e53	remove unused code, removed unused checks	2015-10-18 10:18:06 +01:00