aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
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
| |\|
| | * 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-157-86/+76
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'depend_on_sm' into developmentDaniel Gultsch2015-08-157-86/+76
| |\ \ \ | | |_|/ | |/| |
| | * | fully depend on smDaniel Gultsch2015-08-157-86/+76
* | | | version 1.6.0Christian S2015-08-158-3/+88
|\| | |
| * | | 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-15188-1200/+5258
| |\| |
| | * | provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-152-2/+11
| | * | show HTTP upload availability on Edit account screenhlad2015-08-143-0/+28
| | |/
| * | fixed npe in error message handlingDaniel Gultsch2015-07-211-1/+1
| * | 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
* | | 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-1220-168/+357
|\ \ \ | | |/ | |/|
| * | 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
| * | fixed image preview in notfications for images that arrived over jingleDaniel Gultsch2015-08-081-6/+4
| * | decreased right hand side padding in contact keysDaniel Gultsch2015-08-081-1/+3
| * | renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-088-26/+25
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 01:07:32 +0000