aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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-265-18/+144
| * 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-261-1/+1
| * 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-253-37/+43
| * 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-242-8/+18
* | 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
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-2211-49/+89
|\|
| * show hint in subject quick edit. only show subject as presetDaniel Gultsch2016-05-223-11/+20
| * show first unread message on top after reinitDaniel Gultsch2016-05-222-24/+46
| * 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-221-27/+64
* | fixed crash with videopreviews in chatlistChristian Schneppe2016-05-211-8/+26
* | show videopreview also in chatlistChristian Schneppe2016-05-211-3/+8
* | detect length of video fileChristian Schneppe2016-05-211-14/+20
* | make thumbs biggerChristian Schneppe2016-05-211-8/+8
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-2020-157/+439
|\|
| * 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-191-0/+22
| * 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
| * synchronize around identity key generationDaniel Gultsch2016-05-191-7/+9
| * improved ordering of muc participantsDaniel Gultsch2016-05-173-9/+25
| * refactored muc item parsing to also parse muc status messagesDaniel Gultsch2016-05-175-27/+44
| * offer offline members to be invited againDaniel Gultsch2016-05-172-3/+17
| * change affiliation for in memory users that are currently not joined in a con...Daniel Gultsch2016-05-164-7/+18
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-169-97/+184
| * cap exponential backoff at 300s (10 attempts)Daniel Gultsch2016-05-161-1/+1
* | changed colors to standard from @color and add border to imagesChristian Schneppe2016-05-201-4/+4
* | use glide as image loader and add a simple video previewChristian Schneppe2016-05-202-126/+56
* | try out some faster image loaderChristian Schneppe2016-05-171-4/+22
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-165-25/+53
|\|
| * use the same typo in both saving disco and reading discoDaniel Gultsch2016-05-151-1/+2