aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * Fix asynchronous axolotl message sendingAndreas Straub2015-07-192-8/+27
| | * Properly track message senderAndreas Straub2015-07-193-15/+16
| | * Rework PEP content verificationAndreas Straub2015-07-192-48/+62
| | * Formatting fixesAndreas Straub2015-07-191-2/+2
| | * When receiving, add mock session if none existsAndreas Straub2015-07-191-1/+1
| | * Tag messages with originating sessionAndreas Straub2015-07-192-0/+9
| | * Fetch bundles on-demand, encrypt in backgroundAndreas Straub2015-07-195-65/+109
| | * Use bareJid for own session retrievalAndreas Straub2015-07-191-1/+1
| | * Migrate to new PEP layoutAndreas Straub2015-07-194-147/+157
| | * Formatting fixesAndreas Straub2015-07-191-22/+22
| | * Save IdentityKeys in databaseAndreas Straub2015-07-192-47/+108
| | * DatabaseBackend bugfixesAndreas Straub2015-07-191-0/+5
| | * Reformat code to use tabsAndreas Straub2015-07-1910-1115/+1115
| | * 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 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-201-3/+8
| * | Merge pull request #1289 from kriztan/patch-2Daniel Gultsch2015-07-201-0/+5
| |\ \ | | |/ | |/|
| | * show contact details in conference details ...Christian S2015-07-191-0/+5
| * | 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-182-3/+73
* | show contact details in context menu...Christian S2015-07-191-0/+5
* | Version 1.5.0Christian S2015-07-183-11/+21
|\|
| * 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-163-14/+26
|\|
| * even less jumpyDaniel Gultsch2015-07-161-1/+3
| * fixed some ux glitches in editaccountDaniel Gultsch2015-07-161-7/+9
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-1/+2
| * 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
* | 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-141-1/+1
* | deleted old filesChristian S2015-07-143-266/+0
* | Merge branch 'development' of https://github.com/siacs/Conversations into sia...Christian S2015-07-1426-401/+740
|\|
| * renamed colorsDaniel Gultsch2015-07-132-13/+9
| * 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