aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | * changed file size for never from 0 to 1 to show the download button instead of link * changed resource Conversations to Pix-Art Messender
* 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 occupant
| * 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
| | | | | | | | ...in updater dialog
* | modified some stringsChristian S2015-11-152-9/+10
| | | | | | | | * added fork infos to about activity
* | 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 Execptions
| * | 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-crop
| * | 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
|/| | | | |/ /
| * | use Config.AVATAR_SIZE as size for cropping avatar picturePhilip Flohr2015-11-061-1/+1
| | |
| * | set the avatar image size to 384x384Philip Flohr2015-11-061-1/+1
| | |
| * | users are now able to crop their avatar picturesPhilip Flohr2015-11-064-17/+32
| | |
* | | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-11-071-3/+6
|\ \ \ | | |/ | |/|
| * | Move migration 19 before 17Andreas Straub2015-11-061-3/+6
| |/ | | | | | | | | | | | | | | | | Migration 17 depends on Account deserialization, so any migrations that touch the accounts table need to be applied beforehand. Re-writing the migration to work directly on the database would lead to a lot of code duplication, so it's not worth it at this time, but might become necessary later on to avoid dependency cycles.
| * updated FAQ to account for incompatible serverDaniel Gultsch2015-11-011-0/+12
| |
* | Update CHANGELOG.mdChristian S2015-11-021-0/+1
| |
* | Merge pull request #47 from siacs/masterChristian S2015-11-019-18/+72
|\| | | | | copy commits
| * don't close socket on disconnectDaniel Gultsch2015-11-011-1/+0
| |
| * indicate cbe in chat message hintDaniel Gultsch2015-10-313-3/+26
| |
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-317-16/+48
| |
* | Version bumpChristian S2015-10-312-3/+4
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-3131-109/+576
|\|
| * versrion bump to 1.7.2Daniel Gultsch2015-10-301-2/+2
| |
| * fixed session objects not being build on start upDaniel Gultsch2015-10-302-2/+1
| |
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-3011-75/+294
| |\ | | | | | | PGP messages background decryption
| | * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-282-2/+7
| | |
| | * Decrypt PGP messages in backgroundfiaxh2015-10-289-73/+287
| | |
| * | version bump to 1.7.1Daniel Gultsch2015-10-292-2/+5
| | |
| * | moved db calls made from UI into serial background threadDaniel Gultsch2015-10-291-5/+21
| | |
| * | avoid npe when checking for stream restartDaniel Gultsch2015-10-291-2/+4
| | |
| * | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-297-5/+47
| | |
| * | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2015-10-291-1/+1
| |\|
| | * Merge pull request #1523 from SamWhited/presence_sync_fixDaniel Gultsch2015-10-271-1/+1
| | |\ | | | | | | | | Don't synchronize on non-final field
| | | * Don't synchronize on non-final fieldSam Whited2015-10-261-1/+1
| | |/
| * | load avatars in message adapter in background taskDaniel Gultsch2015-10-294-17/+115
| | |