aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reformat code to use tabsAndreas Straub2015-07-0510-1115/+1115
* Added axolotl activation code to UIAndreas Straub2015-07-055-0/+80
* Added PEP and message protocol layersAndreas Straub2015-07-058-8/+509
* Reworked axolotl protocol layerAndreas Straub2015-07-058-95/+579
* CryptoNext Menu entries addedAndreas Straub2015-07-052-0/+4
* CryptoNext persistance layer mockupAndreas Straub2015-07-057-65/+842
* refactored sendMessage and merged with resendMessageDaniel Gultsch2015-07-052-148/+117
* 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
* Merge branch 'master' into developmentDaniel Gultsch2015-07-032-2/+3
|\
| * version bump to 1.4.61.4.6Daniel Gultsch2015-07-031-2/+2
| * added fallback for non-srv dns queriesDaniel Gultsch2015-07-031-0/+1
* | fixed share with activity to account for http file uploadDaniel Gultsch2015-07-022-43/+38
* | also offer http download for some 'well known extensions'Daniel Gultsch2015-07-022-1/+4
* | refactored message context menuDaniel Gultsch2015-07-025-43/+53
* | moved null check for to and from in message parserDaniel Gultsch2015-07-021-5/+6
* | changed mime type handlingDaniel Gultsch2015-07-017-54/+555
* | Merge branch 'feature/http_upload' into developmentDaniel Gultsch2015-06-3022-232/+475
|\ \
| * | disable automatic aes encryption for the time beingDaniel Gultsch2015-06-301-1/+1
| * | changed namespace of the http upload featureDaniel Gultsch2015-06-301-1/+1
| * | made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-309-69/+74
| * | made storage path decision entirely based upon file extensionDaniel Gultsch2015-06-301-2/+4
| * | refactored bodyContainsDownloadable to be more flexibleDaniel Gultsch2015-06-305-37/+39
| * | always show copy original url in context menu when url is availableDaniel Gultsch2015-06-301-2/+1
| * | untested pgp support for http uploadDaniel Gultsch2015-06-292-6/+31
| * | added trigger to Config.java to always enable aes encryption for uploaded filesDaniel Gultsch2015-06-292-0/+15
| * | make quick actions available in conferences when file attachment is availableDaniel Gultsch2015-06-291-23/+28
| * | show attach button in conferences when http upload is availableDaniel Gultsch2015-06-294-7/+14
| * | initial http upload supportDaniel Gultsch2015-06-2914-95/+278
| |/
* / updated changelogDaniel Gultsch2015-06-291-0/+7
|/
* version bump to 1.4.51.4.5Daniel Gultsch2015-06-291-2/+2
* don't parse body from muc status messagesDaniel Gultsch2015-06-281-6/+7
* fixed parsing of muc status messages in new message parserDaniel Gultsch2015-06-281-6/+18
* pulled new translations from transifexDaniel Gultsch2015-06-232-3/+20
* Merge branch 'development'1.4.4Daniel Gultsch2015-06-2368-803/+985
|\
| * don't perform dns lookups on domain parts that obviously look like ip addressesDaniel Gultsch2015-06-192-53/+67
| * changed paragraph dividerDaniel Gultsch2015-06-101-1/+1
| * pulled new translations from transifexDaniel Gultsch2015-06-102-0/+10
| * made i/o and memory intensive operations execute in serial orderDaniel Gultsch2015-06-052-11/+52
| * version bumpDaniel Gultsch2015-06-041-2/+2
| * fixed obvious bug in dns helperDaniel Gultsch2015-06-041-2/+2
| * streamlined dns helper by ignoring weightDaniel Gultsch2015-06-041-55/+10
| * send_received muc messages will mark a conversation a readDaniel Gultsch2015-06-041-1/+1
| * reworked handeling of system contactsDaniel Gultsch2015-06-034-32/+51
| * properly calculate remaining size. should fix #1243Daniel Gultsch2015-06-031-2/+7
| * really update build toolsDaniel Gultsch2015-06-023-3/+3
| * upgrade build toolsDaniel Gultsch2015-06-021-2/+0
| * avoid unnessary muc mam queries when message count is 0 after subjectDaniel Gultsch2015-06-022-1/+7
| * stick with 1.4.xDaniel Gultsch2015-06-021-1/+1