aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Added axolotl activation code to UIAndreas Straub2015-07-195-0/+80
| | * | Added PEP and message protocol layersAndreas Straub2015-07-198-8/+509
| | * | Reworked axolotl protocol layerAndreas Straub2015-07-198-95/+579
| | * | CryptoNext Menu entries addedAndreas Straub2015-07-192-0/+4
| | * | CryptoNext persistance layer mockupAndreas Straub2015-07-196-65/+841
| * | | don't show 'show contact details' context menu item when contact isn not in r...Daniel Gultsch2015-07-202-28/+33
| * | | Merge pull request #1289 from kriztan/patch-2Daniel Gultsch2015-07-202-1/+10
| |\ \ \
| | * | | show contact details in conference details ...Christian S2015-07-192-1/+10
| * | | | Change CAB to accent color in v21Sam Whited2015-07-191-0/+3
| | |/ / | |/| |
| * | | bugfix: don't crash if aes key could not be set before jingle transferDaniel Gultsch2015-07-191-1/+4
| * | | bugfix: use sendIqPacket method in service instead of invoking XmppConnection...Daniel Gultsch2015-07-191-3/+2
| * | | bugfix: accept status code 201 on http uploadDaniel Gultsch2015-07-191-1/+1
| |/ /
| * | changed switch widgetDaniel Gultsch2015-07-1832-7/+131
* | | show contact details in context menu...Christian S2015-07-192-1/+10
| |/ |/|
* | Version 1.5.0Christian S2015-07-1810-12/+36
|\|
| * pulled translationsDaniel Gultsch2015-07-187-1/+15
| * account for downloaded http files in dup checkerDaniel Gultsch2015-07-181-8/+18
| * code cleanupDaniel Gultsch2015-07-171-1/+1
| * fixed inactive http downloadDaniel Gultsch2015-07-171-1/+1
* | show contact name also in locations shared in MUCsChristian S2015-07-171-1/+13
* | Merge pull request #8 from siacs/developmentChristian S.2015-07-173-5/+3
|\|
| * show error message in account details when info has not been editedDaniel Gultsch2015-07-171-1/+1
| * increased ibb block sizeDaniel Gultsch2015-07-172-4/+2
* | copy commitsChristian S2015-07-1632-120/+362
|\|
| * version bump to 1.5.0-beta.2Daniel Gultsch2015-07-161-1/+1
| * even less jumpyDaniel Gultsch2015-07-161-1/+3
| * fixed some ux glitches in editaccountDaniel Gultsch2015-07-163-9/+9
| * removed empty translation fileDaniel Gultsch2015-07-161-2/+0
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-1628-104/+334
| * fixed some npesDaniel Gultsch2015-07-161-4/+11
* | Merge pull request #5 from siacs/developmentChristian S.2015-07-161-3/+7
|\|
| * fixed crash on invalid muc bookmarksDaniel Gultsch2015-07-151-3/+7
* | show bigger avatar in 'publish profile picture' viewChristian S.2015-07-161-3/+3
* | show bigger avatar in 'edit account' viewChristian S.2015-07-161-2/+2
* | modified swipe optionsChristian S.2015-07-141-71/+71
* | swipe only to left to close an active conversationChristian S.2015-07-141-0/+1
* | changed 'checking_image' to 'checking_file'Christian S2015-07-1421-22/+22
* | deleted old filesChristian S2015-07-143-266/+0
* | Merge branch 'development' of https://github.com/siacs/Conversations into sia...Christian S2015-07-1460-553/+894
|\|
| * renamed colorsDaniel Gultsch2015-07-1336-165/+162
| * catch exception on broken android phonesDaniel Gultsch2015-07-121-1/+7
| * made lock button reflect encryption status of the next messages instead of th...Daniel Gultsch2015-07-121-16/+10
| * only try to change affilations for known jidsDaniel Gultsch2015-07-111-1/+1
| * try to catch weird npe in android sdkDaniel Gultsch2015-07-111-0/+2
| * null check otr fingerprint before displayDaniel Gultsch2015-07-111-1/+3
| * renamed HttpConnection to HttpDownloadConnectionDaniel Gultsch2015-07-106-19/+19
| * renamed downloadable to transferableDaniel Gultsch2015-07-1014-101/+87
| * get file upload ready to work with httpsDaniel Gultsch2015-07-103-38/+53
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-107-36/+105
| * show timestamp on images in mucsDaniel Gultsch2015-07-101-1/+1