1325 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
apprb	58eebcb2a6	load/save aliases from the settings file	2014-11-08 01:07:21 +09:00
apprb	af8df8e707	possiblity to setup alias	2014-11-07 23:56:15 +09: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
Tux3 / Mlkj / !Lev.uXFMLA	f29305bb01	Warn user if we try to use DNS with a SOCKS5 proxy ... Ask if we really want to do a DNS request, without the proxy Fixes #627	2014-11-06 23:50:36 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	9eccf3282c	Merge branch 'pr643'	2014-11-06 22:55:01 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	b8d6b960e9	Merge branch 'pr652'	2014-11-06 22:16:28 +01:00
agilob	ad9a737717	error: target not found: vpx	2014-11-06 21:11:06 +00:00
Tux3 / Mlkj / !Lev.uXFMLA	d5b51dc560	Merge branch 'pr651'	2014-11-06 21:41:44 +01:00
dubslow	3aa3e17893	fix dep issue from groupchat	2014-11-06 13:56:20 -06:00
dubslow	e10b4ad816	fix #650	2014-11-06 13:29:49 -06:00
Tux3 / Mlkj / !Lev.uXFMLA	2c2e934969	Merge branch 'pr649'	2014-11-06 18:39:48 +01:00
agilob	23d14553ae	tox:id	2014-11-06 16:55:10 +00:00
agilob	a10f04eb27	highight tox:// in chat	2014-11-06 16:38:33 +00:00
Tux3 / Mlkj / !Lev.uXFMLA	186ce73455	Tox URI: Handle nonstandard tox:// URI scheme as well	2014-11-06 15:26:48 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	c26bec3982	Merge branch 'pr646'	2014-11-06 15:22:01 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	51efc3295f	IPC: Yield ownership on exit	2014-11-06 15:21:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	e1b301eb83	Merge branch 'toxuri'	2014-11-06 15:12:56 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	a035cc5576	Implement IPC, Tox URI, refactor Tox DNS	2014-11-06 15:12:10 +01:00
agilob	3f7adb066c	disabling emoitcons	2014-11-06 13:55:12 +00:00
Сухарик	b11eaa0000	small change	2014-11-06 16:25:39 +03:00
Tux3 / Mlkj / !Lev.uXFMLA	cf40fad419	Merge branch 'pr644'	2014-11-06 13:34:20 +01:00
Ansa89	b29fb55f0e	Italian translation: update	2014-11-06 13:27:50 +01:00
Сухарик	f884215657	merge some of https://github.com/tux3/qTox/pull/642	2014-11-06 15:05:15 +03:00
Tux3 / Mlkj / !Lev.uXFMLA	0bee0fa4b9	Merge branch 'pr641'	2014-11-06 12:59:00 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	8e8c54a49f	Merge branch pr640 ... Fixes conflicts manually	2014-11-06 12:57:48 +01:00
Сухарик	4e4028ae8b	update russian translation	2014-11-06 14:46:19 +03:00
Sean	7256147800	Add info.plist install, fix @dubslow	2014-11-05 22:57:46 -08:00
Sean	ca007f5b9b	Add info.plist for OS X install	2014-11-05 22:56:46 -08:00
Sean	93231dff5a	Add identifier, prepare for code signing on OS X	2014-11-05 21:57:04 -08:00
dubslow	9e5f7cdba8	reorder libs	2014-11-05 23:44:34 -06:00
dubslow	6656ab58b0	fix qtox.pro for jenkins	2014-11-05 23:35:41 -06:00
Tux3 / Mlkj / !Lev.uXFMLA	85aca2ca40	Fix typo	2014-11-06 00:13:33 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	aa98222e11	Merge branch 'pr634'	2014-11-05 23:56:38 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	39c3a3ad58	Add .gitattribute, fix github linguist mistakes ... No, qTox isn't written in TypeScript, those are XML translation files.	2014-11-05 23:51:50 +01:00
agilob	31f8a4308e	window titles	2014-11-05 22:47:52 +00:00
Tux3 / Mlkj / !Lev.uXFMLA	9d5b5d437d	Enable swedish translation	2014-11-05 23:34:35 +01:00
agilob	d9a3f1a5e2	cleaning in settings.cpp filetransferinstance.cpp and friendwidget.cpp, global autoaccept, per friend and qmenunu simplificated	2014-11-05 22:34:28 +00:00
Tux3 / Mlkj / !Lev.uXFMLA	291a1ec282	Merge branch 'pr632'	2014-11-05 23:30:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	0b6a4a6481	Implement tox3 support, keep tox1 as silent fallback	2014-11-05 23:27:51 +01:00
willeponken	5af8ea6858	Swedish translation	2014-11-05 23:19:14 +01:00
agilob	c702e18ccf	global autoaccept files	2014-11-05 21:59:29 +00:00
Tux3 / Mlkj / !Lev.uXFMLA	de3befe116	Fix compilation warning	2014-11-05 22:46:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	d158d27fc5	Check Tox DNS protocol version, reject if not tox1 ... We only support tox1 for now, and soon we should tox3	2014-11-05 20:48:46 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	7372fe5314	Merge branch 'pr630'	2014-11-05 17:43:02 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	8b284f260a	Merge branch 'pr626'	2014-11-05 17:41:32 +01:00
agilob	9a5c5484ba	autoaccept: unused code	2014-11-05 15:52:05 +00:00
agilob	b9a3341e95	autosavedir: keep previous directory in case of cancelling	2014-11-05 15:49:55 +00:00
agilob	3dbbbd1caf	autosaveDir, useEmoicons, selectTimestamp added to GUI and settings	2014-11-05 15:20:32 +00:00
agilob	a07c83466c	another unused opration	2014-11-05 12:14:39 +00:00