1734 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sean Qureshi	1e2e482c68	Merge commit '8934a11dbffce6b0611d97d5748668a5cdb8ba8a' as 'osx/updater'	2014-12-16 02:51:14 -08:00
Sean Qureshi	8934a11dbf	Squashed 'osx/updater/' content from commit a558402 ... git-subtree-dir: osx/updater git-subtree-split: a5584021435fc74a1e5da447524b37dcf7311bbc	2014-12-16 02:51:13 -08:00
Dubslow	e7cad9b942	Merge branch 'pr931'	2014-12-13 12:20:10 -06:00
Dubslow	84dea5e12c	Revert "fix #902" ... @apprb #932 This reverts commit 13306031e2.	2014-12-13 12:18:43 -06:00
Sabri	22002efc09	Huge French translation fixes	2014-12-13 09:26:37 +01:00
Dubslow	fdcb8997ce	Merge branch 'pr926'	2014-12-12 18:43: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
Dubslow	96ddde8bc1	Merge branch 'pr921'	2014-12-12 18:28:25 -06:00
novist	e2bf37c139	Light tray icon option	2014-12-12 12:12:12 +02:00
Sean	4a00125f7c	Refactor OS X updater ... Went and rewrote half of it in an actually sane manner, recursive functions > nested loops.	2014-12-11 21:29:09 -08: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
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
Dubslow	eacef9834f	Merge branch 'pr914'	2014-12-08 17:54:41 -06:00
Zetok Zalbavar	fd6608b154	Update INSTALL.md	2014-12-08 23:48:48 +00:00
Dubslow	91f99762a0	Merge branch 'pr912'	2014-12-08 15:16:46 -06: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
Lednerb	cd82ee9f11	Added translation.	2014-12-08 14:55:57 +01:00
Lednerb	cfae6104d4	Fixed language error.	2014-12-08 14:39:39 +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	9a7548fe86	Merge branch 'pr878'	2014-12-06 13:22:12 +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	b3c08f8e09	Merge branch 'pr899'	2014-12-05 17:21:23 -06:00
Dubslow	961d5830c3	add fancier tray icons with status, remove relevant option	2014-12-05 17:14:48 -06:00
Gethyn ThomasQuail	794d73a6ce	Update INSTALL.md ... Added dependency resolution for Slackware 14.1 users.	2014-12-05 07:16:04 -07:00
Dubslow	24badc0623	Merge branch 'pr894'	2014-12-04 12:39:04 -06:00
Gethyn ThomasQuail	9d75444081	Fixed up Emote button and created new images for the Volume and Mic buttons	2014-12-04 10:57:52 -07:00
Dubslow	896be2009f	Merge branch 'pr893'	2014-12-04 10:15:39 -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	e70cf97056	Merge branch 'pr887'	2014-12-02 22:01:13 -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
Dubslow	3f234fb2eb	disabling platform extensions now affects linking, and can be set from cmd line ... `qmake DISABLE_PLATFORM_EXT=YES`	2014-12-02 15:03:29 -06:00
novist	a6f3f5f169	Fixed getIdleTime() on windows	2014-12-02 15:33:53 +02:00
Ansa89	7660950133	Italian translation: update	2014-12-02 11:59:59 +01: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