aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-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-068-29/+55
|/
* warn user if no presence subscription existsiNPUTmice2014-09-051-0/+34
* 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-033-17/+70
* | | changed order of snackbar hintsiNPUTmice2014-09-031-12/+11
* | | more openpgp bug fixesiNPUTmice2014-09-031-3/+7
* | | 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-034-0/+53
* | | made emoticon parsing enableable - default falseiNPUTmice2014-09-033-2/+12
* | | fixed #410 by removing that config optioniNPUTmice2014-09-028-40/+14
* | | refactored share with activityiNPUTmice2014-09-026-226/+246
* | | fixed #406iNPUTmice2014-09-021-12/+8
* | | rotate avatarsiNPUTmice2014-09-021-9/+16
* | | Merge pull request #408 from emdete/unicode_emoticonsDaniel Gultsch2014-09-021-1/+1
|\| |
| * | add all whitespaces in regexM. Dietrich2014-09-021-1/+1
* | | Merge pull request #380 from emdete/unicode_emoticonsDaniel Gultsch2014-09-013-2/+25
|\| |
| * | transform ascii to emoticons (on display only)M. Dietrich2014-09-013-2/+25
* | | fixed #403iNPUTmice2014-09-013-11/+18
* | | optimize string operations a bitM. Dietrich2014-09-0112-26/+26
|/ /
* | deleted unnecessary logiNPUTmice2014-08-311-2/+0
* | show merged time and status in message adapteriNPUTmice2014-08-312-3/+21
* | improvements for merge conditionsiNPUTmice2014-08-312-3/+9
* | add missing blank before nickiNPUTmice2014-08-311-0/+3
* | Smarter nickname highlight insert in conferncesBahtiar `kalkin-` Gadimov2014-08-311-6/+3
* | some code cleanupiNPUTmice2014-08-3175-1263/+1482
* | Merge pull request #391 from betheg/fix_typoDaniel Gultsch2014-08-311-4/+4
|\ \
| * \ Merge remote-tracking branch 'upstream/development' into fix_typoMichael2014-08-307-164/+354
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/development' into fix_typoMichael2014-08-293-3/+11
| |\ \ \
| * | | | fix forgotten spelling.Michael2014-08-281-4/+4
| | |_|/ | |/| |
* | | | require encrypted to be the same for messages to get mergediNPUTmice2014-08-311-1/+3
* | | | experimental message mergingiNPUTmice2014-08-312-44/+107
| |_|/ |/| |
* | | Merge branch 'sm' into developmentiNPUTmice2014-08-303-146/+250
|\ \ \
| * | | reset unsend messages to waitingiNPUTmice2014-08-302-2/+17
| * | | properly set stanza count on session resumeiNPUTmice2014-08-301-3/+21
| * | | basic message ackingiNPUTmice2014-08-303-131/+200
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:57:16 +0000