aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* add first 4 chars to file namesChristian Schneppe2016-06-043-4/+4
| | | | | fixes download of multiple files within the same time becauser prosody doesn't send milliseconds
* added missing stringsChristian Schneppe2016-06-021-0/+1
|
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-022-2/+13
|\
| * print specific toast when download failed because of write errorDaniel Gultsch2016-06-022-2/+13
| |
* | 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
| |
* | modified invite user optionChristian Schneppe2016-06-022-4/+3
| |
* | changed color of lock iconChristian Schneppe2016-06-025-1/+0
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-026-7/+39
|\|
| * make grace period configurableDaniel Gultsch2016-06-026-26/+58
| |
| * deactive grace period when receiving screen on actionDaniel Gultsch2016-06-011-1/+8
| |
* | change icon for mam prefsChristian Schneppe2016-06-026-1/+1
| |
* | Share link to invite user to start over with Pix-Art MessengerChristian Schneppe2016-06-026-7/+39
| |
* | 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-017-10/+22
|\|
| * pulled translation from transifexDaniel Gultsch2016-06-012-0/+16
| |
| * 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-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-3141-83/+29
| |
* | Merge remote-tracking branch 'refs/remotes/origin/new_version'Christian Schneppe2016-05-318-5/+220
|\ \
| * | complete backup importerChristian Schneppe2016-05-314-38/+72
| | |
| * | add database importerChristian Schneppe2016-05-315-3/+140
| | |
| * | add possibility to export database during update checkChristian Schneppe2016-05-312-1/+45
| | |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-3111-67/+117
|\ \ \ | |/ / |/| / | |/
| * 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
| |
| * 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
| |
* | 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
| | | | | | | | | | | | This reverts commit e9494af098e6d3dad4f0a5328ae7342664ce853c. Now that new conferences are private by default this setting makes more sense
* | 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-294-6/+22
|\|
| * avoid npe when sending omemo messages to groupDaniel Gultsch2016-05-291-1/+3
| |
| * handle app linksDaniel Gultsch2016-05-292-3/+18
| | | | | | | | invites in the form of https://conversations/i/localpart/domainpart