Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add menu item in account details to renew certificate | Daniel Gultsch | 2015-10-11 | 7 | -61/+228 |
| | |||||
* | make add account from key visible | Daniel Gultsch | 2015-10-11 | 1 | -1/+1 |
| | |||||
* | Clean up | Andreas Straub | 2015-10-11 | 2 | -13/+5 |
| | | | | Fixes some random linter warnings. | ||||
* | Improve InvalidJidException handling in Jid class | Andreas Straub | 2015-10-11 | 1 | -2/+2 |
| | | | | | | This code should never be triggered anway, so with this 'fix', we should at least get more meaningful stack traces. Plus, it makes the linter happy by preventing NullPointerExceptions. | ||||
* | Merge pull request #1461 from akallabeth/captcha_support | Daniel Gultsch | 2015-10-11 | 6 | -24/+238 |
|\ | | | | | Implemented account registration with captcha | ||||
| * | Captcha support. | Armin Novak | 2015-10-11 | 6 | -24/+238 |
| | | |||||
* | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2015-10-11 | 2 | -7/+5 |
|\| | |||||
| * | Merge pull request #1482 from SafwatHalaby/readme | Daniel Gultsch | 2015-10-10 | 1 | -5/+3 |
| |\ | | | | | | | Added OMEMO to Readme | ||||
| | * | Added OMEMO to Readme | Safwat Halaby | 2015-10-10 | 1 | -5/+3 |
| |/ | |||||
| * | Merge pull request #1480 from SafwatHalaby/patch-1 | Andreas Straub | 2015-10-10 | 1 | -1/+1 |
| |\ | | | | | | | Update build system in README | ||||
| | * | Update build system in README | Safwat Halaby | 2015-10-10 | 1 | -1/+1 |
| |/ | | | | | Fixes #1479. | ||||
| * | Merge pull request #1478 from SafwatHalaby/patch-1 | Daniel Gultsch | 2015-10-10 | 1 | -1/+1 |
| |\ | | | | | | | Fixed a typo in string.xml | ||||
| | * | Fixed a typo in string.xml | Safwat Halaby | 2015-10-10 | 1 | -1/+1 |
| |/ | |||||
* / | prevent null pointer when trying to display device fingerprints of not ↵ | Daniel Gultsch | 2015-10-11 | 1 | -0/+3 |
|/ | | | | existing sessions | ||||
* | initial UI work to allow setting up accounts from certifcates | Daniel Gultsch | 2015-10-09 | 8 | -44/+156 |
| | |||||
* | do not dismiss editAccountActivity when still trying to register new account | Daniel Gultsch | 2015-10-09 | 1 | -1/+3 |
| | |||||
* | catch exception when unregistering receivers that have not been registered ↵ | Daniel Gultsch | 2015-10-08 | 1 | -3/+11 |
| | | | | before | ||||
* | removed oob element from file messages | Daniel Gultsch | 2015-10-08 | 1 | -1/+0 |
| | |||||
* | introduced expert options to set status to away and xa if screen is off or ↵ | Daniel Gultsch | 2015-10-08 | 7 | -28/+122 |
| | | | | if phone is silenced | ||||
* | add xhtml image tag to unencrypted image urls. add oob tag to all files that ↵ | Daniel Gultsch | 2015-10-07 | 1 | -2/+18 |
| | | | | are on remote hosts | ||||
* | do mam query after join | Daniel Gultsch | 2015-10-06 | 1 | -1/+3 |
| | |||||
* | Use MAM for MUC initial history retrieval | saqura | 2015-10-06 | 2 | -28/+66 |
| | | | | | If the MUC supports MAM (XEP-0313), use it to retrieve the history when joining. | ||||
* | Properly check for MUC MAM support | saqura | 2015-10-06 | 1 | -6/+8 |
| | | | | | | Only use MAM (XEP-0313) in MUCs if it is supported. This should fix #1264 | ||||
* | Show whether MAM is supported in MUCs | saqura | 2015-10-06 | 3 | -2/+47 |
| | | | | | The conference details in "Advanced Mode" now indicate whether MAM is supported by the conference server. | ||||
* | changed store path for files | Daniel Gultsch | 2015-10-06 | 1 | -20/+10 |
| | |||||
* | clean up log exporting service. properly end service after exporting | Daniel Gultsch | 2015-10-06 | 1 | -102/+106 |
| | |||||
* | clear notification and activate grace period when receiving chat marker from ↵ | Daniel Gultsch | 2015-10-06 | 1 | -1/+5 |
| | | | | another instance | ||||
* | pulled translations from transifex | Daniel Gultsch | 2015-10-05 | 6 | -132/+153 |
| | |||||
* | try to catch plattform bugs | Daniel Gultsch | 2015-10-02 | 1 | -1/+6 |
| | |||||
* | increased version code | Daniel Gultsch | 2015-10-02 | 1 | -1/+1 |
| | |||||
* | properly recycle bitmaps | Daniel Gultsch | 2015-10-02 | 1 | -4/+16 |
| | |||||
* | 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 |
| | |||||
* | version bump and changelog | Daniel Gultsch | 2015-09-30 | 2 | -2/+7 |
| | |||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | Merge pull request #1426 from fiaxh/export_logs | Daniel Gultsch | 2015-09-22 | 6 | -0/+216 |
|\ | | | | | Preference to backup logs to SD card | ||||
| * | 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 |
| | | |||||
* | | version bump to 1.6.10 | Daniel Gultsch | 2015-09-20 | 2 | -2/+7 |
|/ | |||||
* | 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 |
| | |||||
* | update build tools | Daniel Gultsch | 2015-09-19 | 2 | -2/+3 |
| |