Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | 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 |
| * | fix creation of conferences with 1 participant | Daniel Gultsch | 2016-05-29 | 1 | -2/+1 |
* | | add missing string | Christian Schneppe | 2016-05-29 | 1 | -0/+1 |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 4 | -5/+14 |
|\| | |||||
| * | version bump to 1.12.5 + changelog | Daniel Gultsch | 2016-05-29 | 2 | -2/+8 |
| * | pulled translations from transifex | Daniel Gultsch | 2016-05-29 | 7 | -5/+87 |
| * | don't merge messages over the char limit | Daniel Gultsch | 2016-05-29 | 1 | -0/+1 |
* | | let screen on while playing videos or showing images | Christian Schneppe | 2016-05-29 | 1 | -1/+3 |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 5 | -5/+13 |
|\| | |||||
| * | show in ui when text was shortened | Daniel Gultsch | 2016-05-29 | 2 | -4/+2 |
| * | limit text size in message adapter to 2k and also limit text size in conversa... | Daniel Gultsch | 2016-05-28 | 2 | -4/+8 |
| * | only rendering first 5k chars of each message | Daniel Gultsch | 2016-05-28 | 4 | -2/+8 |
* | | set screen brightness to maximum while showing image or video | Christian Schneppe | 2016-05-29 | 1 | -0/+11 |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-28 | 1 | -0/+1 |
|\| | |||||
| * | explicitly include version in issue template | Daniel Gultsch | 2016-05-28 | 1 | -0/+1 |
* | | set some default settings | Christian Schneppe | 2016-05-28 | 2 | -9/+3 |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-28 | 7 | -24/+75 |
|\| | |||||
| * | count xmpp uris when disableing text selection | Daniel Gultsch | 2016-05-28 | 1 | -3/+16 |
| * | Merge branch 'master' of https://github.com/gjedeer/Conversations into gjedee... | Daniel Gultsch | 2016-05-28 | 2 | -1/+6 |
| |\ |