2466 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dubslow	75a0e8ac2e	Merge branch 'pr1275' ... Conflicts: src/widget/form/genericchatform.cpp	2015-02-28 12:20:40 -06:00
Dubslow	bfb0fdfee1	Merge branch 'pr1311'	2015-02-28 11:59:07 -06:00
TheLastProject	9dc52c1eb9	Add image preview on mouseover	2015-02-28 17:14:58 +01:00
tux3	27d20ba734	Merge branch 'pr1299'	2015-02-27 21:55:01 +01:00
tux3	33281f95d0	Merge branch 'pr1297'	2015-02-27 21:46:30 +01:00
agilob	7a6b8ab256	qlabels will not support richtext, plaintext only ... removes support for HTML, QML, JS and CSS in username/status labels this commit closes #1298(bug) #1295(bug) and #1224(feature request)	2015-02-27 14:05:03 +00:00
Ansa89	78f6b8afd8	Italian translation: update	2015-02-27 10:50:10 +01:00
tux3	337bf0cd2b	Merge branch 'pr1291'	2015-02-26 22:30:16 +01:00
agilob	439dde5c8d	+comment	2015-02-26 21:10:35 +00:00
agilob	ed1cd04340	closes tux3/qtox #1289	2015-02-26 21:08:32 +00:00
tux3	6b2b92e445	Merge branch 'pr1287'	2015-02-26 21:56:35 +01:00
Zetok Zalbavar	2ec206b97a	[qtox.pro] fix building with support for libappindicator ... * added INCLUDEPATHs for libappindicator support * added INCLUDEPATHs for GTK tray backend * sorted some INCLUDEPATHs	2015-02-26 20:51:13 +00:00
tux3	bcbc6bd65f	Merge branch 'pr1282'	2015-02-25 19:58:29 +01:00
sudden6	1a17b2efb8	Fix build for openSUSE and probably others	2015-02-25 19:46:59 +01:00
tux3	3824b567ef	Don't build desktop resource files on android	2015-02-25 19:36:06 +01:00
tux3	068f65b389	Fix missing brace	2015-02-25 17:50:34 +01:00
tux3	0cb45e6527	Disable systray unity backend by default ... It's confusing too many people, lacks some features, and is only useful on Unity	2015-02-25 17:48:43 +01:00
tux3	bb8464bbde	Upload update FTP deployement scripts ... In case someone finds those interesting, or if I get hit by a bus unexpectedly	2015-02-25 16:16:18 +01:00
tux3	351bc3f037	Merge branch 'pr1279'	2015-02-25 16:09:04 +01:00
tux3	66225bbd79	Merge branch 'pr1278'	2015-02-25 16:08:16 +01:00
minj	6014bc2968	update Lithuanian translation	2015-02-25 17:01:59 +02:00
tux3	1a1debf167	Merge branch 'pr1243'	2015-02-25 15:55:32 +01:00
TheLastProject	741539d5b8	Update Dutch translation	2015-02-25 15:53:32 +01:00
tux3	e04bd15181	Merge branch 'pr1231'	2015-02-25 15:40:50 +01:00
tux3	21fa791415	Tell to install libappindicator in INSTALL.md	2015-02-25 15:05:30 +01:00
tux3	bc412c9c7b	Fix missing include for toxme	2015-02-25 13:16:45 +01:00
tux3	fe23af6a09	Don't include appindicator for GTK backend	2015-02-25 11:54:57 +01:00
tux3	2e6414b0df	Update INSTALL.md for filter_audio	2015-02-25 11:51:48 +01:00
tux3	94250d4aea	Use Qt systray again on KDE4 ... Fixes #1277	2015-02-25 11:42:34 +01:00
tux3	d834fd2577	Compile toxme support	2015-02-25 11:33:13 +01:00
tux3	5c92c3b89d	Use GTK status icon on Gnome ... Instead of Unity, which has less features and is a hack	2015-02-25 11:30:15 +01:00
tux3	a035a6cfd6	Remove install_libfilteraudio.sh until it works properly ... Right now it only serves to confuse people	2015-02-25 11:20:38 +01:00
tux3	559be200ff	Merge branch 'pr1272'	2015-02-25 11:03:01 +01:00
tux3	80c4cb8b45	Merge branch 'pr1267'	2015-02-25 10:41:47 +01:00
tux3	8e10eedca7	Merge branch 'toxme'	2015-02-25 00:41:20 +01:00
tux3	ae877ccd6d	Implement deleting a toxme address	2015-02-25 00:40:44 +01:00
tux3	1883b4e25e	Implementing creating a toxme address	2015-02-25 00:40:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	217ca20085	Start implementing toxme.se support	2015-02-25 00:37:21 +01:00
tux3	5dce927292	Merge branch 'gtktrayicon'	2015-02-25 00:36:34 +01:00
tux3	8a83a6114f	Implement GTK systray icon backend ... This one is deprecated, but should work much better than any other system tray icon backend we currently have, both in term of supported features and reliability. It justs needs some testing to see where we can enable it now.	2015-02-24 23:27:08 +01:00
agilob	9a3a15c2e7	closes again tux3/qtox #988	2015-02-24 18:39:44 +00:00
TheLastProject	75734c35ac	Make default friend request message contain nickname	2015-02-24 14:10:51 +01:00
tux3	bee584bdb1	Only use StatusNotifier on KDE5	2015-02-24 10:19:40 +01:00
Dubslow	286c963f5d	Merge branch 'pr1270'	2015-02-23 19:41:20 -06:00
Sean	dd0a4bae21	Attempt to fix #1269 with macho weak linking	2015-02-23 17:39:32 -08:00
agilob	842774ecfc	fix tux3/qtox #891	2015-02-23 23:08:07 +00:00
tux3	3af631ebab	Merge branch 'pr1266'	2015-02-23 23:27:53 +01:00
tux3	d89c722b9c	Only use StatusNotifier on KDE ... According to the qtox wiki table, Qt's backend works better on non-kde DEs	2015-02-23 23:25:08 +01:00
tux3	ffea7cd193	Cherry pick part of #1259	2015-02-23 23:19:22 +01:00
BroncoTc	f0dbdfaf57	Translated	2015-02-23 23:18:54 +01:00