737 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tux3 / Mlkj / !Lev.uXFMLA	b96f10b1c1	Merge pull request #344 from apprb/ftrans ... File transfer improvements	2014-09-29 20:28:40 +02:00
krepa098	67ffbfcb6e	fix #334	2014-09-29 20:26:03 +02:00
apprb	904de559e5	FileTransferInstance responce on broken filetransfer state	2014-09-30 00:22:19 +07:00
apprb	76f7df3135	cleanup	2014-09-29 23:36:42 +07:00
apprb	575cac1fc7	Core: emit TOX_FILECONTROL_RESUME_BROKEN request (base functionality)	2014-09-29 23:14:19 +07:00
apprb	4dfa5a45c4	Core::onFileControlCallback: handle TOX_FILECONTROL_RESUME_BROKEN request	2014-09-29 20:59:07 +07:00
apprb	dbeccd36f9	FileTransferInstance: unification of preview images function	2014-09-29 19:43:14 +07:00
Tux3 / Mlkj / !Lev.uXFMLA	fd36b6cfaa	Merge pull request #339 from dubslow/master ... Fix #331, remove duplicate code	2014-09-28 20:14:43 +02:00
dubslow	84f56b81a7	fixes #331, remove special chars	2014-09-28 13:09:10 -05:00
dubslow	7735973d94	remove duplicate code	2014-09-28 12:57:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	c05497b420	Merge pull request #336 from krepa098/master ... fixes #332, #334 and other visual glitches	2014-09-28 19:21:21 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	fd9d7d64bf	Merge pull request #338 from apprb/long ... Long names v2	2014-09-28 19:20:36 +02:00
apprb	a18070d7c5	Wrap name and date fix	2014-09-28 23:39:26 +07:00
apprb	4ccfd83505	long name in file transfer widget fix	2014-09-28 22:57:17 +07:00
krepa098	87c9bbf1e6	fixes #332, #334 and other visual glitches	2014-09-28 17:30:00 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	aa6fbc9e28	MaskablePixmapWidget should update() on setPixmap ... Fixes our own avatar apparently not changing until qTox restarted	2014-09-28 11:19:58 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	12380bc397	Allow non-png avatars, convert them on the fly	2014-09-28 10:59:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	21d084e258	Compat with toxcore	2014-09-28 10:56:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	35f548c3a1	Update build scripts	2014-09-28 00:43:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	c4cbc3a1e9	Merge branch 'pr330'	2014-09-28 00:39:45 +02:00
dubslow	8abcc3b77d	blasted scoping issue	2014-09-27 17:36:19 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	2c224b6f3a	Update build scripts	2014-09-28 00:19:40 +02:00
dubslow	eb67f9b3dd	revert special self avatar	2014-09-27 17:19:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	2047f8dc8d	Update build scripts	2014-09-28 00:14:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	766bd6e929	Update build scripts	2014-09-28 00:09:40 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	78b9553f4f	Update build scripts	2014-09-27 23:51:02 +02:00
dubslow	b1b89ac1f4	minor	2014-09-27 16:44:08 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	f4c2bf9f34	Update build scripts	2014-09-27 23:43:21 +02:00
dubslow	28d2680fec	conform to standard, fix bug related to nospam in ID	2014-09-27 16:37:39 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	547181ec48	update debian packages	2014-09-27 23:31:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	db14133875	update debian packages	2014-09-27 23:26:43 +02:00
dubslow	4b61c0f188	Merge branch 'master' of https://github.com/tux3/qTox	2014-09-27 15:08:01 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	702daa987b	Make buildPackages.sh install dependencies	2014-09-27 21:25:48 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	f6176e4a3c	buildPackages.sh shouldn't be interactive	2014-09-27 21:07:26 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	63252d2fc0	Fix merge	2014-09-27 20:22:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	1d978f1871	Merge branch 'pr321'	2014-09-27 20:15:01 +02:00
krepa098	9b52d3174d	set clickable to true	2014-09-27 19:13:46 +02:00
krepa098	2b58d45b73	MaskablePixmapWidget: use KeepAspectRatioByExpanding	2014-09-27 19:13:27 +02:00
krepa098	18330f0928	MaskablePixmapWidget: set cursor to PointingHandCursor if clickable	2014-09-27 18:00:13 +02:00
krepa098	bb214b53f7	set profile picture to contact_dark.png	2014-09-27 17:58:56 +02:00
krepa098	76e5876f0a	set default avatar to contact_dark.png, removed active/inactive avatar ... switching	2014-09-27 17:45:38 +02:00
krepa098	5411db5bec	MaskablePixmapWidget: background-color argument	2014-09-27 17:41:17 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	329f57d33a	debian: Shouldn't depend on metapackages	2014-09-27 17:01:47 +02:00
krepa098	a245255550	removed avatar_mask_circle.png from qrc	2014-09-27 16:39:54 +02:00
krepa098	de7ade033a	MaskablePixmapWidget: white background, removed circular mask	2014-09-27 16:37:16 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	57237f450e	Merge pull request #327 from master-passeli/mic_mute_segfault ... check if call is active before mute	2014-09-27 15:46:46 +02:00
krepa098	97b5599651	MaskablePixmapWidget: fixed drawing routine	2014-09-27 15:39:17 +02:00
Joni Martikainen	faf59cea9c	check if call is active before mute ... check if call is active before mute. Prevents segfault.	2014-09-27 16:05:05 +03:00
Tux3 / Mlkj / !Lev.uXFMLA	cd0f8d4d58	Fix #326	2014-09-27 14:37:51 +02:00
krepa098	4d24bd53f2	fix #308	2014-09-27 13:31:37 +02:00