aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* version 1.6.9-beta2Christian S2015-09-061-2/+2
* added some toasts to UpdaterActivityChristian S2015-09-063-1/+15
* disable ActionBar buttonsChristian S2015-09-061-0/+5
* refactored libsChristian S2015-09-068-0/+0
* version 1.6.9 betaChristian S2015-09-0622-15/+434
* Merge pull request #34 from siacs/masterChristian S.2015-09-058-45/+122
|\
| * add null pointer check to db migrationDaniel Gultsch2015-09-051-1/+5
| * Never build a session with oneselfAndreas Straub2015-09-053-20/+68
| * ignore timeout exceptions on secondary dns requestsDaniel Gultsch2015-09-051-9/+21
| * Issues with URLs with multiple dots in file. fixes #1373Daniel Gultsch2015-09-041-7/+15
| * invoke onEnterPressed callback only if shift is not pressedDaniel Gultsch2015-09-041-1/+1
| * minimize softkeyboard only if it has been in fullscreen modeDaniel Gultsch2015-09-041-1/+3
| * show an send button instead of the enter key in softkeyboards when enterIsSen...Daniel Gultsch2015-09-042-7/+10
* | modified publish avatar layoutChristian S2015-09-051-65/+94
* | Version 1.6.8 + ChangelogChristian S2015-09-042-2/+4
* | modified avatar size in publish avatar activityChristian S2015-09-041-1/+1
* | resize AvatarsChristian S2015-09-041-1/+1
* | 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
| * 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
|\|
| * 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
|\|
| * fixed bug that prevented newly opened conversations to load the entire histor...Daniel Gultsch2015-08-303-1/+14
| * 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
| * 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