aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1146 from BrianBlade/minor_otr_tweaksDaniel Gultsch2015-04-253-6/+17
|\
| * OTR: Fix onContactStatusChanged & dont archive OTRBrianBlade2015-04-213-6/+17
* | cleaned up file handlingDaniel Gultsch2015-04-253-71/+87
* | send invite to other instanzes after creating ad hoc conference. fixes #1136Daniel Gultsch2015-04-231-0/+8
* | fixed direct invitesDaniel Gultsch2015-04-211-12/+28
|/
* added missing translations from transifexDaniel Gultsch2015-04-2111-8/+24
* pulled latest translations from transifexDaniel Gultsch2015-04-206-3/+727
* always hide pgp snackbar after decrypting a message. fixes #1075Daniel Gultsch2015-04-201-0/+1
* removed some dead codeDaniel Gultsch2015-04-201-19/+0
* fixed weird touch on snackbar switched conversation bugDaniel Gultsch2015-04-201-3/+2
* some code clean up to fix some rare NPE’sDaniel Gultsch2015-04-192-4/+7
* increased undo delayiNPUTmice2015-04-171-1/+1
* fixed a bug in DNS helper code. fixes #1130iNPUTmice2015-04-162-2/+2
* some bug fixes concerning 0byte files. fixes #1126iNPUTmice2015-04-152-1/+2
* maintain state when rotating settings activityiNPUTmice2015-04-142-18/+26
* Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...iNPUTmice2015-04-145-5/+28
|\
| * Add option to use MTM without default TrustManagerBrianBlade2015-04-115-4/+27
* | 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
* | Enable end-conversation by swipe gestureBrianBlade2015-04-088-71/+184
* | Merge pull request #1099 from BrianBlade/fix_otr_error_msgsDaniel Gultsch2015-04-022-18/+24
|\ \
| * | Fix OTR-Error messagesBrianBlade2015-04-012-18/+24
| |/
* | 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
|/
* 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
* wait for session iq to return sucessfully before sending other stanzas. fixed...iNPUTmice2015-03-201-26/+42
* 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
* | | | Set file size also for cached avatarsHolger Weiß2015-03-171-29/+31
| |/ / |/| |
* | | pulled new translations from transifexiNPUTmice2015-03-1610-11/+348
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-28 23:46:20 +0000