612 Commits

Author	SHA1	Message	Date
Tux3 / Mlkj / !Lev.uXFMLA	14ad87069e	Merge branch 'pr979'	2015-01-04 15:18:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	10a2213e66	Merge branch 'pr978'	2015-01-04 15:07:36 +01:00
Nokta-strigo	1ec40b74b7	Contacts changing status to offline and having new events are not moved to the bottom of the list. (see issue #740)	2015-01-04 14:54:22 +01:00
krepa098	64024c77a6	Moved the context menu to GenericChatForm	2015-01-04 14:21:05 +01:00
krepa098	f4c6bc3452	cleanup	2015-01-04 13:33:11 +01:00
krepa098	03ea61079b	ChatLine/ChatMessage: use shared_ptr	2015-01-04 13:29:14 +01:00
novist	4b05c10308	Fixed text copying from chat windows ... Tiny formatting fix (space after if)	2015-01-04 13:23:28 +02:00
novist	2a8cbd189d	Added typing notification support and enabled by default	2015-01-04 13:21:56 +02:00
krepa098	ea467152aa	filetransferwidget: fixed pause button, ETA, font size, resource usage	2015-01-04 12:04:30 +01:00
zero-one	672cd42065	Merge remote-tracking branch 'upstream/master' into alphabetize	2015-01-04 01:30:11 -08:00
zero-one	7569003e87	Alphabetizes groupchat user list (fixes #701)	2015-01-04 01:26:53 -08:00
Tux3 / Mlkj / !Lev.uXFMLA	d042c2f346	Filter incoming audio, not sent audio	2015-01-04 02:04:07 +01:00
krepa098	f630583e59	cleanup	2015-01-03 21:20:51 +01:00
krepa098	b3507152eb	fixed eliding (ie. invisible nicknames)	2015-01-03 21:19:28 +01:00
krepa098	64f7f7c45e	use resolveToxID	2015-01-03 20:38:06 +01:00
krepa098	d04a79a599	ChatLine: cell spacing	2015-01-03 20:37:40 +01:00
krepa098	99a230ccf5	cleanup	2015-01-03 19:06:10 +01:00
krepa098	698fcb70f0	check "use emoticons"	2015-01-03 19:05:38 +01:00
krepa098	a0a56e32a0	fix no visible line case	2015-01-03 15:32:12 +01:00
krepa098	2938702c1e	refactoring, fixes	2015-01-03 15:03:33 +01:00
krepa098	8a1ea18ed4	fixed history	2015-01-03 14:08:04 +01:00
krepa098	d7f5068fbf	quoting support, toHtmlChars, fixes	2015-01-03 13:52:56 +01:00
krepa098	f3d5b4bb57	fixed anchors	2015-01-03 13:20:53 +01:00
krepa098	d88aa965fa	fixup merge	2015-01-03 13:13:12 +01:00
apprb	64e0116476	honouring aliases in the loaded history ... Conflicts: src/widget/form/chatform.cpp	2015-01-03 13:10:19 +01:00
krepa098	2ee1363be5	don't set cache mode	2015-01-03 10:24:12 +01:00
krepa098	1945bcc1f6	don't use DesignMetrics	2015-01-03 10:24:04 +01:00
krepa098	b76e9a295d	disabled group joined/left messages ... Conflicts: src/widget/widget.cpp	2015-01-03 10:23:50 +01:00
krepa098	40cc14bd44	respect time format	2015-01-03 10:21:50 +01:00
krepa098	2828a97d54	styled chatlog, cleanup	2015-01-03 10:21:15 +01:00
krepa098	96789182cf	chatlog: Don't accept drops	2015-01-03 10:21:05 +01:00
krepa098	5ae111e7c4	chatline: set row and col number	2015-01-03 10:20:53 +01:00
krepa098	b0c3b4032f	chatlog: save chat log	2015-01-03 10:20:40 +01:00
krepa098	1c653c5f65	filetransferwidget: use CroppingLabel	2015-01-03 10:20:29 +01:00
krepa098	3c9e071a39	chatlinecontentproxy: scaling behaviour	2015-01-03 10:20:05 +01:00
krepa098	4997788b13	fix selection	2015-01-03 10:19:54 +01:00
krepa098	eecd886745	filetransferwidget layout changes	2015-01-03 10:19:41 +01:00
krepa098	a0ea0675a7	Merge branch 'master' into chatlog_v3_1 ... Conflicts: qtox.pro res.qrc src/misc/smileypack.cpp src/widget/chatareawidget.cpp src/widget/chatareawidget.h src/widget/form/chatform.cpp src/widget/form/genericchatform.cpp src/widget/form/genericchatform.h src/widget/form/settings/generalform.cpp src/widget/tool/chatactions/messageaction.cpp src/widget/tool/chatactions/systemmessageaction.cpp src/widget/widget.cpp	2015-01-03 10:17:53 +01:00
krepa098	f1f42fc237	innerStyle, groupchats	2014-12-31 13:42:06 +01:00
krepa098	7a4af239b0	Text: toHtmlChars	2014-12-31 09:59:35 +01:00
Dubslow	f7bef8d5c3	Merge branch 'pr966'	2014-12-31 00:55:59 -06:00
Dubslow	75331af311	Merge branch 'pr965'	2014-12-31 00:50:03 -06:00
apprb	1194df2f78	renaming: Direct Connect -> None	2014-12-30 22:02:26 +06:00
apprb	f8bdaac121	messages splitting fix	2014-12-28 23:32:19 +06:00
apprb	1719c72f67	tiny polishing	2014-12-28 19:04:32 +06:00
apprb	a14da15d79	fix #963	2014-12-28 18:32:25 +06:00
novist	30d9862c4f	Removed explanations from tray menu	2014-12-18 20:32:28 +02:00
Dubslow	54e8be75d2	Merge branch 'pr938'	2014-12-17 14:43:34 -06:00
agilob	5861c6daa5	removing fixed size from mic/volume buttons so they align nicely	2014-12-17 12:36:34 +01:00
agilob	f8d870f374	removing spacing from microphone layout	2014-12-17 12:00:41 +01:00
Dubslow	fc749880eb	minor style tweaks	2014-12-16 18:05:13 -06:00
Maximilian Wuttke	e0cb122abe	Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio ... Added some `#ifdef QTOX_FILTER_AUDIO`s. Conflicts: qtox.pro Conflicts: src/coreav.cpp	2014-12-14 10:55:38 +01:00
krepa098	3190530686	filling the gaps	2014-12-13 21:11:03 +01:00
Dubslow	84dea5e12c	Revert "fix #902" ... @apprb #932 This reverts commit 13306031e2.	2014-12-13 12:18:43 -06:00
Dubslow	a8b1f60256	Merge branch 'pr923'	2014-12-12 18:40:24 -06:00
Dubslow	cc4cc7d7a8	Merge branch 'pr922'	2014-12-12 18:37:06 -06:00
novist	e2bf37c139	Light tray icon option	2014-12-12 12:12:12 +02:00
Zetok Zalbavar	e0993a72f6	Style corrections ... 'if()' → 'if ()' 'for()' → 'for ()'	2014-12-11 18:05:52 +00:00
apprb	13306031e2	fix #902	2014-12-11 21:33:38 +06:00
krepa098	380d7b9a07	Text: detect anchors	2014-12-10 19:56:08 +01:00
krepa098	170e2e6e29	Text: selection use fuzzy hit	2014-12-10 19:31:27 +01:00
krepa098	fd7fe15e31	renamed firstLineVOffset to getAscent	2014-12-10 16:45:12 +01:00
krepa098	0692c484f0	adjusted Image, Spinner, ChatLineContentProxy vOffset	2014-12-10 16:42:12 +01:00
krepa098	2003f7c5aa	Text: use ascent rather than height	2014-12-10 16:35:07 +01:00
krepa098	26718f7147	cleanup	2014-12-10 10:59:10 +01:00
krepa098	ba24da3184	filetransferwidget.ui: reverted margins. chatlinecontentproxy: calculate ... firstLineVOffset	2014-12-10 10:57:09 +01:00
krepa098	b6fd9ed02e	chatline: fixed bbox height calculation	2014-12-10 10:41:22 +01:00
krepa098	5ae506fe3b	filetransferwidget: added open (browse?) button, fixed layout	2014-12-10 10:35:56 +01:00
krepa098	0f2a339a98	margins, update selection rect during resize	2014-12-09 21:47:25 +01:00
Dubslow	5cb1b6fe8e	check for no systray, fixes #908 ... cant believe it took this long to figure out ;_;	2014-12-09 14:18:12 -06:00
krepa098	2b20a23c3d	changed color of selGraphItem	2014-12-09 19:24:01 +01:00
krepa098	661a8c4da4	revisited selection	2014-12-09 13:17:08 +01:00
krepa098	c91b7cb03c	don't depend on valid cursur	2014-12-09 13:11:42 +01:00
krepa098	a1cfbeffcb	removed ChatLine vAlignCol	2014-12-08 22:08:23 +01:00
Sascha Brendel	17bcd969b2	Update chatform.cpp ... Improved that line of code. Thanks to @dubslow	2014-12-08 20:28:34 +01:00
Lednerb	dfb51d7d29	Added Translation for error message on sending a file. Also included the German Version.	2014-12-08 19:07:51 +01:00
krepa098	fdee08df32	ui tweaks	2014-12-07 20:52:01 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	32863bb272	Merge branch 'pr884'	2014-12-07 19:54:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	983c0b7e6b	Merge branch 'pr857'	2014-12-06 14:02:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	53d7bc9dc1	Push to talk with input msgedit focused	2014-12-06 13:59:19 +01:00
Simon Vermeersch	424af0505e	Focus the text input area when clicking on the text area	2014-12-06 13:54:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	324d075cfe	Change push to talk shortcut to CTRL+P	2014-12-06 13:49:04 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	a5c5618b97	Fix include 'Windows.h' -> 'windows.h' ... MinGW is case sensitive	2014-12-06 12:44:38 +01:00
Dubslow	961d5830c3	add fancier tray icons with status, remove relevant option	2014-12-05 17:14:48 -06:00
agilob	561f5f9895	fixing bug #891	2014-12-04 15:51:01 +00:00
Dubslow	85fcdd7653	Fix not setting tox null after cleanup ... also reordered functions for super extra safety	2014-12-03 18:52:10 -06:00
Dubslow	1ebcad7ad8	Merge branch 'pr889'	2014-12-03 12:38:58 -06:00
Dubslow	8a06598af4	Merge branch 'windows-autoaway-fix' ... The current way is in fact broken	2014-12-03 11:54:16 -06:00
apprb	3c15909ffc	correct displaying of the targeted messages	2014-12-03 23:47:07 +06:00
Dubslow	3943d5213d	deleting a profile now cleans out all personal data	2014-12-02 18:48:50 -06:00
Dubslow	aea9eea8a4	move friend information to a separate ini file; fixes #594	2014-12-02 18:26:17 -06:00
Dubslow	4a14155724	move settings to qtox.ini	2014-12-02 16:47:55 -06:00
novist	a6f3f5f169	Fixed getIdleTime() on windows	2014-12-02 15:33:53 +02:00
Dubslow	1c78cbc0c9	add a basic platform-disabling define	2014-12-01 18:18:27 -06:00
Dubslow	aae9233dc1	fix os x compiling, update dependencies	2014-12-01 17:01:35 -06:00
Dubslow	4781c8cfbb	Merge branch 'pr862' ... Conflicts: src/widget/widget.cpp	2014-12-01 15:37:09 -06:00
Dubslow	4adfa986b5	touchup, more appropriate legal message	2014-12-01 15:28:53 -06:00
Dubslow	48e5315cdf	clarify systray show-status status	2014-12-01 14:55:35 -06:00
Dubslow	173eda7700	Merge branch 'pr870' ... Conflicts: src/widget/form/settings/generalform.cpp	2014-12-01 14:47:54 -06:00
Dubslow	1340e00f69	re-move idle timer construction before restoreGeometry	2014-12-01 14:04:18 -06:00