Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | optimize imports | Christian Schneppe | 2016-05-31 | 38 | -76/+25 |
| | |||||
* | Merge remote-tracking branch 'refs/remotes/origin/new_version' | Christian Schneppe | 2016-05-31 | 4 | -5/+192 |
|\ | |||||
| * | complete backup importer | Christian Schneppe | 2016-05-31 | 2 | -35/+65 |
| | | |||||
| * | add database importer | Christian Schneppe | 2016-05-31 | 2 | -3/+116 |
| | | |||||
| * | add possibility to export database during update check | Christian Schneppe | 2016-05-31 | 2 | -1/+45 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-31 | 10 | -66/+115 |
|\ \ | |/ |/| | |||||
| * | execute phone contact changes in singlethreadexecutor | Daniel Gultsch | 2016-05-31 | 4 | -55/+79 |
| | | |||||
| * | log failure reason in http upload on wrong response code | Daniel Gultsch | 2016-05-31 | 1 | -0/+1 |
| | | |||||
| * | don't scroll to pos 0 when uuid wasn't found | Daniel Gultsch | 2016-05-31 | 1 | -4/+7 |
| | | |||||
| * | use whitespace as message seperator | Daniel Gultsch | 2016-05-30 | 1 | -1/+1 |
| | | |||||
| * | handle app links for conferences | Daniel Gultsch | 2016-05-30 | 3 | -6/+26 |
| | | |||||
| * | remove unicode control chars before sending | Daniel Gultsch | 2016-05-30 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-30 | 3 | -4/+15 |
|\| | |||||
| * | handle app links with @ in them | Daniel Gultsch | 2016-05-30 | 1 | -3/+12 |
| | | |||||
| * | Revert "always notify by default in conferences" | Daniel Gultsch | 2016-05-29 | 2 | -1/+3 |
| | | | | | | | | | | | | This reverts commit e9494af098e6d3dad4f0a5328ae7342664ce853c. Now that new conferences are private by default this setting makes more sense | ||||
* | | change uri | Christian Schneppe | 2016-05-30 | 1 | -1/+1 |
| | | |||||
* | | start playing video directly without touching play button | Christian Schneppe | 2016-05-30 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 3 | -6/+13 |
|\| | |||||
| * | avoid npe when sending omemo messages to group | Daniel Gultsch | 2016-05-29 | 1 | -1/+3 |
| | | |||||
| * | handle app links | Daniel Gultsch | 2016-05-29 | 1 | -3/+9 |
| | | | | | | | | 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 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 1 | -0/+1 |
|\| | |||||
| * | 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 | 3 | -3/+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 | 2 | -0/+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 | 1 | -2/+2 |
| | | |||||
* | | 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 | 3 | -37/+173 |
| | | | |||||
* | | | rename share/show location layout files | Christian Schneppe | 2016-05-27 | 2 | -2/+2 |
| | | | |||||
* | | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-27 | 21 | -85/+328 |
|\| | | |||||
| * | | refactored toasts shown when adhoc creating mucs | Daniel Gultsch | 2016-05-27 | 2 | -3/+22 |
| | | | |||||
| * | | 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 | 5 | -18/+144 |
| | | | |||||
| * | | 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 | 1 | -1/+1 |
| | | |||||
| * | sending warning to receiving client if that client doesn't support omemo. | Daniel Gultsch | 2016-05-25 | 2 | -2/+14 |
| | | | | | | | | fixes #1873 |