Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'refs/heads/old_version' into new_version | Christian Schneppe | 2016-05-31 | 2 | -1/+45 |
|\ | |||||
| * | add possibility to export database during update check | Christian Schneppe | 2016-05-31 | 2 | -1/+45 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' | Christian Schneppe | 2016-05-30 | 1 | -0/+1 |
|\ \ | |||||
| * | | Update CHANGELOG.md | Christian Schneppe | 2016-05-30 | 1 | -0/+5 |
| | | | |||||
| * | | version bump | Christian Schneppe | 2016-05-30 | 1 | -1/+1 |
| | | | |||||
| * | | changed applicationId to match name | Christian Schneppe | 2016-05-30 | 2 | -3/+3 |
| |/ | |||||
* / | version 1.13.0 | Christian Schneppe | 2016-05-30 | 3 | -4/+9 |
|/ | |||||
* | add missing tab indicators | Christian Schneppe | 2016-05-30 | 3 | -0/+0 |
| | |||||
* | 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 | 6 | -8/+27 |
|\| | |||||
| * | version bump to 1.12.7 | Daniel Gultsch | 2016-05-29 | 2 | -2/+5 |
| | | |||||
| * | avoid npe when sending omemo messages to group | Daniel Gultsch | 2016-05-29 | 1 | -1/+3 |
| | | |||||
| * | version bump to 1.12.6 | Daniel Gultsch | 2016-05-29 | 2 | -2/+5 |
| | | |||||
| * | 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 | 4 | -5/+14 |
|\| | |||||
| * | version bump to 1.12.5 + changelog | Daniel Gultsch | 2016-05-29 | 2 | -2/+8 |
| | | |||||
| * | 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 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-28 | 1 | -0/+1 |
|\| | |||||
| * | explicitly include version in issue template | Daniel Gultsch | 2016-05-28 | 1 | -0/+1 |
| | | |||||
* | | 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 |
| | | | |||||
* | | | 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 |