Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-06-02 | 6 | -7/+39 |
|\ | |||||
| * | make grace period configurable | Daniel Gultsch | 2016-06-02 | 6 | -26/+58 |
| | | |||||
| * | deactive grace period when receiving screen on action | Daniel Gultsch | 2016-06-01 | 1 | -1/+8 |
| | | |||||
* | | change icon for mam prefs | Christian Schneppe | 2016-06-02 | 6 | -1/+1 |
| | | |||||
* | | Share link to invite user to start over with Pix-Art Messenger | Christian Schneppe | 2016-06-02 | 6 | -7/+39 |
| | | |||||
* | | pushed new version | Christian Schneppe | 2016-06-01 | 2 | -6/+4 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-06-01 | 1 | -0/+1 |
|\| | |||||
| * | deactivate grace period when coming to foreground | Daniel Gultsch | 2016-06-01 | 1 | -0/+1 |
| | | |||||
* | | use datetime as filename | Christian Schneppe | 2016-06-01 | 3 | -11/+24 |
| | | |||||
* | | change AppUpdate URL | Christian Schneppe | 2016-06-01 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-06-01 | 7 | -10/+22 |
|\| | |||||
| * | pulled translation from transifex | Daniel Gultsch | 2016-06-01 | 2 | -0/+16 |
| | | |||||
| * | log background msgs not foreground msgs | Daniel Gultsch | 2016-06-01 | 1 | -1/+1 |
| | | |||||
| * | don't replace \n\t\r | Daniel Gultsch | 2016-06-01 | 1 | -1/+1 |
| | | |||||
| * | only log inner stanza but display isCarbon | Daniel Gultsch | 2016-06-01 | 1 | -1/+1 |
| | | |||||
| * | don't show empty templates | Daniel Gultsch | 2016-06-01 | 1 | -1/+3 |
| | | |||||
| * | display invite again menu item for offline members | Daniel Gultsch | 2016-06-01 | 3 | -1/+10 |
| | | |||||
| * | check if session is optional | Daniel Gultsch | 2016-05-31 | 1 | -1/+3 |
| | | |||||
* | | changed some folders for files | Christian Schneppe | 2016-05-31 | 1 | -16/+27 |
| | | |||||
* | | optimize imports | Christian Schneppe | 2016-05-31 | 47 | -99/+46 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/origin/new_version' | Christian Schneppe | 2016-05-31 | 9 | -7/+222 |
|\ \ | |||||
| * | | complete backup importer | Christian Schneppe | 2016-05-31 | 4 | -38/+72 |
| | | | |||||
| * | | add database importer | Christian Schneppe | 2016-05-31 | 6 | -5/+142 |
| | | | |||||
| * | | Merge branch 'refs/heads/old_version' into new_version | Christian Schneppe | 2016-05-31 | 2 | -1/+45 |
| |\ \ | |||||
| | * | | add possibility to export database during update check | Christian Schneppe | 2016-05-31 | 2 | -1/+45 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-31 | 13 | -71/+128 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | execute phone contact changes in singlethreadexecutor | Daniel Gultsch | 2016-05-31 | 4 | -55/+79 |
| | | | |||||
| * | | log failure reason in http upload on wrong response code | Daniel Gultsch | 2016-05-31 | 1 | -0/+1 |
| | | | |||||
| * | | don't scroll to pos 0 when uuid wasn't found | Daniel Gultsch | 2016-05-31 | 1 | -4/+7 |
| | | | |||||
| * | | version bump to 1.12.8 | Daniel Gultsch | 2016-05-30 | 2 | -2/+5 |
| | | | |||||
| * | | pulled translation from transifex | Daniel Gultsch | 2016-05-30 | 1 | -0/+8 |
| | | | |||||
| * | | use whitespace as message seperator | Daniel Gultsch | 2016-05-30 | 1 | -1/+1 |
| | | | |||||
| * | | handle app links for conferences | Daniel Gultsch | 2016-05-30 | 4 | -7/+28 |
| | | | |||||
| * | | remove unicode control chars before sending | Daniel Gultsch | 2016-05-30 | 1 | -0/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' | Christian Schneppe | 2016-05-30 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Update CHANGELOG.md | Christian Schneppe | 2016-05-30 | 1 | -0/+5 |
| | | | | |||||
| * | | | version bump | Christian Schneppe | 2016-05-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | changed applicationId to match name | Christian Schneppe | 2016-05-30 | 2 | -3/+3 |
| | |/ | |/| | |||||
* / | | version 1.13.0 | Christian Schneppe | 2016-05-30 | 3 | -4/+9 |
|/ / | |||||
* | | add missing tab indicators | Christian Schneppe | 2016-05-30 | 3 | -0/+0 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-30 | 3 | -4/+15 |
|\| | |||||
| * | handle app links with @ in them | Daniel Gultsch | 2016-05-30 | 1 | -3/+12 |
| | | |||||
| * | Revert "always notify by default in conferences" | Daniel Gultsch | 2016-05-29 | 2 | -1/+3 |
| | | | | | | | | | | | | This reverts commit e9494af098e6d3dad4f0a5328ae7342664ce853c. Now that new conferences are private by default this setting makes more sense | ||||
* | | change uri | Christian Schneppe | 2016-05-30 | 1 | -1/+1 |
| | | |||||
* | | start playing video directly without touching play button | Christian Schneppe | 2016-05-30 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 6 | -8/+27 |
|\| | |||||
| * | version bump to 1.12.7 | Daniel Gultsch | 2016-05-29 | 2 | -2/+5 |
| | | |||||
| * | avoid npe when sending omemo messages to group | Daniel Gultsch | 2016-05-29 | 1 | -1/+3 |
| | | |||||
| * | version bump to 1.12.6 | Daniel Gultsch | 2016-05-29 | 2 | -2/+5 |
| | | |||||
| * | handle app links | Daniel Gultsch | 2016-05-29 | 2 | -3/+18 |
| | | | | | | | | invites in the form of https://conversations/i/localpart/domainpart |