Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'refs/heads/internal-Image/Video-Viewer' | Christian Schneppe | 2016-05-28 | 7 | -39/+210 |
|\ | |||||
| * | integrate image- and video player | Christian Schneppe | 2016-05-28 | 7 | -39/+210 |
|/ | |||||
* | hide account in create conference dialog | Christian Schneppe | 2016-05-27 | 1 | -2/+4 |
| | |||||
* | rename share/show location layout files | Christian Schneppe | 2016-05-27 | 4 | -2/+2 |
| | |||||
* | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-27 | 25 | -97/+410 |
|\ | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-05-27 | 27 | -50/+85 |
| | | |||||
| * | refactored toasts shown when adhoc creating mucs | Daniel Gultsch | 2016-05-27 | 3 | -5/+23 |
| | | |||||
| * | use activity title 'choose participants' when doing that | Daniel Gultsch | 2016-05-27 | 2 | -0/+20 |
| | | |||||
| * | use first letter to draw tiles for avatars | Daniel Gultsch | 2016-05-27 | 1 | -1/+10 |
| | | | | | | | | some users or conferences might have emojis in their names | ||||
| * | don't push default muc conf twice | Daniel Gultsch | 2016-05-27 | 3 | -1/+14 |
| | | |||||
| * | add 'create conference' dialog | Daniel Gultsch | 2016-05-26 | 8 | -20/+203 |
| | | |||||
| * | show contact avatar in muc users unless that contact has its own avatar | Daniel Gultsch | 2016-05-26 | 1 | -1/+1 |
| | | |||||
| * | make newly created conferences private by default | Daniel Gultsch | 2016-05-26 | 5 | -10/+32 |
| | | |||||
| * | change hint in edit subject dialog | Daniel Gultsch | 2016-05-26 | 2 | -1/+2 |
| | | |||||
| * | sending warning to receiving client if that client doesn't support omemo. | Daniel Gultsch | 2016-05-25 | 2 | -2/+14 |
| | | | | | | | | fixes #1873 | ||||
| * | hide fingerprints in UI if encryption is disabled | Daniel Gultsch | 2016-05-25 | 4 | -37/+44 |
| | | |||||
| * | only publish keys if omemo is enabled | Daniel Gultsch | 2016-05-25 | 1 | -1/+3 |
| | | |||||
| * | only subscribe to omemo pep events if omemo is enabled | Daniel Gultsch | 2016-05-25 | 1 | -2/+5 |
| | | |||||
| * | don't respond to otr messages in muc pms | Daniel Gultsch | 2016-05-25 | 1 | -4/+5 |
| | | |||||
| * | show regitration failed try again later in UI | Daniel Gultsch | 2016-05-24 | 3 | -8/+19 |
| | | |||||
* | | Revert "Prevent presences from being cleared on connection" | Christian Schneppe | 2016-05-23 | 1 | -1/+2 |
| | | | | | | | | This reverts commit 6a6112daeb5677594ab047f6fa6fe843b1b49f0c. | ||||
* | | don't make OMEMO default | Christian Schneppe | 2016-05-22 | 2 | -2/+5 |
| | | |||||
* | | catch exception on videopreview | Christian Schneppe | 2016-05-22 | 1 | -18/+22 |
| | | |||||
* | | deleted duplicate strings | Christian Schneppe | 2016-05-22 | 1 | -4/+0 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-22 | 14 | -53/+103 |
|\| | |||||
| * | show hint in subject quick edit. only show subject as preset | Daniel Gultsch | 2016-05-22 | 3 | -11/+20 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-05-22 | 28 | -78/+143 |
| | | |||||
| * | show first unread message on top after reinit | Daniel Gultsch | 2016-05-22 | 2 | -24/+46 |
| | | |||||
| * | version bump to 1.12.4 + changelog | Daniel Gultsch | 2016-05-21 | 2 | -2/+6 |
| | | |||||
| * | disable stanza logging | Daniel Gultsch | 2016-05-21 | 1 | -1/+1 |
| | | |||||
| * | update ui after affiliation changes | Daniel Gultsch | 2016-05-21 | 2 | -0/+6 |
| | | |||||
| * | refactore exceptionhandler to have one line file writer | Daniel Gultsch | 2016-05-21 | 3 | -13/+16 |
| | | |||||
* | | load address async to avoid app hang on slow networks | Christian Schneppe | 2016-05-22 | 3 | -29/+70 |
| | | |||||
* | | fixed crash with videopreviews in chatlist | Christian Schneppe | 2016-05-21 | 1 | -8/+26 |
| | | |||||
* | | delete old menu entries | Christian Schneppe | 2016-05-21 | 1 | -10/+0 |
| | | |||||
* | | show videopreview also in chatlist | Christian Schneppe | 2016-05-21 | 2 | -5/+11 |
| | | |||||
* | | detect length of video file | Christian Schneppe | 2016-05-21 | 1 | -14/+20 |
| | | |||||
* | | make thumbs bigger | Christian Schneppe | 2016-05-21 | 1 | -8/+8 |
| | | |||||
* | | 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 |
| | |