aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * 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-247-44/+137
| |\ \
| | * | Sign empty statusfiaxh2015-11-092-3/+1
| | * | Use OpenPGP-API 9.0fiaxh2015-11-096-43/+138
| * | | PgpEngine: Get account from conversation instead of from contact. fixes #1568...fiaxh2015-11-151-3/+3
| |/ /
* | | 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
* | 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
* | 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
* | | copy Avatar Crop patchChristian S2015-11-073-16/+28
|\| |
| * | 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-063-17/+28
* | | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-11-071-3/+6
|\ \ \ | | |/ | |/|
| * | Move migration 19 before 17Andreas Straub2015-11-061-3/+6
| |/
* | Merge pull request #47 from siacs/masterChristian S2015-11-019-18/+72
|\|
| * 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-311-1/+2
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-3130-109/+573
|\|
| * 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
| |\
| | * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-282-2/+7
| | * Decrypt PGP messages in backgroundfiaxh2015-10-289-73/+287
| * | 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
| |\|
| | * 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
| * | show encryption type in warned/red messagesDaniel Gultsch2015-10-283-0/+32
| |/
| * Merge pull request #1520 from saqura/self_handle_orientationDaniel Gultsch2015-10-269-1/+57
| |\
| | * Reset the margins manually after rotatingsaqura2015-10-268-1/+53
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 01:21:07 +0000