| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #959 from SamWhited/ciphers_fix | Daniel Gultsch | 2015-02-09 | 4 | -9/+12 |
| |\ | | | | | Ciphers fix | ||||
| | * | Use platform ciphers as well, just prefer ours | Sam Whited | 2015-02-02 | 4 | -9/+12 |
| | | | |||||
| * | | don't show 'enter pgp key' in non encrypted chats | iNPUTmice | 2015-02-09 | 1 | -0/+1 |
| | | | |||||
| * | | always add a non resolved SRV record to the list | iNPUTmice | 2015-02-09 | 1 | -6/+1 |
| | | | |||||
| * | | made delay timestamp parser accept nano seconds | iNPUTmice | 2015-02-09 | 1 | -1/+1 |
| | | | |||||
| * | | sort users in muc | Daniel Gultsch | 2015-02-07 | 1 | -3/+12 |
| | | | |||||
| * | | trim message bodys on display | Daniel Gultsch | 2015-02-07 | 2 | -3/+3 |
| | | | |||||
| * | | refactored how snackbar is displayed | Daniel Gultsch | 2015-02-07 | 1 | -82/+105 |
| |/ | |||||
| * | don't disable any ciphers | iNPUTmice | 2015-02-02 | 1 | -3/+4 |
| | | |||||
| * | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2015-02-02 | 5 | -0/+0 |
| |\ | | | | | | | development | ||||
| | * | Remove another unused resource | Sam Whited | 2015-02-01 | 5 | -0/+0 |
| | | | |||||
| * | | added more ciphers for old openssl versions | iNPUTmice | 2015-02-02 | 1 | -1/+3 |
| |/ | |||||
| * | Merge pull request #955 from SamWhited/unused_resources | Daniel Gultsch | 2015-02-01 | 24 | -0/+0 |
| |\ | | | | | Remove unused resources | ||||
| | * | Remove unused resources | Sam Whited | 2015-02-01 | 24 | -0/+0 |
| | | | |||||
| * | | pulled spanish translations again | iNPUTmice | 2015-02-01 | 1 | -2/+2 |
| |/ | |||||
| * | pulled translations from transifex | iNPUTmice | 2015-02-01 | 16 | -0/+1513 |
| | | |||||
| * | Removes some unused strings (the legacy SSL stuff) | Sam Whited | 2015-02-01 | 4 | -7/+0 |
| | | |||||
| * | fixed text preview for images | iNPUTmice | 2015-02-01 | 1 | -1/+1 |
| | | |||||
| * | Remove title_activity_conversations and use app_name instead | kruks23 | 2015-01-30 | 14 | -15/+2 |
| | | |||||
| * | made version codes ready for release candidate in beta channel | iNPUTmice | 2015-01-29 | 1 | -1/+1 |
| | | |||||
| * | don't count when attempt failed completly | iNPUTmice | 2015-01-29 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2015-01-29 | 144 | -25/+104 |
| |\ | | | | | | | development | ||||
| | * | Use Material Design Icons on API 21+ | Sam Whited | 2015-01-29 | 144 | -25/+104 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2015-01-29 | 1 | -10/+10 |
| |\| | | | | | | | development | ||||
| | * | Merge pull request #941 from SamWhited/snackbar_ordering | Daniel Gultsch | 2015-01-28 | 1 | -10/+10 |
| | |\ | | | | | | | Show errors before mute snackbar | ||||
| | | * | Show errors before mute snackbar | Sam Whited | 2015-01-27 | 1 | -10/+10 |
| | | | | | | | | | | | | | See #939 | ||||
| * | | | properly clear notifications. fixed #921 | iNPUTmice | 2015-01-29 | 1 | -2/+8 |
| |/ / | |||||
| * / | fixed broken caps | iNPUTmice | 2015-01-28 | 2 | -14/+17 |
| |/ | |||||
| * | muc tics for consistency | iNPUTmice | 2015-01-26 | 1 | -1/+1 |
| | | |||||
| * | changed version code and version name to 1.0-beta2 | iNPUTmice | 2015-01-26 | 1 | -1/+1 |
| | | |||||
| * | adapt caps on whether or not message confirmation is on | iNPUTmice | 2015-01-26 | 5 | -11/+31 |
| | | |||||
| * | don't put ejabberds status code muc messages into an actual conversation | iNPUTmice | 2015-01-26 | 1 | -0/+1 |
| | | |||||
| * | made connect time out more failsave | iNPUTmice | 2015-01-25 | 1 | -5/+8 |
| | | |||||
| * | Merge pull request #930 from betheg/otr | Daniel Gultsch | 2015-01-25 | 2 | -0/+3 |
| |\ | | | | | otr: switch to the otr-state the partner alternate. | ||||
| | * | otr: switch to the otr-state the partner alternate. | Michael | 2015-01-25 | 2 | -0/+3 |
| | | | | | | | | | should also fixed #877 | ||||
| * | | Merge pull request #933 from betheg/mergeable | Daniel Gultsch | 2015-01-25 | 3 | -5/+9 |
| |\ \ | | | | | | | fix mergable() for /me command. | ||||
| | * | | fix mergable() for /me command. | Michael | 2015-01-25 | 3 | -5/+9 |
| | |/ | |||||
| * | | updated translations | iNPUTmice | 2015-01-25 | 4 | -432/+476 |
| | | | |||||
| * | | set jingle file transfer to offer after iq offer has returned | iNPUTmice | 2015-01-25 | 1 | -6/+17 |
| | | | |||||
| * | | Czech translation | Jaroslav Lichtblau | 2015-01-25 | 1 | -0/+1 |
| |/ | | | | for "hide offline" added | ||||
| * | MessageParser: fix the regex for otr query messages. | Michael | 2015-01-24 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #924 from andersruneson/changeonlinecolor | Daniel Gultsch | 2015-01-24 | 2 | -1/+5 |
| |\ | | | | | Changed online color to green instead of primary | ||||
| | * | Changed online color to green instead of primary | Anders Sandblad | 2015-01-23 | 2 | -1/+5 |
| | | | |||||
| * | | fixed mam to work with muc | iNPUTmice | 2015-01-24 | 4 | -11/+21 |
| |/ | |||||
| * | show checkbox to hide offline contacts | iNPUTmice | 2015-01-21 | 3 | -6/+28 |
| | | |||||
| * | fixed bug in find conference in database method | iNPUTmice | 2015-01-21 | 1 | -3/+6 |
| | | |||||
| * | deal with user entering full jids in join conference dialog | iNPUTmice | 2015-01-21 | 2 | -3/+4 |
| | | |||||
| * | always allow access to contact details. provide add button in contact details | iNPUTmice | 2015-01-21 | 6 | -84/+89 |
| | | |||||
| * | Add block/unblock to contact details menu | Sam Whited | 2015-01-21 | 4 | -9/+28 |
| | | | | | See #889 | ||||
| * | Merge pull request #908 from betheg/otr4j | Daniel Gultsch | 2015-01-21 | 3 | -2/+8 |
| |\ | | | | | otr4j: update to 0.22 | ||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |