Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 4 | -6/+22 |
|\ | |||||
| * | avoid npe when sending omemo messages to group | Daniel Gultsch | 2016-05-29 | 1 | -1/+3 |
| | | |||||
| * | handle app links | Daniel Gultsch | 2016-05-29 | 2 | -3/+18 |
| | | | | | | | | invites in the form of https://conversations/i/localpart/domainpart | ||||
| * | fix creation of conferences with 1 participant | Daniel Gultsch | 2016-05-29 | 1 | -2/+1 |
| | | |||||
* | | add missing string | Christian Schneppe | 2016-05-29 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 2 | -3/+5 |
|\| | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-05-29 | 7 | -5/+87 |
| | | |||||
| * | don't merge messages over the char limit | Daniel Gultsch | 2016-05-29 | 1 | -0/+1 |
| | | |||||
* | | let screen on while playing videos or showing images | Christian Schneppe | 2016-05-29 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 5 | -5/+13 |
|\| | |||||
| * | show in ui when text was shortened | Daniel Gultsch | 2016-05-29 | 2 | -4/+2 |
| | | |||||
| * | limit text size in message adapter to 2k and also limit text size in ↵ | Daniel Gultsch | 2016-05-28 | 2 | -4/+8 |
| | | | | | | | | conversations adapter | ||||
| * | only rendering first 5k chars of each message | Daniel Gultsch | 2016-05-28 | 4 | -2/+8 |
| | | |||||
* | | set screen brightness to maximum while showing image or video | Christian Schneppe | 2016-05-29 | 1 | -0/+11 |
| | | |||||
* | | set some default settings | Christian Schneppe | 2016-05-28 | 2 | -9/+3 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-28 | 7 | -24/+75 |
|\| | |||||
| * | count xmpp uris when disableing text selection | Daniel Gultsch | 2016-05-28 | 1 | -3/+16 |
| | | |||||
| * | Merge branch 'master' of https://github.com/gjedeer/Conversations into ↵ | Daniel Gultsch | 2016-05-28 | 2 | -1/+6 |
| |\ | | | | | | | | | | gjedeer-master | ||||
| | * | Add geo: link support in longer messages | GDR! | 2016-05-26 | 2 | -1/+6 |
| | | | |||||
| * | | schedule first idle ping on service creation | Daniel Gultsch | 2016-05-28 | 1 | -0/+4 |
| | | | |||||
| * | | added idle ping in 10min intervals | Daniel Gultsch | 2016-05-28 | 2 | -8/+24 |
| | | | |||||
| * | | put bug report jid in config. include package signature in report | Daniel Gultsch | 2016-05-28 | 3 | -13/+26 |
| | | | |||||
| * | | use EOT as message seperator | Daniel Gultsch | 2016-05-28 | 1 | -1/+1 |
| | | | |||||
* | | | integrate image- and video player | Christian Schneppe | 2016-05-28 | 6 | -37/+201 |
| | | | |||||
* | | | 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 | 12 | -51/+97 |
|\| | |||||
| * | 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 |
| | |