4691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Zetok Zalbavar	983c4ff688	chore: remove not needed binary blobs and script from tools/ ... Other things in `tools/` are, or might be still needed. Closes #3103.	2016-04-05 23:07:30 +01:00
sudden6	db8bee381e	Merge pull request #3102 ... initramfs (1): refactor(video): simplifies retrieval of primary screen	2016-04-05 23:50:10 +02:00
Jason Papakostas	90874a478f	fix(Widget::updateIcons): fix the way systray icons are loaded ... the system tray should no longer use a static icon when the xdg application icons are named qtox.{png,svg} this means the workaround https://bugs.archlinux.org/task/47910 done downstream at arch linux shouldn't be necessary anymore. related discussion in #2903	2016-04-05 09:54:59 -05:00
Jason Papakostas	218228b696	feat: install icons with make install on unix ... qmake doesn't have a straightforward way to change filenames when installing files so I moved them into subfolders. issue #2903	2016-04-05 09:54:59 -05:00
initramfs	00947bc7ad	refactor(video): simplifies retrieval of primary screen ... This commit reduces primary screen retrieval to a single static field access as opposed to obtaining a runtime instance of the QApplication object	2016-04-04 23:02:54 -04:00
sudden6	20a61e4cc3	Merge pull request #3096 ... initramfs (1): fix(video): usage of invalid file descriptors on error	2016-04-04 23:49:25 +02:00
sudden6	03a1f826cb	Merge pull request #3095 ... Zetok Zalbavar (1): fix(chatform): regression in detecting `tox:` type IDs	2016-04-04 23:41:41 +02:00
sudden6	8e6bfdac99	Merge pull request #3091 ... initramfs (2): fix(video): incorrect desktop video resolution when using HiDPI fix(video): uses explicit default screen from QGuiApplication	2016-04-04 23:36:03 +02:00
initramfs	d2189f3891	fix(video): uses explicit default screen from QGuiApplication ... This commit changes the method used to obtain the active screen from simply selecting the first screen in the list to using the explicit default screen from QGuiApplication::primaryScreen() function	2016-04-04 09:06:16 -04:00
initramfs	556a8750a1	fix(video): usage of invalid file descriptors on error ... Fixes code for getDeviceModes() under vfl2 namespace where error numbers were being treated as valid file descriptors	2016-04-03 14:16:45 -04:00
initramfs	75b40d0a6f	fix(video): incorrect desktop video resolution when using HiDPI ... Fixes desktop sharing region being clipped when DPI scaling is being used.	2016-04-03 10:17:25 -04:00
Zetok Zalbavar	48f3fb7dcb	fix(chatform): regression in detecting tox: type IDs ... Introduced in d343408749 / #3044.	2016-04-03 13:28:21 +01:00
Zetok Zalbavar	dde56c99ec	Merge pull request #3077 ... Closes #3075. Andrew Morgan (1): Prevent regex capture from extended past line boundaries.	2016-04-03 13:24:51 +01:00
sudden6	b592438426	Merge pull request #3079 ... anoadragon453 (1): fix(login screen): Change text on login tooltip	2016-04-01 19:26:19 +02:00
anoadragon453	4e065f1395	fix(login screen): Change text on login tooltip	2016-03-31 08:18:20 -04:00
Zetok Zalbavar	32ed2ac0ef	docs(README.md): remove not needed link to the overlay for Gentoo ... Since qTox is available in main Gentoo repo, it makes using overlay not needed.	2016-03-31 02:22:42 +01:00
Zetok Zalbavar	af698d8537	Merge pull request #3074 ... PKEv (1): Correction Russian translation	2016-03-30 13:50:57 +01:00
Zetok Zalbavar	375c9657ce	Merge pull request #3025 ... Action messages are now italicized. Pro (1): style action messages centered and italicized	2016-03-30 08:56:22 +01:00
Pro	993232765e	style action messages centered and italicized ... no more centering remove extra spaces squash	2016-03-29 16:35:00 -07:00
sudden6	750409ae76	Merge pull request #3071 ... ProMcTagonist (3): change picture more features small border fix	2016-03-30 00:09:03 +02:00
sudden6	3a5a7b6757	Merge pull request #3073 ... Zetok Zalbavar (1): chore(merge-script): add check for number and a useful failure message	2016-03-29 23:44:57 +02:00
ProMcTagonist	ea8d31d3d5	small border fix	2016-03-29 13:32:35 -07:00
ProMcTagonist	46e8464d4f	more features	2016-03-29 12:03:11 -07:00
Andrew Morgan	2a8071da29	Prevent regex capture from extended past line boundaries.	2016-03-29 14:11:35 -04:00
PKEv	5fdbe03327	Correction Russian translation	2016-03-29 11:22:19 +03:00
Zetok Zalbavar	b9abea636e	chore(merge-script): add check for number and a useful failure message ... Message appears only if merge was unsuccessful and makes deleting as quick as copypasting. Check makes sure that supplied argument is actually an number, which helps avoid waiting for git to eror out on "no remote branch". Additionally, renamed `original` upstream to `upstream`, according to @sudden6's suggestion.	2016-03-29 01:24:01 +01:00
sudden6	791d871737	Merge pull request #3070 ... Zetok Zalbavar (1): docs(CONTRIBUTING.md): add section about commit message format	2016-03-29 01:23:15 +02:00
Zetok Zalbavar	99bf6aeec6	docs(CONTRIBUTING.md): add section about commit message format ... With a proper, (not yet) enforced commit message format qTox would get both clean commit messages and automatically generated changelog. In regard to #2887. Content of the commit taken from `CONTRIBUTING.md` @ 96e2cec95a and adjusted for qTox needs.	2016-03-29 00:20:22 +01:00
Zetok Zalbavar	8df7fbe63f	Merge pull request #3067 ... kehugter (1): Update Spanish translation	2016-03-28 19:37:30 +01:00
ProMcTagonist	084f6962d2	change picture ... #3020	2016-03-28 10:35:11 -07:00
kehugter	4bc95c8c7c	Update Spanish translation	2016-03-27 21:53:17 +02:00
sudden6	d28c371786	style: fix indentation of simple_make.sh	2016-03-27 17:12:49 +02:00
sudden6	5e0c0704cc	Merge pull request #3060 ... Flemming Richter (2): added missing dependency to libsqlcipher-dev in simple_make.sh added missing dependency to sqlcipher-devel in simple_make.sh	2016-03-27 17:09:26 +02:00
sudden6	c5ad132b02	Merge pull request #3059 ... ovalseven8 (1): Update for the German translation file	2016-03-27 17:03:04 +02:00
Flemming Richter	3804ceb9f7	added missing dependency to sqlcipher-devel in simple_make.sh	2016-03-26 19:33:38 +01:00
ovalseven8	e07d81e7c7	Update for the German translation file	2016-03-26 14:03:41 +01:00
sudden6	de4878909d	fix: Close logfile only after the disabling logging to file ... This fixes a segfault when closing qTox, because the logfile was closed before the last message was written.	2016-03-26 13:49:51 +01:00
sudden6	631c37aef1	Merge pull request #2839 ... apprb (4): Groupchats: fix user list update Grouplist: tracking of the friend's alias changing (fix: #1847) Fix #2600: Missing username in group chat Check for empty username in a groupchat	2016-03-26 12:48:17 +01:00
Flemming Richter	7896c53930	added missing dependency to libsqlcipher-dev in simple_make.sh	2016-03-26 12:17:36 +01:00
sudden6	a7ffc08cdb	fix: Make logMessageHandler thread-safe ... Make use of mutexes and atomic operations to make logging thread-safe and deadlock free.	2016-03-26 11:00:22 +01:00
sudden6	c1e2a3c5b6	fix: Deadlock while rotating logs ... based on #2974 fixes #2920	2016-03-26 11:00:22 +01:00
sudden6	0f0113e72f	Merge pull request #2994 ... Chiitoo (1): Chatlog: Adjust whitespace behaviour/handling.	2016-03-26 10:56:27 +01:00
sudden6	0330cd7627	Merge pull request #2990 ... Erik Edrosa (3): remove hard coded system tray include paths Update list of dependencies with pkg-config add ffmpeg libraries to PKGCONFIG	2016-03-26 10:45:47 +01:00
Erik Edrosa	44e7655546	add ffmpeg libraries to PKGCONFIG	2016-03-25 14:18:26 -04:00
sudden6	da2f892d63	fix #3052	2016-03-25 08:45:44 +01:00
sudden6	cda05bb772	Merge pull request #3044 ... Andrew Morgan (1): Removed uneccessary for loop in markdown and url parsing.	2016-03-24 20:44:16 +01:00
sudden6	78551e970e	Merge pull request #2978 ... sudden6 (12): Revert "Revert changes from merge of #2092 pull request" port groupinvitform to new ui fix segfaults adapt groupinviteform to existing conventions Fix notification opening wrong form notify on friendrequest and groupchat invite fix layout of friendrequest form fix segfault when logging out and in again reject multiple friend requests from one person makes https://github.com/TheSpiritXIII/qTox/commit/ fix wrong text on button fix friend request notification if friendrequestform is hidden fix notification if friendrequest tab is visible, don't display friendrequests with html	2016-03-24 20:37:35 +01:00
sudden6	875f910fb6	Merge pull request #3040 ... Zetok Zalbavar (1): fix: increase faux offline message timeout	2016-03-24 20:15:55 +01:00
sudden6	cc204a564a	Merge pull request #3048 ... Jason Papakostas (1): fix initial disabled state for "Focus window" checkbox	2016-03-24 19:57:33 +01:00
sudden6	7576216871	Merge pull request #3049 ... Jason Papakostas (1): fix sound sliders not saving when moved by keyboard	2016-03-24 19:50:38 +01:00