1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

2220 Commits

Author SHA1 Message Date
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
Jason Papakostas
0c67831b4e fix sound sliders not saving when moved by keyboard
closes #2866
2016-03-24 05:38:22 -05:00
Jason Papakostas
c829c24b56 fix initial disabled state for "Focus window" checkbox 2016-03-24 04:43:55 -05:00
sudden6
9a80950ac6
Fix #2161 2016-03-24 01:14:25 +01:00
sudden6
252c9c8fae
Merge pull request #2980
Michał Šrajer (4):
      fix #2976
      make fix for #2976 Qt5.3 compatible.
      fix logs and screenshots path on linux
      ensure screenshots directory exists
2016-03-23 15:49:46 +01:00
Michał Šrajer
4f32acba3e ensure screenshots directory exists 2016-03-23 12:16:38 +01:00
sudden6
6c5d70d862
Merge pull request #3033
sudden6 (1):
      update friend activity on groupchat events     fixes #2848
2016-03-23 11:55:20 +01:00
Michał Šrajer
528b0d99a2 fix logs and screenshots path on linux
The QStandardPaths generates paths with app name (qTox) subdirectory
for DataLocation and CacheLocation. No need to add '/tox'.
Both screenshots dir and log file are now in qTox dir in proper location on linux.
2016-03-23 09:56:21 +01:00
sudden6
a770b9be20
fix build on mac 2016-03-22 15:44:50 +01:00
sudden6
69424c63be
update friend activity on groupchat events
fixes #2848
2016-03-22 14:25:32 +01:00
sudden6
b6ae3d02d6
Merge pull request #3034
Zetok Zalbavar (1):
      fix: remove unnecessary qDebug call
2016-03-22 14:05:58 +01:00
sudden6
772f2c54f0
fix whitespace 2016-03-22 13:28:25 +01:00
sudden6
191aa9079f
limit webcam to 60fps 2016-03-22 13:19:31 +01:00
sudden6
46adb586c9
Coding Style fixes 2016-03-22 13:17:59 +01:00
sudden6
3f89cd95d5
Merge pull request #2867
Sean (5):
      generic pixel format selection
      Merge branch 'master' of https://github.com/seanlaguna/qTox into pixfmt
      Merge branch 'pixfmt' of https://github.com/seanlaguna/qTox into pixfmt
      tabs to spaces
      camera res option reduction

Sean Laguna (1):
      whoops, forgot an else in an else if
2016-03-22 13:13:13 +01:00
Zetok Zalbavar
66f96019cb
fix: remove unnecessary qDebug call
qTox logs shouldn't contain any info that might include even parts of
user messages/etc.
2016-03-22 10:54:59 +00:00
Andrew Morgan
04ae894fc2 Fixed HTML chars breaking recognition. 2016-03-21 22:31:23 -04:00
Sean
f595f4f817 camera res option reduction 2016-03-21 21:17:21 -05:00
Andrew Morgan
68cad0db38 Added codeblock support with ` char.
Parse markdown even if manual newline is added before or after markdown'd text. Ex: Check out my\n*skills*.

Removed extraneous debugging.

Fixed some characters accidently parsing markdown formatting, such as **vv**'

Use enum instead of magic number to check md setting.
2016-03-21 18:41:48 -04:00
kehugter
6894f0c6bc Typo and translation fix
Set `...` string as notr
Capitalise `Markdown`, is a proper noun
2016-03-13 22:36:59 +01:00
ovalseven8
bcaa041ede Make the original licence untranslateable because it should be in English 2016-03-12 17:45:22 +01:00
tux3
c3caba2e3f
Merge branch 'pr2832'
Markdown support!
2016-03-12 01:34:44 +01:00
tux3
3fbf447174
Merge branch 'pr2959' 2016-03-12 01:01:30 +01:00
tux3
9db1032e1d
Merge branch 'pr2982' 2016-03-12 00:58:24 +01:00
tux3
c474dec7c5
Merge branch 'pr2979' 2016-03-12 00:11:19 +01:00
Michał Šrajer
a4c5661443 make fix for #2976 Qt5.3 compatible. 2016-02-28 18:55:10 +01:00
Michał Šrajer
638a5f822f obey the coding style rules 2016-02-28 18:32:17 +01:00
Michał Šrajer
04b3276b0f fix 2874
when losing focus circle gets renamed unless ESC is pressed
2016-02-28 18:09:53 +01:00
Vittorio G (VittGam)
ffa0c2136e Fix toxURI parsing.
It was always eating two characters more than needed.

A toxURI passed to handleToxURI always starts with "tox:", it's checked in the handleToxURI callers. So here we need to remove that prefix, that's long 4 characters and not 6.

The previous code was meant to handle tox:// and tox: cases, but the tox:// case is invalid and should not be handled (see #2118).

Fixes: d6a0910fc8 ("fix uri parsing and tox URI detection, closes #2118")
2016-02-28 16:24:50 +01:00
Michał Šrajer
3227f6ea5b fix #2976
on linux logs goes to ~/.cache/...
and screenshots goes to ~/.local/share/...
2016-02-28 15:36:28 +01:00
Binayak Ghosh
54fabb964c fixes issue #2868 2016-02-28 17:23:15 +05:30
sudden6
685d91f0a3 Completely remove filteraudio checkbox from the ui 2016-02-27 14:59:21 +01:00
sudden6
e5cc004edf Revert "disable filteraudio, because it makes audio quality worse"
This reverts commit 17f13459b6.
2016-02-27 14:51:30 +01:00
sudden6
17f13459b6 disable filteraudio, because it makes audio quality worse 2016-02-27 12:40:36 +01:00
Nils Fenner
22b884ad7f
merge pull request #2953 from talkless:preview_click_handling 2016-02-26 16:30:13 +01:00
Kaur Männamaa
dba6ebe262
Added Estonian translation 2016-02-17 13:34:18 +00:00
Vincas Dargis
857dfbcd4c Open downloaded image with mouse click on thumbnail 2016-02-14 17:20:11 +02:00
Andrew Morgan
08e9f0b885 Use new connection syntax 2016-02-01 11:50:21 -08:00
sudden6
d22b7cb140 make qt version in about window copy paste able 2016-01-31 23:17:43 +01:00
Andrew Morgan
0120cfb9fe Fix merge issues 2016-01-30 21:46:19 -08:00
Andrew Morgan
db84074926 Markdown Preference now uses enumeration type instead of integer. 2016-01-30 21:43:58 -08:00
tux3
7a846b85e0
Merge branch 'pr2894' 2016-01-30 18:21:20 +01:00
Andrew Morgan
4c51be9a6b Changed rules to keep in line with actual markdown. Although Tox is marketed somewhat as a Skype-replacement, that doesn't mean we have to break compatibility with the rest of the web. 2016-01-29 15:17:41 -08:00
sudden6
25359d55b5 Fix proxy set only after request sent. 2016-01-30 00:15:14 +01:00
sudden6
53330daab7 toxme now supports proxies 2016-01-29 23:30:07 +01:00
Andrew Morgan
a809897850 Removed leftover debug logging. 2016-01-28 16:57:34 -08:00
Andrew Morgan
518a398ca0 Added tooltip to warn user markdown preference will not change until restart. 2016-01-28 16:43:41 -08:00
Andrew Morgan
a5f9e77a6b Changed asterisk rule to bold instead of italics. Fixed extraneous container in settings. 2016-01-28 15:30:24 -08:00
Andrew Morgan
aa5d0f660c Changed markdown settings titles 2016-01-28 15:30:24 -08:00