aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * don't show empty templatesDaniel Gultsch2016-06-011-1/+3
| * display invite again menu item for offline membersDaniel Gultsch2016-06-013-1/+10
| * check if session is optionalDaniel Gultsch2016-05-311-1/+3
* | changed some folders for filesChristian Schneppe2016-05-311-16/+27
* | optimize importsChristian Schneppe2016-05-3147-99/+46
* | Merge remote-tracking branch 'refs/remotes/origin/new_version'Christian Schneppe2016-05-319-7/+222
|\ \
| * | complete backup importerChristian Schneppe2016-05-314-38/+72
| * | add database importerChristian Schneppe2016-05-316-5/+142
| * | Merge branch 'refs/heads/old_version' into new_versionChristian Schneppe2016-05-312-1/+45
| |\ \
| | * | add possibility to export database during update checkChristian Schneppe2016-05-312-1/+45
* | | | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-3113-71/+128
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | execute phone contact changes in singlethreadexecutorDaniel Gultsch2016-05-314-55/+79
| * | log failure reason in http upload on wrong response codeDaniel Gultsch2016-05-311-0/+1
| * | don't scroll to pos 0 when uuid wasn't foundDaniel Gultsch2016-05-311-4/+7
| * | version bump to 1.12.8Daniel Gultsch2016-05-302-2/+5
| * | pulled translation from transifexDaniel Gultsch2016-05-301-0/+8
| * | use whitespace as message seperatorDaniel Gultsch2016-05-301-1/+1
| * | handle app links for conferencesDaniel Gultsch2016-05-304-7/+28
| * | remove unicode control chars before sendingDaniel Gultsch2016-05-301-0/+1
* | | Merge remote-tracking branch 'origin/master'Christian Schneppe2016-05-301-0/+1
|\ \ \
| * | | Update CHANGELOG.mdChristian Schneppe2016-05-301-0/+5
| * | | version bumpChristian Schneppe2016-05-301-1/+1
| * | | changed applicationId to match nameChristian Schneppe2016-05-302-3/+3
| | |/ | |/|
* / | version 1.13.0Christian Schneppe2016-05-303-4/+9
|/ /
* | add missing tab indicatorsChristian Schneppe2016-05-303-0/+0
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-303-4/+15
|\|
| * handle app links with @ in themDaniel Gultsch2016-05-301-3/+12
| * Revert "always notify by default in conferences"Daniel Gultsch2016-05-292-1/+3
* | change uriChristian Schneppe2016-05-301-1/+1
* | start playing video directly without touching play buttonChristian Schneppe2016-05-301-0/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-296-8/+27
|\|
| * version bump to 1.12.7Daniel Gultsch2016-05-292-2/+5
| * avoid npe when sending omemo messages to groupDaniel Gultsch2016-05-291-1/+3
| * version bump to 1.12.6Daniel Gultsch2016-05-292-2/+5
| * handle app linksDaniel Gultsch2016-05-292-3/+18
| * fix creation of conferences with 1 participantDaniel Gultsch2016-05-291-2/+1
* | add missing stringChristian Schneppe2016-05-291-0/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-294-5/+14
|\|
| * version bump to 1.12.5 + changelogDaniel Gultsch2016-05-292-2/+8
| * pulled translations from transifexDaniel Gultsch2016-05-297-5/+87
| * don't merge messages over the char limitDaniel Gultsch2016-05-291-0/+1
* | let screen on while playing videos or showing imagesChristian Schneppe2016-05-291-1/+3
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-295-5/+13
|\|
| * show in ui when text was shortenedDaniel Gultsch2016-05-292-4/+2
| * limit text size in message adapter to 2k and also limit text size in conversa...Daniel Gultsch2016-05-282-4/+8
| * only rendering first 5k chars of each messageDaniel Gultsch2016-05-284-2/+8
* | set screen brightness to maximum while showing image or videoChristian Schneppe2016-05-291-0/+11
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-281-0/+1
|\|
| * explicitly include version in issue templateDaniel Gultsch2016-05-281-0/+1
* | set some default settingsChristian Schneppe2016-05-282-9/+3