Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #43 from siacs/master | Christian S. | 2015-10-03 | 1 | -14/+16 |
|\ | | | | | copy commits | ||||
| * | don't put conference joins into pending on initial bind | Daniel Gultsch | 2015-10-01 | 1 | -11/+14 |
| | | |||||
| * | reset muc options immediately befor join | Daniel Gultsch | 2015-10-01 | 1 | -3/+2 |
| | | |||||
* | | copy commits | Christian S | 2015-10-01 | 8 | -35/+124 |
|\| | |||||
| * | request stanza count after every ibb data stanza to not fill our own stanza ↵ | Daniel Gultsch | 2015-09-30 | 2 | -6/+9 |
| | | | | | | | | queue | ||||
| * | only invoke MTM in interactive mode after direct user input | Daniel Gultsch | 2015-09-29 | 2 | -11/+26 |
| | | | | | | | | | | | | fixes #1027 fixes #792 fixes #1439 | ||||
| * | rotate thumbnails. fixes #1438 | Daniel Gultsch | 2015-09-29 | 1 | -6/+15 |
| | | |||||
| * | fixed NPE when executing rename callback in muc | Daniel Gultsch | 2015-09-28 | 1 | -1/+3 |
| | | |||||
| * | do tab completion only if neither ctrl nor alt are being pressed | Daniel Gultsch | 2015-09-28 | 1 | -4/+4 |
| | | |||||
| * | catch rare activity not found exception when opening downloaded files | Daniel Gultsch | 2015-09-27 | 1 | -4/+9 |
| | | |||||
| * | allow tab completion in conferences | Daniel Gultsch | 2015-09-27 | 2 | -4/+59 |
| | | |||||
* | | changed theme of appupdater | Christian S | 2015-09-27 | 1 | -1/+1 |
| | | |||||
* | | updated to version 1.6.12 beta and changelog | Christian S | 2015-09-26 | 1 | -6/+2 |
| | | |||||
* | | modified read indicator a bit | Christian S | 2015-09-26 | 1 | -4/+4 |
| | | |||||
* | | copy commits | Christian S | 2015-09-26 | 15 | -11/+224 |
|\| | |||||
| * | use Conversations 1.x.y as user agent string in http upload and download | Daniel Gultsch | 2015-09-23 | 3 | -3/+6 |
| | | |||||
| * | swapped icons for foreground services | Daniel Gultsch | 2015-09-22 | 7 | -4/+3 |
| | | |||||
| * | Export logs to SD card preference | fiaxh | 2015-09-21 | 5 | -0/+178 |
| | | |||||
| * | Iterator to go through all messages of a conversation | fiaxh | 2015-09-20 | 1 | -0/+38 |
| | | |||||
* | | added blue tick as read indicator | Christian S | 2015-09-26 | 8 | -3/+17 |
| | | |||||
* | | corrected imports | Christian S | 2015-09-21 | 1 | -3/+4 |
| | | |||||
* | | made app update time configurable in config.java | Christian S | 2015-09-21 | 2 | -2/+2 |
| | | | | | | | | and increased update check time to once a day | ||||
* | | add german string for 'checking for updates' | Christian S. | 2015-09-21 | 1 | -0/+1 |
| | | |||||
* | | add string for 'checking for updates' | Christian S. | 2015-09-21 | 1 | -6/+7 |
| | | |||||
* | | disabled touch events on checking for updates | Christian S. | 2015-09-21 | 1 | -2/+15 |
| | | | | | | and fire a toast message | ||||
* | | modified AppUpdater | Christian S | 2015-09-20 | 3 | -13/+51 |
| | | |||||
* | | Version 1.6.10 | Christian S | 2015-09-20 | 3 | -45/+42 |
|\| | |||||
| * | let DnsHelper provide a fallback solution | Daniel Gultsch | 2015-09-19 | 2 | -43/+41 |
| | | |||||
| * | fixed content-type indication in http upload | Daniel Gultsch | 2015-09-19 | 1 | -1/+1 |
| | | |||||
| * | remove the from attribute from sendStartStream() fixes #1419 | Michael | 2015-09-19 | 1 | -1/+0 |
| | | |||||
* | | Start AppUpdater automatically | Christian S | 2015-09-20 | 1 | -0/+4 |
| | | |||||
* | | show the update dialog and not the whole activity | Christian S | 2015-09-20 | 2 | -10/+18 |
| | | |||||
* | | changed HTTP Upload namespace to legacy namespace | Christian S | 2015-09-18 | 1 | -1/+1 |
| | | |||||
* | | copy commits | Christian S | 2015-09-18 | 20 | -89/+145 |
|\| | |||||
| * | introduced Config variable to use legacy namespace for http upload | Daniel Gultsch | 2015-09-17 | 2 | -1/+5 |
| | | |||||
| * | be more careful when publishing device bundle | Daniel Gultsch | 2015-09-17 | 1 | -0/+14 |
| | | |||||
| * | ignore spoofed stanzas in facebook chat | Daniel Gultsch | 2015-09-17 | 1 | -1/+1 |
| | | |||||
| * | catch IndexOutOfBoundsException when swiping away conversations | Daniel Gultsch | 2015-09-17 | 1 | -1/+5 |
| | | |||||
| * | fixed rare NPE in DnsHelper. fixed spelling and added logging | Daniel Gultsch | 2015-09-17 | 1 | -5/+13 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-09-15 | 7 | -2/+30 |
| | | |||||
| * | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2015-09-15 | 1 | -0/+14 |
| |\ | |||||
| * | | added missing type='submit' to mam queries | Daniel Gultsch | 2015-09-15 | 6 | -20/+17 |
| | | | | | | | | | | | | | | | fixed some nasty inheritance problems along the way fixes #1411 | ||||
| * | | work around a NPE caused by arace condition in the http upload | Daniel Gultsch | 2015-09-15 | 1 | -3/+6 |
| | | | |||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2015-09-15 | 26 | -37/+193 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #1409 from sespivak/master | Daniel Gultsch | 2015-09-14 | 1 | -0/+14 |
| |\ \ | | |/ | |/| | some string localization for russian language | ||||
| | * | some string localization for russian language | Sergey Spivak | 2015-09-14 | 1 | -0/+14 |
| | | | |||||
| * | | pulled translations from transifex | Daniel Gultsch | 2015-09-14 | 20 | -20/+0 |
| |/ | |||||
| * | changed http upload namespace to reflect the one in the XEP | Daniel Gultsch | 2015-09-14 | 1 | -1/+1 |
| | | |||||
| * | added possibiltiy to set conferences as moderated (only visible in advanced ↵ | Daniel Gultsch | 2015-09-13 | 5 | -16/+62 |
| | | | | | | | | mode) | ||||
| * | pulled new translations from transifex | Daniel Gultsch | 2015-09-13 | 7 | -0/+116 |
| | |