aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #33 from siacs/masterChristian S.2015-09-047-13/+25
|\
| * Ensure uris is empty before onStart adds to itAndreas Straub2015-09-021-0/+1
| | | | | | | | Fixes #1382
| * added special error state for dns timeoutDaniel Gultsch2015-09-014-4/+13
| |
| * use same method to add message hints to otr message everywhere it is neededDaniel Gultsch2015-09-012-9/+11
| |
* | Merge pull request #32 from siacs/masterChristian S.2015-09-013-1/+8
|\| | | | | update commits
| * tag axolotl messages with pretty-please-storeDaniel Gultsch2015-09-011-0/+1
| |
| * made useImageAsIs determination a bit more foolproof (samsung)Daniel Gultsch2015-08-311-1/+6
| |
| * single task mode for start conversations activityDaniel Gultsch2015-08-301-0/+1
| |
* | resize avatar image in publish profile viewChristian S2015-09-011-1/+1
| |
* | Merge pull request #31 from siacs/masterChristian S.2015-08-304-4/+22
|\| | | | | copy bugfixes
| * fixed bug that prevented newly opened conversations to load the entire ↵Daniel Gultsch2015-08-303-1/+14
| | | | | | | | history via mam. fixes #1328
| * catch invalid base64 on omemo key decodingDaniel Gultsch2015-08-301-3/+8
| |
* | Merge branch 'siacs-master' into developmentChristian S2015-08-2935-59/+135
|\ \
| * | copy commitsChristian S2015-08-2935-59/+135
|/| | | |/
| * use build in method on >= lolipop devices to discover dns serversDaniel Gultsch2015-08-282-8/+41
| |
| * version bump to 1.6.7 + changelogDaniel Gultsch2015-08-282-2/+5
| |
| * pulled updated translations from transifexDaniel Gultsch2015-08-2820-20/+7
| |
| * reformating and upper bound for waiting on stanza writerDaniel Gultsch2015-08-281-8/+16
| |
| * fixed type=timeoutDaniel Gultsch2015-08-281-0/+2
| |
| * added XEP number for http file uploadDaniel Gultsch2015-08-278-8/+41
| |
| * use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-266-9/+10
| |
| * version bump to 1.6.6 and changelogDaniel Gultsch2015-08-262-2/+5
| |
| * fixed highlight text color for white chat bubblesDaniel Gultsch2015-08-261-0/+1
| |
| * Fix error handling for announce check retrievalAndreas Straub2015-08-261-3/+3
| | | | | | | | | | Only aborts when a timeout was received. Error conditions (most notably item-not-found) are interpreted as no other devices existing.
| * explictitly handle iq timeouts in bind and session iqsDaniel Gultsch2015-08-261-2/+7
| |
* | Merge branch 'master' into developmentChristian S2015-08-261-1/+1
|\ \
| * | changed string backChristian S2015-08-261-1/+1
| | |
| * | Merge branch 'development'Christian S2015-08-2666-247/+451
| |\ \ | |/ / |/| |
* | | Merge branch 'siacs-master' into developmentChristian S2015-08-2666-247/+451
|\ \ \
| * | | Version 1.6.5Christian S2015-08-2666-247/+451
|/| | | | | |/ | |/|
| * | Only announce device after publishing bundleAndreas Straub2015-08-262-8/+19
| | |
| * | moved actual iq callback out of synchronized find callback blockDaniel Gultsch2015-08-261-3/+7
| | |
| * | be more restrictive about marking messages as sent_received in muc parserDaniel Gultsch2015-08-262-8/+18
| | |
| * | Revert "improved compatibility with muc components that change the message id"Daniel Gultsch2015-08-261-3/+2
| | | | | | | | | | | | This reverts commit df86b0fc47cb7af8e97826f97d0e202405cff414.
| * | version bump to 1.6.5 + changelogDaniel Gultsch2015-08-262-2/+5
| | |
| * | Fix key publishingAndreas Straub2015-08-261-72/+68
| | | | | | | | | | | | | | | | | | | | | Remove invalid check for result code, which prevented publishing if the node was empty to begin with. Fix pepBroken check
| * | version bump to 1.6.4 and changelogDaniel Gultsch2015-08-252-2/+7
| | |
| * | Add more logging to pep attemp counter logicAndreas Straub2015-08-251-0/+1
| | |
| * | Limit number of PEP publish triesAndreas Straub2015-08-251-9/+42
| | | | | | | | | | | | | | | | | | If PEP publish tries are repeatedly triggered by empty PEP updates, stop attempting to publish after 3 tries. This should work around broken PEP implementations in older ejabberd and OpenFire versions.
| * | Merge pull request #1365 from betheg/remove_importsDaniel Gultsch2015-08-254-30/+1
| |\ \ | | | | | | | | remove unused imports.
| | * | remove unused imports.Michael2015-08-254-30/+1
| | | |
| * | | Merge pull request #1364 from betheg/jdk15onDaniel Gultsch2015-08-251-1/+1
| |\ \ \ | | |/ / | |/| | update bcprov-jdk15on to v1.52
| | * | update bcprov-jdk15on to v1.52Michael2015-08-251-1/+1
| | | |
| * | | Pass through device IDs when updating own listAndreas Straub2015-08-251-17/+17
| | | |
| * | | cleared up some error messages in axolotl service and execute ↵Daniel Gultsch2015-08-251-3/+7
| | | | | | | | | | | | | | | | publishOwnDevicesWhenNeeded() only if processing our own jid
| * | | catch some db query exceptionsDaniel Gultsch2015-08-251-3/+5
| | | |
| * | | additonal null checks in file backendDaniel Gultsch2015-08-251-0/+3
| | | |
| * | | fixed session timeDaniel Gultsch2015-08-251-7/+2
| |/ /
| * | Merge pull request #1363 from betheg/minidnsDaniel Gultsch2015-08-251-1/+1
| |\ \ | | | | | | | | update minidns to v0.1.7
| | * | update minidns to v0.1.7Michael2015-08-251-1/+1
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 18:15:49 +0000