aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
| * handle app linksDaniel Gultsch2016-05-291-3/+9
| * fix creation of conferences with 1 participantDaniel Gultsch2016-05-291-2/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-291-0/+1
|\|
| * 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-293-3/+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-282-0/+8
* | set screen brightness to maximum while showing image or videoChristian Schneppe2016-05-291-0/+11
* | set some default settingsChristian Schneppe2016-05-281-2/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-287-24/+75
|\|
| * count xmpp uris when disableing text selectionDaniel Gultsch2016-05-281-3/+16
| * Merge branch 'master' of https://github.com/gjedeer/Conversations into gjedee...Daniel Gultsch2016-05-282-1/+6
| |\
| | * Add geo: link support in longer messagesGDR!2016-05-262-1/+6
| * | schedule first idle ping on service creationDaniel Gultsch2016-05-281-0/+4
| * | added idle ping in 10min intervalsDaniel Gultsch2016-05-282-8/+24
| * | put bug report jid in config. include package signature in reportDaniel Gultsch2016-05-283-13/+26
| * | use EOT as message seperatorDaniel Gultsch2016-05-281-1/+1
* | | integrate image- and video playerChristian Schneppe2016-05-283-37/+173
* | | rename share/show location layout filesChristian Schneppe2016-05-272-2/+2
* | | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-2721-85/+328
|\| |
| * | refactored toasts shown when adhoc creating mucsDaniel Gultsch2016-05-272-3/+22
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 16:32:00 +0000