aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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 regex
| * add all whitespaces in regexM. Dietrich2014-09-021-1/+1
| |
* | Merge pull request #380 from emdete/unicode_emoticonsDaniel Gultsch2014-09-013-2/+25
|\| | | | | add translation from ascii to unicode emoticons
| * 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
|\ | | | | fix forgotten spelling.
| * 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
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/eu/siacs/conversations/services/XmppConnectionService.java
| * | | 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
| | | |
* | | | proper namespaces for xep-0352iNPUTmice2014-08-303-3/+3
| | | |
* | | | send inactive or active on every connect and resumeiNPUTmice2014-08-301-3/+10
| | | |
* | | | added basic csiiNPUTmice2014-08-304-0/+86
|/ / /
* | | version bump to 0.6 with changelogs0.6iNPUTmice2014-08-301-28/+17
| | |
* | | brought npe catcher back for kxml parseriNPUTmice2014-08-301-0/+4
| |/ |/|
* | fixed link to old resourceiNPUTmice2014-08-291-2/+2
| |
* | fixed npeiNPUTmice2014-08-291-0/+4
| |
* | fixed #389iNPUTmice2014-08-291-1/+5
|/
* fixed spelling thanks @bethegiNPUTmice2014-08-286-24/+24
|
* translated missing string in settingsiNPUTmice2014-08-271-2/+6
|
* fixing duplicate private muc messagesiNPUTmice2014-08-251-3/+10
|
* fixed message hintiNPUTmice2014-08-251-51/+61
|
* fixed faulty db creation on first installiNPUTmice2014-08-241-9/+12
|
* use otr encrypiton instead of plain when contact has exactly one online ↵Daniel Gultsch2014-08-241-0/+10
| | | | presence and an otr fingerprint
* jump right into edit account if now accounts are configuredDaniel Gultsch2014-08-232-9/+18
|
* changed workflow on inital avatar publicationDaniel Gultsch2014-08-232-11/+39
|
* experimental muc message deduplicationDaniel Gultsch2014-08-233-2/+25
|
* removed server compat value in favor of a (small xep list)Daniel Gultsch2014-08-232-41/+23
|
* fixed another npeiNPUTmice2014-08-221-7/+10
|