aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* also add 4 chars to filesnames during copy to private storageChristian Schneppe2016-06-041-1/+1
* check database versione before importChristian Schneppe2016-06-042-5/+11
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-045-14/+20
|\
| * trim nick from bookmark before checking if it's emptyDaniel Gultsch2016-06-031-2/+2
| * don't use a bookmarks name if it's emptyDaniel Gultsch2016-06-032-4/+7
| * throw writeexecption in downloader if flush failsDaniel Gultsch2016-06-031-7/+5
| * disconnect account in background after deletion. fixes #1861Daniel Gultsch2016-06-031-1/+6
* | add first 4 chars to file namesChristian Schneppe2016-06-043-4/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-021-2/+12
|\|
| * print specific toast when download failed because of write errorDaniel Gultsch2016-06-021-2/+12
* | changed default resource to 'mobile'Christian Schneppe2016-06-021-1/+1
* | also export database when chats are exportedChristian Schneppe2016-06-023-7/+54
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-021-1/+1
|\|
| * fixed regression that would not show clear devicesDaniel Gultsch2016-06-021-1/+1
* | changed color of lock iconChristian Schneppe2016-06-021-1/+0
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-024-7/+22
|\|
| * make grace period configurableDaniel Gultsch2016-06-023-6/+14
| * deactive grace period when receiving screen on actionDaniel Gultsch2016-06-011-1/+8
* | Share link to invite user to start over with Pix-Art MessengerChristian Schneppe2016-06-023-0/+20
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-011-0/+1
|\|
| * deactivate grace period when coming to foregroundDaniel Gultsch2016-06-011-0/+1
* | use datetime as filenameChristian Schneppe2016-06-013-11/+24
* | change AppUpdate URLChristian Schneppe2016-06-011-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-015-6/+14
|\|
| * log background msgs not foreground msgsDaniel Gultsch2016-06-011-1/+1
| * don't replace \n\t\rDaniel Gultsch2016-06-011-1/+1
| * only log inner stanza but display isCarbonDaniel Gultsch2016-06-011-1/+1
| * don't show empty templatesDaniel Gultsch2016-06-011-1/+3
| * display invite again menu item for offline membersDaniel Gultsch2016-06-011-1/+5
| * check if session is optionalDaniel Gultsch2016-05-311-1/+3
* | changed some folders for filesChristian Schneppe2016-05-311-16/+27
* | optimize importsChristian Schneppe2016-05-3138-76/+25
* | Merge remote-tracking branch 'refs/remotes/origin/new_version'Christian Schneppe2016-05-314-5/+192
|\ \
| * | complete backup importerChristian Schneppe2016-05-312-35/+65
| * | add database importerChristian Schneppe2016-05-312-3/+116
| * | add possibility to export database during update checkChristian Schneppe2016-05-312-1/+45
* | | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-3110-66/+115
|\ \ \ | |/ / |/| / | |/
| * 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
| * use whitespace as message seperatorDaniel Gultsch2016-05-301-1/+1
| * handle app links for conferencesDaniel Gultsch2016-05-303-6/+26
| * remove unicode control chars before sendingDaniel Gultsch2016-05-301-0/+1
* | 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-293-6/+13
|\|
| * avoid npe when sending omemo messages to groupDaniel Gultsch2016-05-291-1/+3