StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity
4,423 Commits 3 Branches 42 Tags 60 MiB
875f910fb6
Commit Graph

4423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Zetok Zalbavar
76d8e19320
fix: increase faux offline message timeout 
Should make problem with duplicated messages less common.
Related to #2726.
 2016-03-23 10:53:43 +00:00
sudden6
4ce3bf1290
Merge pull request #3039 
RowenStipe (4):
      Auto ver finding for lib sodium & qt + attempt to make brew less noisy
      Make update silent for travis
      Make Brew quitter: Round 3
      Applied ductile to home-brew's mouth on update
 2016-03-23 11:48:14 +01:00
sudden6
990a50f1ca
Merge pull request #3037 
Zetok Zalbavar (1):
      chore(merge-script): add a way to add optional merge message
 2016-03-23 11:45:15 +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
RowenStipe
9dd46c249b Applied ductile to home-brew's mouth on update 2016-03-22 14:36:30 -04:00
RowenStipe
ff41443b1e Make Brew quitter: Round 3 2016-03-22 14:20:05 -04:00
RowenStipe
bfe730241b Make update silent for travis 2016-03-22 14:06:18 -04:00
RowenStipe
ac72a12eb3 Auto ver finding for lib sodium & qt + attempt to make brew less noisy 2016-03-22 13:52:38 -04:00
Zetok Zalbavar
65608596d5
chore(merge-script): add a way to add optional merge message 
This allows to close related to PR issues when PR submitter forgets to
include that in commit message, or add some other additional info.

E.g. `./merge-pr.sh 3033 'Fu fu fu. :3'` would result in:
```
    Merge pull request #3033

    Fu fu fu. :3

    sudden6 (1):
          update friend activity on groupchat events     fixes #2848
```
 2016-03-22 15:13:05 +00: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
4efbda5f87
Merge pull request #3036 
Zetok Zalbavar (1):
      docs: correct info about events that update `By Activity` sorting
 2016-03-22 14:03:38 +01:00
Zetok Zalbavar
8ce9ea2eb4
docs: correct info about events that update By Activity sorting 2016-03-22 13:01:12 +00: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
sudden6
ce5cad4c0f
Merge pull request #3008 
Andrew Morgan (2):
      Added codeblock support with ` char.
      Fixed HTML chars breaking recognition.
 2016-03-22 11:38:11 +01: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
sudden6
d601a76329
Merge pull request #3031 
Zetok Zalbavar (1):
      docs: add in user manual behaviour of sorting `By Activity`
 2016-03-21 22:48:51 +01:00
sudden6
dd6dd9d71e
Merge pull request #3032 
Zetok Zalbavar (1):
      feat: disable building with filter_audio by default
 2016-03-21 22:46:46 +01:00
Zetok Zalbavar
4c63c08184
docs(INSTALL.md): update (simplify) instructions for Gentoo 
Since now ebuild is in the main Gentoo repo.
 2016-03-21 21:34:57 +00:00
Zetok Zalbavar
116cc9366c
feat: disable building with filter_audio by default 
Given that currently `filter_audio` doesn't help qTox users to improve
quality of their conversations, there's little to no point in making
qTox build with it by default. This might change when (if?)
`filter_audio` support in qTox gets improved/fixed.

BREAKING CHANGE: Disabling of `filter_audio` was done by passing
`DISABLE_FILTER_AUDIO=YES` to `qmake`. With this change `filter_audio`
is disabled by default, and in order to enable it,
`DISABLE_FILTER_AUDIO=NO` has to be passed to `qmake`.
 2016-03-21 20:19:40 +00:00
Zetok Zalbavar
558d9e1a27
docs: add in user manual behaviour of sorting By Activity 2016-03-21 20:13:50 +00:00
sudden6
d1446ae56f
Merge pull request #3029 
Zetok Zalbavar (1):
      chore: add script for creating signed merge commits
 2016-03-21 19:20:32 +01:00
Zetok Zalbavar
7c30bf6836
chore: add script for creating signed merge commits 
Merge messages are composed of PR number + appended shortlog.
Script is supposed to work only if there are no merge conflicts.

Example usage: `./merge-pr.sh 1234`
 2016-03-21 18:02:01 +00:00
Zetok Zalbavar
858c4b47fe
chore(osx): update building script to use Qt 5.6.0 2016-03-21 15:56:56 +00:00
sudden6
ccb8fb9625
Merge pull request #3000 from zetok:instructions 
docs(INSTALL.md): remove instructions for unsupported by qTox ubuntu
 2016-03-21 14:25:18 +01:00
Zetok Zalbavar
a48c422593
Merge pull request #3011 from kehugter:spanish-translation 
Update Spanish translation
 2016-03-15 00:58:32 +00:00
Zetok Zalbavar
a49496873d
Merge pull request #3012 from kehugter:typos 
Typo and translation fix
 2016-03-14 12:03:50 +00:00
Zetok Zalbavar
7ef6889485
Merge pull request #3010 from rugk:patch-issuetemplate 
Add issue template
 2016-03-14 11:58:59 +00:00
kehugter
5a865df2b9 Update Spanish translation 2016-03-13 22:46:34 +01: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
rugk
952c2fd3a9 Add issue template 2016-03-13 21:33:01 +01:00
Zetok Zalbavar
9d8561a526
Merge pull request #3001 from ovalseven8:language-de 
Update German translation
 2016-03-13 11:33:57 +00:00
Zetok Zalbavar
8258ae5e01
Merge pull request #3006 from ovalseven8:licence-translation 
Make the original licence untranslateable because it should be in English
 2016-03-13 11:00:47 +00:00
ovalseven8
386a428378 Update German translation 2016-03-12 22:05:32 +01:00