Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | copy commits | Christian S | 2015-08-19 | 5 | -38/+53 |
|\ | |||||
| * | simulate old behaviour with messages being set to waiting while offline | Daniel Gultsch | 2015-08-19 | 2 | -3/+10 |
| | | |||||
| * | Merge branch 'master' into development | Daniel Gultsch | 2015-08-19 | 1 | -0/+1 |
| |\ | |||||
| | * | fixed nasty 'stuck at sending' bug that got introduced in ↵ | Daniel Gultsch | 2015-08-19 | 1 | -0/+1 |
| | | | | | | | | | | | | 32826ec29d28668b7f345ffcd45cd876dc980153 | ||||
| * | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-19 | 2 | -1/+7 |
| |\| | |||||
| | * | check if inputstream is null before cropping avatar images | Daniel Gultsch | 2015-08-19 | 1 | -0/+6 |
| | | | |||||
| | * | catch package manager has died exception | Daniel Gultsch | 2015-08-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-16 | 3 | -34/+35 |
| |\| | |||||
| | * | deal with broken frameworks | Daniel Gultsch | 2015-08-16 | 1 | -4/+1 |
| | | | |||||
| | * | catch broken base64 in avatars | Daniel Gultsch | 2015-08-16 | 1 | -5/+1 |
| | | | |||||
| | * | synchronize packetCallbacks | Daniel Gultsch | 2015-08-16 | 1 | -25/+30 |
| | | | |||||
| | * | catch null pointer in ScramSHA1 sasl | Daniel Gultsch | 2015-08-16 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #23 from kriztan/Subtitle | Christian S. | 2015-08-18 | 1 | -0/+13 |
|\ \ \ | | | | | | | | | modified strings for subtitle typing info | ||||
| * | | | add subtitle to ActionBar in chatviews | Christian S | 2015-08-18 | 3 | -4/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | * display typing information in ActionBar as subtitle for single user chats * display participants in ActionBar as subtitle for conferences | ||||
* | | | | reduced image preview size | Christian S. | 2015-08-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'siacs/development' into development | Christian S | 2015-08-15 | 7 | -86/+76 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 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 |
| | | | | |||||
* | | | | version 1.6.0 | Christian S | 2015-08-15 | 5 | -3/+29 |
|\| | | | |||||
| * | | | Merge branch 'development' | Daniel Gultsch | 2015-08-15 | 1 | -0/+10 |
| |\ \ \ | |||||
| | * | | | Display error message if all contact keys purged | Andreas Straub | 2015-08-15 | 1 | -0/+10 |
| | |/ / | |||||
| * | | | Merge branch 'development' | Daniel Gultsch | 2015-08-15 | 74 | -901/+4637 |
| |\| | | |||||
| | * | | provide extra interface to close sockets. fixes #1330 | Daniel Gultsch | 2015-08-15 | 2 | -2/+11 |
| | | | | |||||
| | * | | show HTTP upload availability on Edit account screen | hlad | 2015-08-14 | 1 | -0/+7 |
| | |/ | |||||
| * | | fixed npe in error message handling | Daniel Gultsch | 2015-07-21 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | ||||
| * | | 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 |
| | | | |||||
* | | | 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 | 15 | -145/+331 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 | 1 | -37/+58 |
| | | | |||||
| * | | fixed image preview in notfications for images that arrived over jingle | Daniel Gultsch | 2015-08-08 | 1 | -6/+4 |
| | | | |||||
| * | | renamed multi-end / axolotl to OMEMO | Daniel Gultsch | 2015-08-08 | 4 | -7/+7 |
| | | | |||||
| * | | removed dead code | Daniel Gultsch | 2015-08-08 | 1 | -10/+0 |
| | | | |||||
* | | | also hide encryption options in MUCs | Christian S | 2015-08-08 | 1 | -0/+1 |
| | | | |||||
* | | | add config option to hide all encryption modes | Christian S | 2015-08-08 | 2 | -0/+2 |
| | | | |||||
* | | | modified image preview size and avatar size | Christian S | 2015-08-08 | 1 | -4/+4 |
| | | | |||||
* | | | added one more well-known file type | Christian S | 2015-08-08 | 1 | -0/+1 |
| | | | |||||
* | | | modified settings | Christian S | 2015-08-08 | 1 | -2/+2 |
| | | | |||||
* | | | copy commits | Christian S | 2015-08-08 | 12 | -82/+178 |
|\| | |