Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | add subtitle to ActionBar in chatviews | Christian S | 2015-08-18 | 23 | -4/+52 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * display typing information in ActionBar as subtitle for single user chats * display participants in ActionBar as subtitle for conferences | |||||
* | | | | | added German translation for undo string | Christian S. | 2015-08-16 | 1 | -2/+3 | |
| | | | | | ||||||
* | | | | | added translation for undo string | Christian S. | 2015-08-16 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | reduced image preview size | Christian S. | 2015-08-16 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'siacs/development' into development | Christian S | 2015-08-15 | 8 | -88/+78 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | version bump to 1.7.0-alpha to start new development cycle | Daniel Gultsch | 2015-08-15 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'depend_on_sm' into development | Daniel Gultsch | 2015-08-15 | 7 | -86/+76 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | fully depend on sm | Daniel Gultsch | 2015-08-15 | 7 | -86/+76 | |
| | | | | | ||||||
* | | | | | Update CHANGELOG.md | Christian S. | 2015-08-15 | 1 | -2/+6 | |
| | | | | | ||||||
| | | | * | Merge branch 'master' of https://github.com/kriztan/Conversations | Christian S | 2015-08-15 | 0 | -0/+0 | |
| |_|_|/| |/| | | | | ||||||
| | | | * | Merge pull request #16 from kriztan/development | Christian S. | 2015-07-23 | 1 | -0/+7 | |
| | | | |\ | | | | | | | | | | | | | Update CHANGELOG.md | |||||
| | | | * \ | Merge pull request #15 from kriztan/development | Christian S. | 2015-07-23 | 165 | -992/+5697 | |
| | | | |\ \ | | | | | | | | | | | | | | | version 1.5.2 | |||||
* | | | | | | | version 1.6.0 | Christian S | 2015-08-15 | 9 | -5/+90 | |
|\| | | | | | | ||||||
| * | | | | | | version bump to 1.6.0 | Daniel Gultsch | 2015-08-15 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'development' | Daniel Gultsch | 2015-08-15 | 3 | -0/+48 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Update license string with libraries | Andreas Straub | 2015-08-15 | 1 | -0/+4 | |
| | | | | | | | | ||||||
| | * | | | | | | Display error message if all contact keys purged | Andreas Straub | 2015-08-15 | 3 | -0/+44 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge branch 'development' | Daniel Gultsch | 2015-08-15 | 201 | -1239/+6933 | |
| |\| | | | | | ||||||
| | * | | | | | provide extra interface to close sockets. fixes #1330 | Daniel Gultsch | 2015-08-15 | 2 | -2/+11 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #1329 from hlad/server_info_http_upload | Daniel Gultsch | 2015-08-15 | 3 | -0/+28 | |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | show HTTP upload availability on Edit account screen (server info) | |||||
| | | * | | | | show HTTP upload availability on Edit account screen | hlad | 2015-08-14 | 3 | -0/+28 | |
| | |/ / / / | ||||||
| * | | | | | bump to version 1.5.2 | Daniel Gultsch | 2015-07-21 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | fixed npe in error message handling | Daniel Gultsch | 2015-07-21 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | version bump to 1.5.1 and changelog | Daniel Gultsch | 2015-07-21 | 2 | -2/+6 | |
| | | | | | | ||||||
| * | | | | | and now do that properly | Daniel Gultsch | 2015-07-21 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | end otr session when receiving failed otr message warnings | Daniel Gultsch | 2015-07-21 | 1 | -1/+7 | |
| | | | | | | ||||||
| * | | | | | bugfix: also add no-permanent-storage to message hints | Daniel Gultsch | 2015-07-21 | 2 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | bugfix: changed condition of onOtrSessionEstablished being called | Daniel Gultsch | 2015-07-21 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed #1263 fixed #1260 fixed #1293 | |||||
| * | | | | | pulled new translations from transifex | Daniel Gultsch | 2015-07-21 | 2 | -1/+6 | |
| | | | | | | ||||||
| * | | | | | bugfix: don't crash if aes key could not be set before jingle transfer | Daniel Gultsch | 2015-07-21 | 1 | -1/+4 | |
| | | | | | | ||||||
| * | | | | | bugfix: use sendIqPacket method in service instead of invoking ↵ | Daniel Gultsch | 2015-07-21 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | XmppConnection directly | |||||
| * | | | | | bugfix: accept status code 201 on http upload | Daniel Gultsch | 2015-07-21 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'development' | Daniel Gultsch | 2015-07-18 | 77 | -326/+593 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'development' | Daniel Gultsch | 2015-07-10 | 1 | -0/+3 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'development' | Daniel Gultsch | 2015-07-10 | 35 | -660/+1466 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | version bump to 1.4.7 | Daniel Gultsch | 2015-07-04 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | make sure unread count is initialized as 0. fixes #1270 | Daniel Gultsch | 2015-07-03 | 1 | -1/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | avoid very rare npe | Daniel Gultsch | 2015-07-03 | 2 | -2/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | moved null check for to and from in message parser | Daniel Gultsch | 2015-07-03 | 1 | -5/+6 | |
| | | | | | | | | | ||||||
* | | | | | | | | | added 'ics' to well-known extentions | Christian S. | 2015-08-15 | 1 | -1/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | rename axolotl to omemo | Christian S | 2015-08-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | version 1.6.0 beta 3 | Christian S | 2015-08-12 | 23 | -170/+633 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| * | | | | | | | | version bump to 1.6.0-beta.2 | Daniel Gultsch | 2015-08-11 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | do not touch pictures that are already in the right format | Daniel Gultsch | 2015-08-11 | 6 | -51/+218 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed #522 | |||||
| * | | | | | | | | use same code that is used to open files for images | Daniel Gultsch | 2015-08-11 | 1 | -4/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #1323 | |||||
| * | | | | | | | | changed color of 'whispered' prefix | Daniel Gultsch | 2015-08-11 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #1326 | |||||
| * | | | | | | | | put wake locks on out of band file transfers | Daniel Gultsch | 2015-08-10 | 5 | -25/+32 | |
| | | | | | | | | | ||||||
| * | | | | | | | | report wrong file size in otr encrypted jingle file transfers to be ↵ | Daniel Gultsch | 2015-08-10 | 3 | -3/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible with conversations > 1.6 | |||||
| * | | | | | | | | provide more detailed error toasts for http file download | Daniel Gultsch | 2015-08-10 | 2 | -38/+61 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #1324 from fiaxh/omemo_logo | Daniel Gultsch | 2015-08-09 | 2 | -0/+274 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | OMEMO logo |