aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'master' of https://github.com/kriztan/Pix-Art-MessengerChristian Schneppe2016-05-201-0/+1
|\ \
| * | Version 1.12.2Christian Schneppe2016-05-201-0/+1
| | |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-2025-162/+471
|\ \ \ | |/ / |/| / | |/
| * resetting fetch status error when mutual subscription is reestablishedDaniel Gultsch2016-05-194-2/+37
| |
| * sync around individual calls instead of synchronizing entire objectDaniel Gultsch2016-05-191-49/+79
| |
| * show password dialog when account was magic createdDaniel Gultsch2016-05-194-0/+47
| |
| * access disco over caching mechanism instead of querying dbDaniel Gultsch2016-05-191-1/+1
| |
| * remove unwanted 'use previous encryption' lookupDaniel Gultsch2016-05-191-22/+1
| |
| * also save form elements in disco storageDaniel Gultsch2016-05-194-6/+64
| |
| * don't NPE on rare race condition while fetching MAMDaniel Gultsch2016-05-191-0/+9
| |