aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
| * 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-1610-99/+186
| * cap exponential backoff at 300s (10 attempts)Daniel Gultsch2016-05-161-1/+1
| * cap messages after 256 lines in UIDaniel Gultsch2016-05-162-0/+2
* | Merge remote-tracking branch 'refs/remotes/origin/imageloader'Christian Schneppe2016-05-206-219/+174
|\ \
| * | changed colors to standard from @color and add border to imagesChristian Schneppe2016-05-204-11/+13
| * | use glide as image loader and add a simple video previewChristian Schneppe2016-05-203-231/+159
| * | try out some faster image loaderChristian Schneppe2016-05-172-4/+29
|/ /
* | 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
| * escape HTML in OTR messages if other client is PidginDaniel Gultsch2016-05-152-4/+41
| * include name in locations received in MUCsDaniel Gultsch2016-05-152-8/+12
* | refactored preference screenChristian Schneppe2016-05-1648-170/+165
* | revert checkbox meaning from chrash reportChristian Schneppe2016-05-161-3/+3
* | use wakelock on retrieve filesizeChristian Schneppe2016-05-161-0/+3