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
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
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
ovalseven8
bcaa041ede
Make the original licence untranslateable because it should be in English
2016-03-12 17:45:22 +01:00
Zetok Zalbavar
a48b424f11
docs(INSTALL.md): remove instructions for unsupported by qTox ubuntu
2016-03-12 09:52:22 +00:00
tux3
e37e87d688
Merge branch 'stable'
...
This updates master's tag to 1.3.0+
2016-03-12 02:26:17 +01:00
tux3
c3caba2e3f
Merge branch 'pr2832'
...
Markdown support!
2016-03-12 01:34:44 +01:00
tux3
48d14be564
Merge branch 'pr2993'
2016-03-12 01:12:57 +01:00
tux3
dd8a30f4ee
Merge branch 'pr2992'
2016-03-12 01:11:48 +01:00
tux3
771db5c9b8
Merge branch 'pr2986'
2016-03-12 01:04:50 +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
b69042ec40
qTox 1.3.0 release
...
All:
- New and improved sound code
- New HTTPS ToxMe protocol support
- Translation updates
- Miscellaneous fixes and polishing
OSX:
- Video!
Windows:
- Updater now works better with Portable mode
2016-03-12 00:33:16 +01:00
tux3
c474dec7c5
Merge branch 'pr2979'
2016-03-12 00:11:19 +01:00
tux3
318de322bf
Fix #2849
...
Make the auto-updater aware of portable mode
2016-03-11 23:27:56 +01:00
Erik Edrosa
1ebe2a62df
add PREFIX variable
2016-03-07 22:44:10 -05:00
Corey Sheldon
5dbb2e34fa
Update INSTALL.md
2016-03-07 20:58:55 -05:00
Corey Sheldon
964252dfa7
Correcting a install command --Fedora
...
dnf group install != dnf groupinstall (the former will fail to install, it shows the packages but silently fails with `Nothing to Do` \n `Complete!`
2016-03-07 20:57:49 -05:00
minj
137bd242e1
fix Lithuanian translation
...
a mix up caused by tux3#2985
2016-03-01 21:19:06 +02:00
Michał Šrajer
638a5f822f
obey the coding style rules
2016-02-28 18:32:17 +01:00
