aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* parse vcard avatars from muc presencesDaniel Gultsch2015-12-046-181/+295
* Show status message when contact requests presenceSam Whited2015-12-043-3/+22
* fixed avatar loading for non-file urisDaniel Gultsch2015-12-042-11/+7
* users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-042-28/+6
* combine multiple message receipts into single messageDaniel Gultsch2015-12-042-12/+15
* changed method signature of calcSampleSizeDaniel Gultsch2015-12-041-1/+1
* little layout improvementsChristian S2015-11-292-4/+8
* try out a lower connection timeoutChristian S2015-11-291-1/+1
* reordered settings menuChristian S2015-11-291-18/+21
* Merge branch 'refs/heads/siacs-master' into developmentChristian S2015-11-2968-2036/+330
|\
| * copy commitsChristian S2015-11-2968-2036/+330
|/|
| * increment version codeDaniel Gultsch2015-11-261-1/+1
| * hide subject edit button if not editable by userDaniel Gultsch2015-11-264-5/+30
| * encrypt pgp messages to selfDaniel Gultsch2015-11-261-8/+8
| * detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-263-5/+49
| * version bump to 1.7.3Daniel Gultsch2015-11-261-2/+2
| * removed unnecessary configuration fetch after joinDaniel Gultsch2015-11-261-1/+1
| * removed unecessary chat stateDaniel Gultsch2015-11-261-1/+1
| * fail jingle file transfer if axolotl key message could not be created. fixes ...Daniel Gultsch2015-11-261-1/+5
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-2516-134/+91
| * Merge pull request #1569 from fiaxh/conference_one_other_occupantDaniel Gultsch2015-11-241-20/+48
| |\
| * \ Merge pull request #1558 from fiaxh/pgp_api_9.0Daniel Gultsch2015-11-2453-1875/+138
| |\ \
| | * | Sign empty statusfiaxh2015-11-092-3/+1
| | * | Use OpenPGP-API 9.0fiaxh2015-11-0952-1874/+139
| * | | Merge pull request #1570 from fiaxh/pgp_pgpengine_nullpointer_fixDaniel Gultsch2015-11-241-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | PgpEngine: Get account from conversation instead of from contact. fixes #1568...fiaxh2015-11-151-3/+3
| |/ /
* | | version 1.7.4 betaChristian S2015-11-292-2/+7
* | | typoChristian S2015-11-291-1/+1
* | | added plugin loader in settingsChristian S2015-11-251-0/+11
* | | added strings for plugin loaderChristian S2015-11-251-0/+4
* | | added German strings for plugin loaderChristian S2015-11-251-0/+4
* | | Update arrays.xmlChristian S2015-11-251-2/+2
* | | change IDENTITY_NAMEChristian S2015-11-171-1/+1
* | | Merge pull request #52 from fiaxh/conference_one_other_occupantChristian S2015-11-151-20/+48
|\ \ \ | | |/ | |/|
| * | Own contact picture in tile for conferences with only one other occupantfiaxh2015-11-151-20/+48
| |/
* | added full changelog as button...Christian S2015-11-151-1/+11
* | modified some stringsChristian S2015-11-152-9/+10
* | Version 1.7.3 + changelogChristian S2015-11-142-2/+7
* | changed message background to light yellowChristian S2015-11-142-3/+6
* | rename Conversations to Pix-Art MessengerChristian S2015-11-143-25/+26
* | delete language strings except of English and GermanChristian S2015-11-1428-10200/+0
* | show own name in sent locationsChristian S2015-11-141-0/+2
* | Version 1.7.2 + ChangelogChristian S2015-11-142-2/+6
* | added german strings for crop libraryChristian S2015-11-141-0/+5
* | Merge pull request #51 from philipflohr/masterChristian S2015-11-141-3/+34
|\ \
| * | scale the image to avoid OOM ExecptionsPhilip Flohr2015-11-131-3/+34
* | | Merge pull request #50 from philipflohr/masterChristian S2015-11-081-4/+12
|\| |
| * | don't use the imagepicker provided by android-cropPhilip Flohr2015-11-071-4/+12
* | | Merge branch 'refs/heads/philipflohr-master' into developmentChristian S2015-11-074-16/+32
|\ \ \
| * | | copy Avatar Crop patchChristian S2015-11-074-16/+32
|/| | | | |/ /