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
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
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.
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
```
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
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.
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`.
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`
