aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* deleted some unused string-resources and imports, also deleted ↵Michael2014-09-0714-124/+0
| | | | edit_account_dialog.xml.
* Merge pull request #424 from betheg/bookmark_passwordDaniel Gultsch2014-09-074-3/+59
|\ | | | | MUC: set the password from bookmarks.
| * 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.
| | * 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
|\ | | | | XEP-0172
| * 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 regex, implement pattern cache
| * | 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 ↵iNPUTmice2014-09-0211-496/+0
|/| | | | | | | | | | | | | | | into betheg-unused_resources
| * | | 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
| | | |
* | | | 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
| | |
* | | Merge pull request #402 from emdete/remove_poormans_tostringDaniel Gultsch2014-09-0112-26/+26
|\ \ \ | | | | | | | | optimize string operations a bit
| * | | optimize string operations a bitM. Dietrich2014-09-0112-26/+26
| |/ /
* / / updated readmeiNPUTmice2014-08-311-1/+4
|/ /
* | deleted unnecessary logiNPUTmice2014-08-311-2/+0
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:02:41 +0000