11 Commits

Author	SHA1	Message	Date
Dubslow	29cc9e1b7d	Merge branch 'encryption' into master ... Conflicts: src/main.cpp	2015-01-23 01:51:39 -06:00
Dubslow	96fd1e514d	Fix #967	2015-01-20 02:07:56 -06:00
dubslow	bafca96554	Incremental work, starting to take shape	2014-12-03 18:14:28 -06:00
dubslow	b3e7114e84	respond to copying id, fixes #537	2014-11-10 17:20:10 -06:00
dubslow	576fd7269e	disable switching buttons during calls ... fixes #436, fixes #500 (well, "fixes" by preventing users from doing dumb things)	2014-10-24 12:33:46 -05:00
dubslow	c1cef51d56	check for existing profile (fixes #466)	2014-10-19 22:36:39 -05:00
dubslow	eaf01aadc3	added new profiles, default name/status (fixes #465 and fixes #460)	2014-10-19 22:07:51 -05:00
dubslow	ee0f94a890	fix #461, cleanup	2014-10-17 20:15:26 -05:00
dubslow	235d6609b9	Merge branch 'master' into profiles ... Conflicts: src/widget/form/settings/identityform.cpp	2014-10-12 04:58:56 -05:00
dubslow	bf75750166	Merge branch 'master' into src ... Conflicts: qtox.pro src/widget/form/settings/avform.h src/widget/selfcamview.cpp src/widget/selfcamview.h src/widget/widget.cpp widget/selfcamview.h widget/videosurface.h	2014-10-10 17:21:54 -05:00
dubslow	3ba95d82ae	Move code into src/	2014-10-07 23:26:25 -05:00