aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* copy commitsChristian S2015-08-1917-193/+450
|\
| * Merge branch 'master' into developmentDaniel Gultsch2015-08-1912-151/+397
| |\
| | * pulled translations from transifexDaniel Gultsch2015-08-1912-151/+397
| * | simulate old behaviour with messages being set to waiting while offlineDaniel Gultsch2015-08-192-3/+10
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-191-0/+1
| |\|
| | * fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d28668b7f3...Daniel Gultsch2015-08-191-0/+1
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-192-1/+7
| |\|
| | * check if inputstream is null before cropping avatar imagesDaniel Gultsch2015-08-191-0/+6
| | * catch package manager has died exceptionDaniel Gultsch2015-08-191-1/+1
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-163-34/+35
| |\|
| | * increased version codeDaniel Gultsch2015-08-161-1/+1
| | * deal with broken frameworksDaniel Gultsch2015-08-161-4/+1
| | * catch broken base64 in avatarsDaniel Gultsch2015-08-161-5/+1
| | * synchronize packetCallbacksDaniel Gultsch2015-08-161-25/+30
| | * catch null pointer in ScramSHA1 saslDaniel Gultsch2015-08-161-0/+3
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 20:22:05 +0000