aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | basic last seen feature. no peristancy just yet. no polishiNPUTmice2014-06-069-380/+556
|/ / /
* / / read marker is now a little less in your faceiNPUTmice2014-06-052-30/+4
|/ /
* | image provider path name now with .webp endingiNPUTmice2014-06-042-3/+6
* | experimental gui to display read statusiNPUTmice2014-06-043-11/+122
* | fixed regression with newly created conversations not being shown properlyiNPUTmice2014-06-041-1/+2
* | received and displayed messages (xep 333) are now marked properlyiNPUTmice2014-06-0410-67/+116
* | more bug fixes for the pgp problemiNPUTmice2014-06-041-49/+73
* | fixed pgp on incoming carbon messagesiNPUTmice2014-06-042-19/+17
* | Merge branch 'feature/xep-0333' into developmentiNPUTmice2014-06-035-16/+76
|\ \
| * | answer to xep 184 message receipts. fixes #95iNPUTmice2014-06-035-16/+76
* | | Merge pull request #176 from imaginator/patch-1Daniel Gultsch2014-06-031-1/+1
|\ \ \ | |/ / |/| |
| * | small typeSimon Tennant2014-06-031-1/+1
|/ /
* | version bump to 0.30.3iNPUTmice2014-06-032-2/+4
* | added pgp sig on muc renameiNPUTmice2014-06-031-3/+9
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-06-028-8/+8
|\ \
| * \ Merge pull request #169 from alethea/self-typoDaniel Gultsch2014-06-028-8/+8
| |\ \
| | * | Fixed typo in source "sefl" -> "self"Alethea Rose Butler2014-06-018-8/+8
| |/ /
* / / long press on images revails share with intentiNPUTmice2014-06-021-0/+13
|/ /
* | version bump0.3-betaiNPUTmice2014-06-011-2/+2
* | updated changelog and readme for the 0.3 releaseiNPUTmice2014-06-012-0/+20
* | linked openkeychain install dialog from decrypt messages boxiNPUTmice2014-06-011-49/+62
* | changed roster to concurrent hashmapiNPUTmice2014-06-011-2/+2
* | unified crypto messages and made lock icon work for conferencesiNPUTmice2014-06-013-23/+18
* | added warning when public keys are missingiNPUTmice2014-06-012-0/+7
* | Merge pull request #168 from strb/muciconsDaniel Gultsch2014-06-011-1/+1
|\ \
| * | Fix tile rendering for larger conferencesAndreas Straub2014-06-011-1/+1
|/ /
* | show dialog when no contact in a muc has pgp supportiNPUTmice2014-06-014-6/+44
* | OpenPGP key display in muc details is now prettier and linked to openkeychainiNPUTmice2014-06-013-9/+46
* | Merge pull request #167 from alethea/up-navigationDaniel Gultsch2014-06-013-8/+24
|\ \
| * | Removed TASK_ON_HOME flag from intent created from shareAlethea Butler2014-05-311-1/+3
| * | Made the navigateUp override behave like a navigate upAlethea Butler2014-05-311-1/+9
| * | Refactored into onNavigateUpAlethea Butler2014-05-311-6/+11
| * | Made ConversationActivity singleTaskAlethea Butler2014-05-311-1/+2
|/ /
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-05-3114-69/+113
|\ \
| * \ Merge pull request #164 from alethea/developmentDaniel Gultsch2014-05-313-0/+11
| |\ \
| | * | Up button goes to contacts after initial setupAlethea Butler2014-05-301-0/+6
| | * | Disabled the Home button when it's not the Up buttonAlethea Butler2014-05-303-0/+5
| * | | Merge pull request #165 from alethea/openpgp-capitalizationDaniel Gultsch2014-05-317-39/+39
| |\ \ \ | | |/ / | |/| |
| | * | Capitalized openPGP -> OpenPGPAlethea Butler2014-05-317-39/+39
| |/ /
| * | Merge pull request #153 from 9034725985/patch-1Daniel Gultsch2014-05-301-1/+1
| |\ \
| | * | Update README.mdKushal2014-05-261-1/+1
| * | | Merge pull request #160 from alethea/developmentDaniel Gultsch2014-05-301-2/+2
| |\ \ \
| | * | | Changed "unsuccessful delivery" to "delivery failed"Alethea Butler2014-05-301-1/+1
| | * | | Added question mark to remove_contact_textAlethea Butler2014-05-301-1/+1
| * | | | Merge pull request #157 from kruks23/developmentDaniel Gultsch2014-05-306-27/+60
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | More harcoded translations + updated Spanishkruks232014-05-296-27/+60
| |/ / /
* / / / fixed regression that led to the wakelock not being released againiNPUTmice2014-05-311-1/+1
|/ / /
* | | display pgp key id in muc details and use keys to encrypt groupchatDaniel Gultsch2014-05-283-4/+29
* | | encrypted group messages are now properly decryptedDaniel Gultsch2014-05-282-7/+11
* | | first tries on crypto mucDaniel Gultsch2014-05-286-41/+80