aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | | Merge branch 'refs/heads/internal-Image/Video-Viewer'Christian Schneppe2016-05-287-39/+210
|\ \ \
| * | | integrate image- and video playerChristian Schneppe2016-05-287-39/+210
|/ / /
* | | hide account in create conference dialogChristian Schneppe2016-05-271-2/+4
* | | rename share/show location layout filesChristian Schneppe2016-05-274-2/+2
* | | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-2725-97/+410
|\| |
| * | pulled translations from transifexDaniel Gultsch2016-05-2727-50/+85
| * | refactored toasts shown when adhoc creating mucsDaniel Gultsch2016-05-273-5/+23
| * | use activity title 'choose participants' when doing thatDaniel Gultsch2016-05-272-0/+20
| * | use first letter to draw tiles for avatarsDaniel Gultsch2016-05-271-1/+10
| * | don't push default muc conf twiceDaniel Gultsch2016-05-273-1/+14
| * | add 'create conference' dialogDaniel Gultsch2016-05-268-20/+203
| * | show contact avatar in muc users unless that contact has its own avatarDaniel Gultsch2016-05-261-1/+1
| |/
| * make newly created conferences private by defaultDaniel Gultsch2016-05-265-10/+32
| * change hint in edit subject dialogDaniel Gultsch2016-05-262-1/+2
| * sending warning to receiving client if that client doesn't support omemo.Daniel Gultsch2016-05-252-2/+14
| * hide fingerprints in UI if encryption is disabledDaniel Gultsch2016-05-254-37/+44
| * only publish keys if omemo is enabledDaniel Gultsch2016-05-251-1/+3
| * only subscribe to omemo pep events if omemo is enabledDaniel Gultsch2016-05-251-2/+5
| * don't respond to otr messages in muc pmsDaniel Gultsch2016-05-251-4/+5
| * show regitration failed try again later in UIDaniel Gultsch2016-05-243-8/+19
* | Revert "Prevent presences from being cleared on connection"Christian Schneppe2016-05-231-1/+2
* | don't make OMEMO defaultChristian Schneppe2016-05-222-2/+5
* | catch exception on videopreviewChristian Schneppe2016-05-221-18/+22
* | deleted duplicate stringsChristian Schneppe2016-05-221-4/+0
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-2214-53/+103
|\|
| * show hint in subject quick edit. only show subject as presetDaniel Gultsch2016-05-223-11/+20
| * pulled translations from transifexDaniel Gultsch2016-05-2228-78/+143
| * show first unread message on top after reinitDaniel Gultsch2016-05-222-24/+46
| * version bump to 1.12.4 + changelogDaniel Gultsch2016-05-212-2/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 23:48:27 +0000