aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23 from kriztan/SubtitleChristian S.2015-08-1821-0/+33
|\
| * add subtitle to ActionBar in chatviewsChristian S2015-08-1823-4/+52
* | added German translation for undo stringChristian S.2015-08-161-2/+3
* | added translation for undo stringChristian S.2015-08-161-0/+1
* | reduced image preview sizeChristian S.2015-08-161-1/+1
* | Merge branch 'siacs/development' into developmentChristian S2015-08-158-88/+78
|\ \
| * | version bump to 1.7.0-alpha to start new development cycleDaniel Gultsch2015-08-151-2/+2
| * | Merge branch 'depend_on_sm' into developmentDaniel Gultsch2015-08-157-86/+76
| |\ \
| | * | fully depend on smDaniel Gultsch2015-08-157-86/+76
* | | | Update CHANGELOG.mdChristian S.2015-08-151-2/+6
* | | | version 1.6.0Christian S2015-08-159-5/+90
|\| | |
| * | | version bump to 1.6.0Daniel Gultsch2015-08-151-2/+2
| * | | Merge branch 'development'Daniel Gultsch2015-08-153-0/+48
| |\ \ \
| | * | | Update license string with librariesAndreas Straub2015-08-151-0/+4
| | * | | Display error message if all contact keys purgedAndreas Straub2015-08-153-0/+44
| | |/ /
| * | | Merge branch 'development'Daniel Gultsch2015-08-15201-1239/+6933
| |\| |
| | * | provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-152-2/+11
| | * | Merge pull request #1329 from hlad/server_info_http_uploadDaniel Gultsch2015-08-153-0/+28
| | |\ \ | | | |/ | | |/|
| | | * show HTTP upload availability on Edit account screenhlad2015-08-143-0/+28
| | |/
| * | bump to version 1.5.2Daniel Gultsch2015-07-211-2/+2
| * | fixed npe in error message handlingDaniel Gultsch2015-07-211-1/+1
| * | version bump to 1.5.1 and changelogDaniel Gultsch2015-07-212-2/+6
| * | and now do that properlyDaniel Gultsch2015-07-211-1/+1
| * | end otr session when receiving failed otr message warningsDaniel Gultsch2015-07-211-1/+7
| * | bugfix: also add no-permanent-storage to message hintsDaniel Gultsch2015-07-212-1/+2
| * | bugfix: changed condition of onOtrSessionEstablished being calledDaniel Gultsch2015-07-211-6/+6
| * | pulled new translations from transifexDaniel Gultsch2015-07-212-1/+6
| * | bugfix: don't crash if aes key could not be set before jingle transferDaniel Gultsch2015-07-211-1/+4
| * | bugfix: use sendIqPacket method in service instead of invoking XmppConnection...Daniel Gultsch2015-07-211-3/+2
| * | bugfix: accept status code 201 on http uploadDaniel Gultsch2015-07-211-1/+1
| * | Merge branch 'development'Daniel Gultsch2015-07-1877-326/+593
| |\ \
| * \ \ Merge branch 'development'Daniel Gultsch2015-07-101-0/+3
| |\ \ \
| * \ \ \ Merge branch 'development'Daniel Gultsch2015-07-1035-660/+1466
| |\ \ \ \
| * | | | | version bump to 1.4.7Daniel Gultsch2015-07-041-2/+2
| * | | | | make sure unread count is initialized as 0. fixes #1270Daniel Gultsch2015-07-031-1/+2
| * | | | | avoid very rare npeDaniel Gultsch2015-07-032-2/+4
| * | | | | moved null check for to and from in message parserDaniel Gultsch2015-07-031-5/+6
* | | | | | added 'ics' to well-known extentionsChristian S.2015-08-151-1/+3
* | | | | | rename axolotl to omemoChristian S2015-08-121-1/+1
* | | | | | version 1.6.0 beta 3Christian S2015-08-1223-170/+633
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | version bump to 1.6.0-beta.2Daniel Gultsch2015-08-111-2/+2
| * | | | | do not touch pictures that are already in the right formatDaniel Gultsch2015-08-116-51/+218
| * | | | | use same code that is used to open files for imagesDaniel Gultsch2015-08-111-4/+1
| * | | | | changed color of 'whispered' prefixDaniel Gultsch2015-08-111-2/+1
| * | | | | put wake locks on out of band file transfersDaniel Gultsch2015-08-105-25/+32
| * | | | | report wrong file size in otr encrypted jingle file transfers to be compatibl...Daniel Gultsch2015-08-103-3/+10
| * | | | | provide more detailed error toasts for http file downloadDaniel Gultsch2015-08-102-38/+61
| * | | | | Merge pull request #1324 from fiaxh/omemo_logoDaniel Gultsch2015-08-092-0/+274
| |\ \ \ \ \
| | * | | | | OMEMO logofiaxh2015-08-092-0/+274
| |/ / / / /
| * | | | | fixed image preview in notfications for images that arrived over jingleDaniel Gultsch2015-08-081-6/+4