about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #1407 from wstrm/fix-arch-zstMichael Vetter2020-07-201-2/+8
|\
| * Change to .tar.zst archives that latest Arch devtools usesWilliam Wennerström2020-07-201-2/+8
|/
* bookmark_ignore.c: use gchar instead of charMichael Vetter2020-07-201-7/+7
* Add filetype check to pre hook exampleMichael Vetter2020-07-151-1/+3
* Fix typo in commentMichael Vetter2020-07-151-1/+1
* Add comment to easily find where to put the next commandMichael Vetter2020-07-151-0/+2
* Format cmd_defsMichael Vetter2020-07-151-1942/+2037
* Remove `/tiny` commandMichael Vetter2020-07-106-217/+0
* Merge pull request #1403 from wstrm/fix-error-no-freeMichael Vetter2020-07-101-0/+4
|\
| * Free errors after they have been printedWilliam Wennerström2020-07-101-0/+4
* | Merge pull request #1402 from wstrm/add-ubuntu-ciMichael Vetter2020-07-102-0/+54
|\ \
| * | Ubuntu Latest (20.04 currently) in CIWilliam Wennerström2020-07-102-0/+54
| |/
* | Add forgotten file..Michael Vetter2020-07-101-2/+2
* | Setting: only write in console upon muc mentionMichael Vetter2020-07-104-5/+16
|/
* Merge branch 'master' of github.com:profanity-im/profanityMichael Vetter2020-07-1010-75/+148
|\
| * Merge pull request #1400 from profanity-im/feature/1399-console-hilightMichael Vetter2020-07-0910-75/+148
| |\
| | * Adapt unittestsMichael Vetter2020-07-091-3/+16
| | * Pass window to functions so we dont have to call twiceMichael Vetter2020-07-095-18/+17
| | * Dont hilight console once all messages have been readMichael Vetter2020-07-097-63/+124
* | | Merge branch 'feature/ox-discover'Michael Vetter2020-07-107-13/+308
|\ \ \ | |/ / |/| |
| * | ox review: Use english not germanMichael Vetter2020-07-101-5/+5
| * | OX: XEP-0373: OpenPGP for XMPP - Version 0.5.0 (2020-06-19)DebXWoody2020-07-107-13/+308
|/ /
* / Mention profnaity_version in release guideMichael Vetter2020-07-091-0/+1
|/
* Make _show_roster_contacts staticMichael Vetter2020-07-091-2/+2
* ci os tw: disable building of stabberMichael Vetter2020-07-081-7/+7
* readme: add link to contributing.mdMichael Vetter2020-07-071-0/+1
* Apply coding styleMichael Vetter2020-07-07213-17154/+19156
* clang-format: Dont sort includesMichael Vetter2020-07-071-0/+1
* OX: Fix testsMichael Vetter2020-07-071-1/+2
* Revert "Apply coding style"Michael Vetter2020-07-07214-19638/+17648
* Merge pull request #1397 from wstrm/doc-pre-push-hookMichael Vetter2020-07-071-1/+17
|\
| * Add highlightingWilliam Wennerström2020-07-071-2/+2
| * Tip about pre-push hook in contribution guidelinesWilliam Wennerström2020-07-071-0/+16
|/
* Add pre-commit hook clang-format exampleMichael Vetter2020-07-071-0/+11
* Apply coding styleMichael Vetter2020-07-07214-17648/+19638
* Add clang-format fileMichael Vetter2020-07-073-0/+48
* Tests: Add ox_announce_public_key stubMichael Vetter2020-07-062-0/+10
* OX: Announce public key on PEPDebXWoody2020-07-067-2/+396
* Merge pull request #1394 from wstrm/fix-log-errors-call-externalMichael Vetter2020-07-061-1/+2
|\
| * Log errors from eval_passwordWilliam Wennerström2020-07-061-1/+2
|/
* Merge branch 'master' of github.com:profanity-im/profanityMichael Vetter2020-07-062-4/+5
|\
| * Merge pull request #1386 from DebXWoody/masterMichael Vetter2020-07-062-4/+5
| |\
| | * Rework loggingStefan Kropp2020-07-032-4/+5
* | | Plain chat messages not workingDebXWoody2020-07-061-4/+9
|/ /
* | Merge branch 'master' of github.com:profanity-im/profanityMichael Vetter2020-07-041-11/+13
|\ \
| * \ Merge pull request #1387 from DebXWoody/bugfix/1332-omemoMichael Vetter2020-07-041-11/+13
| |\ \
| | * | Request Device and Key, when OMEMO is in useDebXWoody2020-06-041-11/+13
* | | | Merge branch 'omemofix'Michael Vetter2020-07-042-21/+39
|\ \ \ \ | |/ / / |/| | |
| * | | Messages are not shown in ChatSecureDebXWoody2020-07-042-21/+39
* | | | Merge pull request #1383 from profanity-im/cleanup/messagecMichael Vetter2020-07-041-116/+73
|\ \ \ \