aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-0617-83/+155
|\
| * Merge pull request #1895 from pp3345/right-altDaniel Gultsch2016-06-051-1/+1
| |\
| | * Do not treat right alt key as a modifier for key combosYussuf Khalil2016-06-051-1/+1
| * | log all background stanzas when background logging is enabledDaniel Gultsch2016-06-054-9/+4
| * | swap sending presence and csiDaniel Gultsch2016-06-041-3/+3
| * | renamed last activity to last user interactionDaniel Gultsch2016-06-041-1/+1
| * | opt-in to send last userinteraction in presenceDaniel Gultsch2016-06-0415-71/+164
| |/
* | add permission checks to welcome activityChristian Schneppe2016-06-061-25/+45
* | fix crash in welcome screen on first startChristian Schneppe2016-06-061-1/+3
* | change default resource to mobileChristian Schneppe2016-06-042-3/+2
* | 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-046-15/+21
|\|
| * 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
| * Fix typoAndreas Straub2016-06-031-1/+1
| * 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
* | 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-3142-86/+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