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