aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * 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 Menu entries addedAndreas Straub2015-07-192-0/+4
| | * CryptoNext persistance layer mockupAndreas Straub2015-07-197-65/+842
| * | 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
| * | | Merge pull request #1290 from SamWhited/accent_cabDaniel Gultsch2015-07-201-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Change CAB to accent color in v21Sam Whited2015-07-191-0/+3
| |/ /
| * | shut up linterDaniel Gultsch2015-07-191-1/+1
| * | 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-1839-8/+914
* | 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
|\|
| * bump version to 1.5.0Daniel Gultsch2015-07-181-2/+2
| * 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 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
| * version bump to 1.5.0-beta.2Daniel Gultsch2015-07-162-3/+3
| * 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
| * Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-07-161-3/+2
| |\
| | * Merge pull request #1285 from kriztan/patch-2Daniel Gultsch2015-07-161-1/+0
| | |\
| | | * fixed another typoChristian S.2015-07-161-1/+0
| | |/
| | * Merge pull request #1283 from Manouchehri/developmentDaniel Gultsch2015-07-161-1/+1
| | |\
| | | * Fixed broken URL.David Manouchehri2015-07-151-1/+1
| | * | Merge pull request #1284 from kriztan/patch-1Daniel Gultsch2015-07-161-1/+1
| | |\ \ | | | |/ | | |/|
| | | * fixed typoChristian S.2015-07-161-1/+1
| | |/
| * | made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-1628-104/+334