aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Daniel Gultsch2016-05-282-1/+6
| |\ | | | | | | | | | gjedeer-master
| | * 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
| | | | | | | | | | | | some users or conferences might have emojis in their names
| * | 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
| | | | | | | | fixes #1873
| * 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
| | | | | | | | This reverts commit 6a6112daeb5677594ab047f6fa6fe843b1b49f0c.
* | 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
| |
| * disable stanza loggingDaniel Gultsch2016-05-211-1/+1
| |
| * update ui after affiliation changesDaniel Gultsch2016-05-212-0/+6
| |
| * refactore exceptionhandler to have one line file writerDaniel Gultsch2016-05-213-13/+16
| |
* | load address async to avoid app hang on slow networksChristian Schneppe2016-05-223-29/+70
| |
* | fixed crash with videopreviews in chatlistChristian Schneppe2016-05-211-8/+26
| |
* | delete old menu entriesChristian Schneppe2016-05-211-10/+0
| |
* | show videopreview also in chatlistChristian Schneppe2016-05-212-5/+11
| |
* | detect length of video fileChristian Schneppe2016-05-211-14/+20
| |
* | make thumbs biggerChristian Schneppe2016-05-211-8/+8
| |
* | some little layout changesChristian Schneppe2016-05-212-2/+6
| |
* | make chatlist biggerChristian Schneppe2016-05-211-1/+2
| |
* | optimized gradle dependenciesChristian Schneppe2016-05-211-9/+8
| |