aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-05-282-4/+50
|\|
| * Merge pull request #147 from kruks23/developmentDaniel Gultsch2014-05-261-2/+2
| |\
| | * Fix Contact Status width in contact detailskruks232014-05-241-2/+2
| * | Merge pull request #152 from beriain/developmentDaniel Gultsch2014-05-261-2/+48
| |\ \
| | * | Update strings.xmlAitor Beriain2014-05-261-13/+13
| | * | Update strings.xmlAitor Beriain2014-05-261-2/+48
* | | | possible fix for #149 and #142iNPUTmice2014-05-281-1/+1
|/ / /
* | / fixed #151iNPUTmice2014-05-265-2/+126
| |/ |/|
* | error msg on offline subscription changesDaniel Gultsch2014-05-242-12/+30
* | Merge pull request #146 from kruks23/developmentDaniel Gultsch2014-05-247-24/+54
|\ \
| * | More harcoded translations + Spanishkruks232014-05-247-24/+54
* | | Merge pull request #140 from strb/muciconsDaniel Gultsch2014-05-241-108/+41
|\ \ \
| * | | Refactored unknown contact picture generationAndreas Straub2014-05-211-108/+41
* | | | Merge pull request #145 from kruks23/developmentDaniel Gultsch2014-05-235-19/+47
|\ \ \ \ | | |/ / | |/| |
| * | | Title activities translations + contacts translations + update Spanish Transl...kruks232014-05-235-19/+47
|/ / /
* | | end otr sessions earlier / more often. can lead to unesessary handshakes but ...Daniel Gultsch2014-05-233-17/+32
* | | fixed possible npeDaniel Gultsch2014-05-231-0/+6
* | | code cleanupDaniel Gultsch2014-05-232-10/+0
* | | updated readmeDaniel Gultsch2014-05-231-1/+1
* | | Merge pull request #143 from nachovfranco/mycommitsDaniel Gultsch2014-05-232-0/+195
|\ \ \
| * | | Galician translationnachovfranco2014-05-222-0/+195
* | | | Merge pull request #144 from kruks23/developmentDaniel Gultsch2014-05-233-19/+46
|\ \ \ \
| * | | | Contact details translations + update spanish translationskruks232014-05-223-19/+46
|/ / / /
* | | | offline crud of contactsDaniel Gultsch2014-05-225-17/+48
* | | | implementet missing methods on the new roster mgmtDaniel Gultsch2014-05-222-3/+17
|/ / /
* | | fixed #136Daniel Gultsch2014-05-222-24/+36
* | | write contacts on system shutdownDaniel Gultsch2014-05-215-132/+198
* | | added missing stringsDaniel Gultsch2014-05-211-1/+1
* | | Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2014-05-211-2/+17
|\| |
| * | Merge pull request #138 from strb/highlightDaniel Gultsch2014-05-211-2/+17
| |\ \
| | * | Fix highlight detection in MUC channelsAndreas Straub2014-05-211-2/+17
| |/ /
* / / further improvment trying to deal with large imagesDaniel Gultsch2014-05-211-1/+6
|/ /
* | cleaned up shared textDaniel Gultsch2014-05-216-26/+41
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 19:36:38 +0000