aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bug fixes for forcing encryptioniNPUTmice2014-09-081-1/+6
* fixed sending offline pgp messagesiNPUTmice2014-09-084-9/+12
* settings to force encryption and setting for not saving messages to disk. fix...iNPUTmice2014-09-087-46/+96
* don't fail displayed or received messagesiNPUTmice2014-09-081-15/+17
* warn on missing presence subscriptioniNPUTmice2014-09-084-13/+29
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-0714-124/+0
|\
| * Merge pull request #426 from betheg/remove_stringsDaniel Gultsch2014-09-0714-124/+0
| |\
| | * deleted some unused string-resources and imports, also deleted edit_account_d...Michael2014-09-0714-124/+0
* | | fixed #321 - delete otr fingerprintsiNPUTmice2014-09-078-17/+88
|/ /
* | fixed #425iNPUTmice2014-09-071-1/+1
* | trying to avoid rejectedexectioniNPUTmice2014-09-071-1/+8
|/
* Merge pull request #424 from betheg/bookmark_passwordDaniel Gultsch2014-09-074-3/+59
|\
| * MUC: set the password from bookmarks.Michael2014-09-074-3/+59
|/
* made shareing text with conferences possible againiNPUTmice2014-09-071-24/+28
* added missing breaks oOiNPUTmice2014-09-071-0/+2
* fixed npeiNPUTmice2014-09-071-0/+3
* readme formatingiNPUTmice2014-09-061-4/+4
* added recent contributorsiNPUTmice2014-09-061-3/+7
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-061-0/+8
|\
| * Merge pull request #422 from betheg/muc_passwordDaniel Gultsch2014-09-061-0/+8
| |\
| | * MUC: set password from invite message.Michael2014-09-051-0/+8
| |/
* / made otr a little bit more solid when there is no presence subscriptioniNPUTmice2014-09-069-29/+56
|/
* warn user if no presence subscription existsiNPUTmice2014-09-052-0/+37
* improved logging for avatar fetchesiNPUTmice2014-09-051-21/+38
* fixed #342 - otr with facebook and other services without resourcesiNPUTmice2014-09-041-2/+6
* reconnect accounts when resource has been changed in settingsiNPUTmice2014-09-041-3/+39
* made muc password dialog hide the password (password field)iNPUTmice2014-09-042-10/+29
* nick parsing (xep 0172) also enabled for messages and for pepiNPUTmice2014-09-041-5/+27
* Merge pull request #397 from GZep/developmentDaniel Gultsch2014-09-042-2/+12
|\
| * Contact presenceName propertyGayaz Yusipov2014-08-312-1/+8
| * XEP-0172Gayaz Yusipov2014-08-301-2/+5
* | Merge pull request #417 from emdete/unicode_emoticonsDaniel Gultsch2014-09-041-16/+32
|\ \
| * | improve emo mappingM. Dietrich2014-09-031-6/+9
| * | use class, use codepointM. Dietrich2014-09-031-25/+26
| * | make pattern staticM. Dietrich2014-09-031-16/+20
| * | improve regex, implement pattern cacheM. Dietrich2014-09-031-15/+23
* | | added support for password protected muc - fixed #203 and fixed #395iNPUTmice2014-09-034-17/+72
* | | changed order of snackbar hintsiNPUTmice2014-09-031-12/+11
* | | set openpgp-api-lib to a version that actually worksiNPUTmice2014-09-031-5/+8
* | | more openpgp bug fixesiNPUTmice2014-09-032-8/+12
* | | avoiding resource conflictsiNPUTmice2014-09-031-2/+7
* | | fixed pgp signature creationiNPUTmice2014-09-031-3/+19
* | | added ability to disable notifications for specific conversations - fixed #322iNPUTmice2014-09-037-0/+76
* | | made emoticon parsing enableable - default falseiNPUTmice2014-09-033-2/+12
* | | Merge branch 'betheg-unused_resources' into developmentiNPUTmice2014-09-0211-496/+0
|\ \ \
| * | | Merge branch 'unused_resources' of https://github.com/betheg/Conversations in...iNPUTmice2014-09-0211-496/+0
|/| | |
| * | | removed unused string resources.Michael2014-09-0111-496/+0
* | | | fixed #410 by removing that config optioniNPUTmice2014-09-029-48/+14
* | | | refactored share with activityiNPUTmice2014-09-028-272/+266
* | | | fixed #406iNPUTmice2014-09-021-12/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 22:06:58 +0000