2526 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dubslow	733c684759	Add x32 deps to unity backend compilation, and linker opts to JENKINS	2015-02-17 01:28:30 -06:00
Dubslow	9946a4642e	Merge branch 'pr1194' ... Reduced merge that drops the unnecessary changes	2015-02-16 18:07:56 -06:00
Dubslow	7edb50ea3e	Merge branches 'pr1185', 'pr1188', 'pr1192', 'pr1193', 'pr1200' and 'krepa'	2015-02-16 18:03:36 -06:00
TheLastProject	ac9904face	Turn group invite warning into question. Fixes #1199	2015-02-16 23:53:33 +01:00
krepa098	deb8440c6a	fix issue #1181	2015-02-16 18:13:22 +01:00
BroncoTc	23ea999bf6	Translation finished ... with QT 4.8.6	2015-02-16 23:04:53 +08:00
BroncoTc	68e263256b	Translation Added	2015-02-16 22:38:47 +08:00
krepa098	c631fff602	fix issue #1161 round 2! ... Fight!	2015-02-16 15:28:57 +01:00
krepa098	e454671ebd	use QString::toHtmlEscaped	2015-02-16 15:22:29 +01:00
BroncoTc	87b0476990	Qt installed and lupdated	2015-02-16 22:03:40 +08:00
BroncoTc	e2751344c4	Checked by Qt Linguist	2015-02-16 20:34:06 +08:00
Zetok Zalbavar	c0df870c62	Update toolTip for Compact contact list ... Restart should not be a requirement anymore	2015-02-16 10:59:01 +00:00
BroncoTc	51799dc857	add spaces between language names	2015-02-16 18:36:51 +08:00
Ansa89	a112e03715	Italian translation: update	2015-02-16 11:28:04 +01:00
BroncoTc	3b60994aca	Beta version of Chinese language file	2015-02-16 18:10:46 +08:00
Denny Dai	1eadad5844	Finish zh_CN translation ... need final check	2015-02-16 17:47:56 +08:00
BroncoTc	725c27a42c	Work temply transmitted to Dennx to finish	2015-02-16 14:26:00 +08:00
BroncoTc	69d4206473	Partial translated ... Partial translated the file (edit on a french translation file ,maybe) Might be usable, most of the important stuffs are translated.	2015-02-16 14:11:27 +08:00
BroncoTc	dff30915a3	edit the three config & source file ... manully and same way as commit a004fc872f	2015-02-16 12:43:39 +08:00
BroncoTc	ce7e5705ce	Add Chinese translation ... Maybe cause problem when merge, git diff can't recongnize this file (editted by gedit,Sublime Text,Notepad++)	2015-02-16 12:34:27 +08:00
Joseph Anania III	40be513694	due to demand added TwitterEmojiSimple emoticon theme shares assets with TwitterEmojiSVG doesn't replace ascii smiles :-)	2015-02-15 20:31:04 -05:00
Dubslow	bcc3ad7038	Fix #1182	2015-02-15 18:56:11 -06:00
Joseph Anania III	c71e777e31	changed grinning faces to show more teeth and to be closer to Unicode's examples	2015-02-15 19:36:31 -05:00
Chloe	3e0633b3f0	Fixed Markdown Error in Install.md ... See changes (it's a small error, but it bugged me quite a bit upon seeing it).	2015-02-15 18:45:09 -05:00
Dubslow	03168a02d2	Merge branches 'pr1134', 'pr1157' and 'pr1171'	2015-02-15 17:36:45 -06:00
Dubslow	07b87616a2	Refactor image filter as discussed	2015-02-15 17:35:27 -06:00
Dubslow	dcf87f7475	Ask before joining group ... Fixes #1101, closes #1177	2015-02-15 17:25:27 -06:00
krepa098	a930b398d4	fix issue #1163	2015-02-15 19:48:16 +01:00
krepa098	3095583ea9	fix issue #1168	2015-02-15 17:21:00 +01:00
krepa098	ec85434c6c	try fix #1165 ... Checkmark doing nothing on Windows	2015-02-15 17:15:44 +01:00
Joseph Anania III	d0dfa1febb	Added initial :name: emoticon support and compatiblity with cylgom pack for TwitterEmojiSVG and artwork fixes	2015-02-15 10:57:01 -05:00
krepa098	9bbd7a5c94	fix issue #1161	2015-02-15 14:25:49 +01:00
Dubslow	73e51865e7	Merge branch 'chatlog_merge_v3' ... Conflicts: src/chatlog/chatlog.h	2015-02-15 05:24:53 -06:00
Dubslow	cda1a02829	Fix #1154	2015-02-15 05:16:20 -06:00
Dubslow	b17b915dfc	Fix clang warnings ... It complained about row being used uninitialized, though it was a spurious warning	2015-02-15 05:15:46 -06:00
Dubslow	e2ca10977f	Fix compile error	2015-02-15 04:59:26 -06:00
krepa098	c57cba21ae	fix issue #14	2015-02-15 11:58:02 +01:00
Dubslow	4dcfec0151	Merge branch 'chatlog_merge_v3' ... "unconfirmed" -> "Waiting to send..."	2015-02-15 04:55:25 -06:00
krepa098	4831e0c18b	FTW: Always show the checkmark after a successful transfer	2015-02-15 11:53:32 +01:00
Dubslow	2fa34ac7e4	Remove QMarginsF, reduce to Qt 5.2	2015-02-15 04:53:26 -06:00
krepa098	2bc7594049	redo layout on Settings::emojiFontChanged	2015-02-15 11:43:01 +01:00
krepa098	205f950073	refactoring & dark-theme awareness	2015-02-15 10:51:54 +01:00
krepa098	74ea0773ee	Text: color property	2015-02-15 10:45:07 +01:00
krepa098	2a37473781	replaced QMarginsF by QMargins	2015-02-15 10:19:38 +01:00
Dubslow	c3d61f8dfe	Make Dutch selectable translation	2015-02-14 18:10:45 -06:00
Dubslow	eeb8c10bc3	Fix #1158	2015-02-14 17:26:21 -06:00
krepa098	c800672ff2	display "unconfirmed" on new file transfer requests	2015-02-14 12:29:42 +01:00
krepa098	108d2725e6	FTW: 1px spacing instead of 2px	2015-02-14 12:21:03 +01:00
krepa098	9499909f8b	finished work on FTW ... hopefully	2015-02-14 12:14:09 +01:00
Zetok Zalbavar	e4e6401182	Rename 'Start automatically' → 'Autostart'	2015-02-14 07:39:28 +00:00