aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1099 from BrianBlade/fix_otr_error_msgsDaniel Gultsch2015-04-022-18/+24
|\
| * Fix OTR-Error messagesBrianBlade2015-04-012-18/+24
* | Merge branch 'BrianBlade-account_state_switch' into developmentiNPUTmice2015-04-013-17/+49
|\ \
| * | do not overlap account title and switchiNPUTmice2015-04-011-1/+4
| * | Merge branch 'account_state_switch' of https://github.com/BrianBlade/Conversa...iNPUTmice2015-04-013-16/+45
|/| |
| * | Add toggle account-state switchBrianBlade2015-04-013-16/+45
| |/
* | Merge pull request #1076 from rk4an/patch-1Daniel Gultsch2015-04-011-0/+4
|\ \
| * | Update french translationErkan2015-03-221-0/+4
| |/
* / pulled translations from transifexiNPUTmice2015-04-017-15/+466
|/
* bump version code1.2.0iNPUTmice2015-03-221-2/+2
* pulled translationsiNPUTmice2015-03-225-0/+21
* properly set chat states when receiving otr status messagesiNPUTmice2015-03-211-1/+1
* respond to unreadable OTR messages with error message. fixed #1021iNPUTmice2015-03-215-3/+42
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2015-03-201-1/+1
|\
| * Update CHANGELOG.mdDaniel Gultsch2015-03-191-1/+1
* | wait for session iq to return sucessfully before sending other stanzas. fixed...iNPUTmice2015-03-201-26/+42
|/
* version bump to 1.2.0-beta1.2.0-betaiNPUTmice2015-03-192-3/+5
* don't update presence for muc messagesiNPUTmice2015-03-191-5/+2
* pulled more translationsiNPUTmice2015-03-191-0/+5
* Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseenDaniel Gultsch2015-03-194-8/+24
|\
| * # add delivery receipts for private muc msgsBrianBlade2015-03-184-8/+24
* | Merge pull request #1043 from strb/choose_contact_multiple_squashedDaniel Gultsch2015-03-184-6/+134
|\ \
| * | Added multiple select to Choose Contact ActivityAndreas Straub2015-03-184-6/+134
* | | Merge pull request #1036 from QuentinC/developmentDaniel Gultsch2015-03-181-1/+1
|\ \ \
| * | | Green led color is better with "full-green"Quentin2015-03-041-1/+1
* | | | Merge pull request #1041 from weiss/fix-cached-avatar-sizeDaniel Gultsch2015-03-171-29/+31
|\ \ \ \ | |_|/ / |/| | |
| * | | Set file size also for cached avatarsHolger Weiß2015-03-171-29/+31
|/ / /
* | | pulled new translations from transifexiNPUTmice2015-03-1610-11/+348
* | | updated changelongiNPUTmice2015-03-111-0/+9
* | | Do not Strigprep JIDs from databaseMateusz "maxmati" Nowoty?ski2015-03-114-11/+13
* | | add context menu entries for geo urisiNPUTmice2015-03-111-17/+33
* | | open location directly from notificationiNPUTmice2015-03-106-0/+25
* | | show geo uris as 'location' in overviewiNPUTmice2015-03-102-1/+9
| |/ |/|
* | Merge pull request #1022 from Boris-de/cipher_blacklistDaniel Gultsch2015-03-082-0/+25
|\ \
| * | disable all really weak cipher suitesBoris Wachtmeister2015-03-072-0/+25
* | | display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-077-53/+230
|/ /
* | fixed enter is send optioniNPUTmice2015-03-062-6/+10
* | fixed npe in message parseriNPUTmice2015-03-061-4/+4
* | another teaser task for gsociNPUTmice2015-03-061-0/+5
* | fixed markdown syntax in todo listiNPUTmice2015-03-061-4/+7
* | added short todo listiNPUTmice2015-03-061-0/+15
* | avoid unnecessary thread creationiNPUTmice2015-03-053-17/+29
* | added config option to disable string prep in jidsiNPUTmice2015-03-052-3/+5
* | experimantal in memory jid cachingiNPUTmice2015-03-041-0/+15
|/
* added methods to count number of unread messagesDaniel Gultsch2015-03-022-0/+21
* mark all sent messages up to a marker as displayedDaniel Gultsch2015-03-012-13/+19
* merge messages with related status (unsend, send, send_received)iNPUTmice2015-03-011-1/+17
* increment version code1.1.0iNPUTmice2015-02-281-1/+1
* catching out of memory run time exception in hasEnabledAccounts()iNPUTmice2015-02-281-0/+2
* pulled new translations from transifexiNPUTmice2015-02-275-23/+191
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:49:20 +0000