118 Commits

Author	SHA1	Message	Date
Dubslow	d16b6cd283	Merge commit '5a005a1aafe96061301a4e113cb5450770009b88' into profiles ... Conflicts: core.cpp widget/form/settingsform.cpp widget/form/settingsform.h	2014-09-12 13:53:29 -05:00
apprb	6c5cd7c010	filetransfer: corrected pause/resume behaviour	2014-09-12 01:32:31 +07:00
Tux3 / Mlkj / !Lev.uXFMLA	a7c75e63a5	Clean code, improve compilation speed	2014-09-11 15:44:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	e91846e821	Fix #205	2014-09-11 13:40:44 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	0ae0d01a61	Generalize #275 to groupchats	2014-09-10 23:00:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	c76f6a7e73	Fix #275	2014-09-10 22:53:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	960fbfff48	Remove \n when copying own tox ID	2014-09-10 22:27:56 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	c564367354	Fix #234	2014-09-10 22:24:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	7f2edfae7d	Fix #266	2014-09-10 18:30:19 +02:00
Dubslow	05c654373f	Fixed misusing tox_load; profiles are significantly less buggy	2014-09-10 08:12:43 -05:00
Dubslow	e477c4ef64	Merge branch 'master' into profiles	2014-09-10 07:01:05 -05:00
krepa098	a39339e06f	cleanup	2014-09-09 18:29:03 +02:00
krepa098	ddf955afd3	fixed #255	2014-09-09 18:28:07 +02:00
apprb	aa2f67c983	code cleanup	2014-09-07 19:17:47 +07:00
apprb	9970fe293d	files renaming	2014-09-07 00:28:26 +07:00
apprb	b68cc66ede	scroll fix	2014-09-07 00:21:47 +07:00
apprb	db4c84a222	cleanup	2014-09-07 00:21:47 +07:00
apprb	0fe14953c8	somehow working example	2014-09-07 00:21:47 +07:00
apprb	25ee6a24d9	new chat beginning	2014-09-07 00:21:39 +07:00
apprb	502229a6f2	cleanup	2014-09-05 23:35:29 +07:00
apprb	2826e83cef	addMessage moved to parent class	2014-09-05 23:03:26 +07:00
apprb	522d570e62	code cleanup	2014-09-05 23:03:26 +07:00
apprb	02da6803f1	initial merging common parts of chatforms' widget	2014-09-05 23:03:08 +07:00
Dubslow	7aab85251e	Merge branch 'master' into profiles ... Holy shit first big merge of my career, I'm mildly amazed it even compiles Conflicts: core.cpp widget/form/settingsform.cpp widget/form/settingsform.h widget/widget.cpp	2014-09-05 03:53:00 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	3c8f39c2ca	Merge pull request #244 from apprb/dev ... fix #243 : Smileys are broken	2014-09-01 19:48:12 +02:00
apprb	24971f50e9	fix #243 : Smileys are broken	2014-09-01 18:55:07 +07:00
krepa098	1cd954ba42	compatibility with old widgets	2014-09-01 11:16:41 +02:00
krepa098	26c028f416	removed ClickableLabel, EditableLabelWidget, ElideLabel, EscLineEdit, ... CopyableElideLabel	2014-09-01 11:08:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	76971f5238	Make notifications consistent ... Notify of AV and FT requests if we're selected but not active or minimised, and add sound (consistent with how message notifications work)	2014-08-31 18:30:04 +02:00
apprb	f0c8be43db	change status light on incoming file request	2014-08-31 22:02:08 +07:00
apprb	a3785f3c27	Widget::updateFriendStatusLights moved to FriendWidget	2014-08-31 22:02:08 +07:00
Tux3 / Mlkj / !Lev.uXFMLA	5b617dd4fb	Always unmute mic when a call ends ... Since the mute mic button will be disabled	2014-08-29 19:28:22 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	3fc9cc0d83	Fix #219, handle av media changes ... Can now start or stop video on demand of the peer	2014-08-29 19:20:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	bd1ca80ffd	Fix #213	2014-08-29 18:16:16 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	af9c370169	Forbid sending sequential files ... They aren't seekable, and tend to be infinitely big..	2014-08-28 19:06:51 +02:00
midnight079	ec1facccf8	fixed some bugs with micButton	2014-08-19 21:49:35 +02:00
midnight079	b474ff2c2b	realized micButton for calls	2014-08-19 21:49:32 +02:00
midnight079	ca9a9b79cb	micButton and volButton were added to chatForm, but micButton for some ... reason is blinking	2014-08-19 21:46:59 +02:00
krepa098	2cbbfb7037	this actually belongs here	2014-08-16 19:27:16 +02:00
apprb	5f4c282215	Fix #102 (Greentext only lines with ">")	2014-08-14 18:55:04 +07:00
krepa098	1c27b55470	use Style::get	2014-08-11 17:23:41 +02:00
krepa098	921b8478f6	removed "the super ugly hack", Widget derives from QMainWindow	2014-08-11 10:00:08 +02:00
krepa098	af4623695c	styling cleanup	2014-08-10 18:14:50 +02:00
krepa098	d0b11074eb	use the new signal slot syntax as they are checked at compile time	2014-08-10 14:47:46 +02:00
krepa098	58b1f043e2	show smiley widget only if there are smileys to show	2014-08-10 14:38:41 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	c0f1f196b1	Merge pull request #176 from krepa098/smileys ... Smileys	2014-08-01 16:06:05 +02:00
krepa098	51ac007baf	default settings	2014-08-01 14:46:28 +02:00
krepa098	566402a1bf	a shiny new widget	2014-08-01 14:32:51 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	2a04fcfcf9	Merge pull request #175 from krepa098/smileys ... Smileys	2014-07-31 18:04:35 +02:00
krepa098	6fed143048	cleanup	2014-07-31 17:36:55 +02:00