aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | always show save button when account info was modified. fixes #918iNPUTmice2015-04-141-5/+9
| * | fixed disable account when sliding and not clicking the toggleiNPUTmice2015-04-132-8/+9
| * | fixed typosiNPUTmice2015-04-132-2/+2
| * | Merge pull request #1123 from lookshe/developmentDaniel Gultsch2015-04-131-10/+18
| |\ \
| | * | Bugfix for issue #1121lookshe2015-04-131-10/+18
| * | | shut up linteriNPUTmice2015-04-131-0/+1
| * | | Maintain private chat on MUC. fixes #1097iNPUTmice2015-04-131-1/+0
| * | | fixed regression where the selected conversation wasn't highlighted anymore o...iNPUTmice2015-04-133-13/+12
| |/ /
| * | allow sharing multiple images at once. fixes #1090iNPUTmice2015-04-113-59/+111
| * | don't resume old session when changing resourceiNPUTmice2015-04-095-7/+35
| * | Merge pull request #1104 from BrianBlade/feature/swipe_out_conversationDaniel Gultsch2015-04-099-71/+185
| |\ \
| | * | Enable end-conversation by swipe gestureBrianBlade2015-04-089-71/+185
| |/ /
| * | 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
| |/
* / fixed a bug in DNS helper code. fixes #1130iNPUTmice2015-04-162-2/+2
|/
* 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