Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | some little layout changes | Christian Schneppe | 2016-05-21 | 2 | -2/+6 |
| | |||||
* | make chatlist bigger | Christian Schneppe | 2016-05-21 | 1 | -1/+2 |
| | |||||
* | optimized gradle dependencies | Christian Schneppe | 2016-05-21 | 1 | -9/+8 |
| | |||||
* | Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger | Christian Schneppe | 2016-05-20 | 1 | -0/+1 |
|\ | |||||
| * | Version 1.12.2 | Christian Schneppe | 2016-05-20 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-20 | 25 | -162/+471 |
|\ \ | |/ |/| | |||||
| * | resetting fetch status error when mutual subscription is reestablished | Daniel Gultsch | 2016-05-19 | 4 | -2/+37 |
| | | |||||
| * | sync around individual calls instead of synchronizing entire object | Daniel Gultsch | 2016-05-19 | 1 | -49/+79 |
| | | |||||
| * | show password dialog when account was magic created | Daniel Gultsch | 2016-05-19 | 4 | -0/+47 |
| | | |||||
| * | access disco over caching mechanism instead of querying db | Daniel Gultsch | 2016-05-19 | 1 | -1/+1 |
| | | |||||
| * | remove unwanted 'use previous encryption' lookup | Daniel Gultsch | 2016-05-19 | 1 | -22/+1 |
| | | |||||
| * | also save form elements in disco storage | Daniel Gultsch | 2016-05-19 | 4 | -6/+64 |
| | | |||||
| * | don't NPE on rare race condition while fetching MAM | Daniel Gultsch | 2016-05-19 | 1 | -0/+9 |
| | | |||||
| * | synchronize around identity key generation | Daniel Gultsch | 2016-05-19 | 1 | -7/+9 |
| | | |||||
| * | improved ordering of muc participants | Daniel Gultsch | 2016-05-17 | 3 | -9/+25 |
| | | |||||
| * | refactored muc item parsing to also parse muc status messages | Daniel Gultsch | 2016-05-17 | 5 | -27/+44 |
| | | |||||
| * | offer offline members to be invited again | Daniel Gultsch | 2016-05-17 | 2 | -3/+17 |
| | | |||||
| * | change affiliation for in memory users that are currently not joined in a ↵ | Daniel Gultsch | 2016-05-16 | 4 | -7/+18 |
| | | | | | | | | conference | ||||
| * | keep conference members in memory and show them in conference details | Daniel Gultsch | 2016-05-16 | 10 | -99/+186 |
| | | |||||
| * | cap exponential backoff at 300s (10 attempts) | Daniel Gultsch | 2016-05-16 | 1 | -1/+1 |
| | | |||||
| * | cap messages after 256 lines in UI | Daniel Gultsch | 2016-05-16 | 2 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/origin/imageloader' | Christian Schneppe | 2016-05-20 | 6 | -219/+174 |
|\ \ | |||||
| * | | changed colors to standard from @color and add border to images | Christian Schneppe | 2016-05-20 | 4 | -11/+13 |
| | | | |||||
| * | | use glide as image loader and add a simple video preview | Christian Schneppe | 2016-05-20 | 3 | -231/+159 |
| | | | |||||
| * | | try out some faster image loader | Christian Schneppe | 2016-05-17 | 2 | -4/+29 |
|/ / | | | | | | | | | * picasso * glide | ||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-16 | 5 | -25/+53 |
|\| | |||||
| * | use the same typo in both saving disco and reading disco | Daniel Gultsch | 2016-05-15 | 1 | -1/+2 |
| | | |||||
| * | escape HTML in OTR messages if other client is Pidgin | Daniel Gultsch | 2016-05-15 | 2 | -4/+41 |
| | | |||||
| * | include name in locations received in MUCs | Daniel Gultsch | 2016-05-15 | 2 | -8/+12 |
| | | |||||
* | | refactored preference screen | Christian Schneppe | 2016-05-16 | 48 | -170/+165 |
| | | |||||
* | | revert checkbox meaning from chrash report | Christian Schneppe | 2016-05-16 | 1 | -3/+3 |
| | | |||||
* | | use wakelock on retrieve filesize | Christian Schneppe | 2016-05-16 | 1 | -0/+3 |
| | | |||||
* | | make "is tiping..." in bold italic | Christian Schneppe | 2016-05-16 | 2 | -0/+3 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-15 | 3 | -6/+7 |
|\| | |||||
| * | log incoming iq requests | Daniel Gultsch | 2016-05-15 | 2 | -0/+6 |
| | | |||||
| * | send caps hash in muc join | Daniel Gultsch | 2016-05-15 | 1 | -6/+1 |
| | | | | | | | | this prevents desktop clients from iq'ing use when they join | ||||
* | | fixed crash on startup | Christian Schneppe | 2016-05-15 | 1 | -6/+5 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-15 | 5 | -10/+15 |
|\| | |||||
| * | version bump to 1.12.3 + changelog | Daniel Gultsch | 2016-05-13 | 2 | -2/+8 |
| | | |||||
| * | don't show duplicate status message in contact details | Daniel Gultsch | 2016-05-13 | 1 | -3/+3 |
| | | |||||
| * | only default to omemo when all our devices support it | Daniel Gultsch | 2016-05-13 | 1 | -0/+1 |
| | | |||||
| * | do not process self presence | Daniel Gultsch | 2016-05-13 | 1 | -2/+2 |
| | | | | | | | | we don't want our own resource show up in the self contact | ||||
| * | show presence of other resources as template | Daniel Gultsch | 2016-05-13 | 6 | -6/+49 |
| | | |||||
| * | Update ISSUE_TEMPLATE.md | Daniel Gultsch | 2016-05-13 | 1 | -0/+1 |
| | | |||||
| * | create contributing guidelines | Daniel Gultsch | 2016-05-13 | 1 | -0/+11 |
| | | |||||
| * | Create issue template | Daniel Gultsch | 2016-05-13 | 1 | -0/+28 |
| | | |||||
| * | reset attempt count when reconnecting because of timeout | Daniel Gultsch | 2016-05-12 | 1 | -0/+3 |
| | | |||||
| * | interrupt XMPPConnection Thread | Daniel Gultsch | 2016-05-12 | 2 | -1/+15 |
| | | | | | | | | | | in some cases the the DNS query might take too long (even though we specified a timeout) if that happens we need a secondary solution (besides killing the socket) to stop the thread | ||||
| * | prefer IPv4 DNS servers | Daniel Gultsch | 2016-05-12 | 1 | -3/+16 |
| | | | | | | | | some devices might have problems contacting the IPv6 DNS server while in sleep mode | ||||
| * | improve keyboard handling. fixes #1387 | Daniel Gultsch | 2016-05-12 | 3 | -6/+51 |
| | | | | | | | | | | | | * start a new Conversations by pressing mod+space * automatically start searching when pressing keys in StartConversationsActivity * when hitting enter when number of search results == 1 open that conversation |