aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* changed roster to concurrent hashmapiNPUTmice2014-06-011-2/+2
* unified crypto messages and made lock icon work for conferencesiNPUTmice2014-06-012-21/+17
* added warning when public keys are missingiNPUTmice2014-06-011-0/+6
* Fix tile rendering for larger conferencesAndreas Straub2014-06-011-1/+1
* show dialog when no contact in a muc has pgp supportiNPUTmice2014-06-013-6/+42
* OpenPGP key display in muc details is now prettier and linked to openkeychainiNPUTmice2014-06-012-9/+37
* 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
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-05-314-13/+24
|\
| * 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
| * More harcoded translations + updated Spanishkruks232014-05-292-13/+13
* | 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
* possible fix for #149 and #142iNPUTmice2014-05-281-1/+1
* error msg on offline subscription changesDaniel Gultsch2014-05-241-12/+29
* Merge pull request #146 from kruks23/developmentDaniel Gultsch2014-05-242-7/+7
|\
| * More harcoded translations + Spanishkruks232014-05-242-7/+7
* | Merge pull request #140 from strb/muciconsDaniel Gultsch2014-05-241-108/+41
|\ \ | |/ |/|
| * Refactored unknown contact picture generationAndreas Straub2014-05-211-108/+41
* | Title activities translations + contacts translations + update Spanish Transl...kruks232014-05-232-11/+11
* | 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
* | Contact details translations + update spanish translationskruks232014-05-221-18/+18
* | 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-214-132/+197
* | Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel 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
* auto retry image compression with decreasing sample sizeDaniel Gultsch2014-05-211-17/+15
* close input streamDaniel Gultsch2014-05-201-0/+1
* trying to deal with larger imagesDaniel Gultsch2014-05-201-4/+17
* Update Spanish Translations + harcoded just_nowkruks232014-05-203-8/+8
* highlight people in conferences by clicken on their pictureDaniel Gultsch2014-05-201-14/+27
* fixed ping time out after session resumeDaniel Gultsch2014-05-201-0/+1
* ported pending subscription support to new roster mgmtDaniel Gultsch2014-05-203-28/+5
* made roster persistant aka enabled versioning againDaniel Gultsch2014-05-193-41/+30
* some code cleanup to deal with the roster mgmt changes from earlierDaniel Gultsch2014-05-193-77/+54
* reworked roster/contact handling. might break some stuff. not sycing to disk yetDaniel Gultsch2014-05-1915-560/+332
* bind and session request more compatibleDaniel Gultsch2014-05-183-4/+19
* fixed #123 fixed122Daniel Gultsch2014-05-183-31/+11
* cleaned up edit account dialog a littleDaniel Gultsch2014-05-181-20/+13
* fixed #53 aka server not found bugDaniel Gultsch2014-05-183-27/+39