Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag '1.3.0' | Daniel Gultsch | 2015-05-02 | 198 | -461/+2996 |
|\ | |||||
| * | version bump to 1.3.01.3.0 | Daniel Gultsch | 2015-05-01 | 1 | -2/+2 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-05-01 | 2 | -0/+70 |
| | | |||||
| * | added config option to be a bit more verbose about stanza counts | Daniel Gultsch | 2015-04-29 | 2 | -4/+15 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-04-29 | 8 | -1/+607 |
| | | |||||
| * | version bump to 1.3.0-beta | Daniel Gultsch | 2015-04-28 | 1 | -2/+2 |
| | | |||||
| * | npe check after reading image uri | Daniel Gultsch | 2015-04-28 | 1 | -3/+3 |
| | | |||||
| * | adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar) | Daniel Gultsch | 2015-04-28 | 3 | -0/+0 |
| | | |||||
| * | increased padding on image buttons on v21 to match material guidelines | Daniel Gultsch | 2015-04-28 | 5 | -7/+9 |
| | | |||||
| * | made material icons smaller (24dp) | Daniel Gultsch | 2015-04-28 | 135 | -20/+18 |
| | | |||||
| * | stop conference details from crashing when rotating the screen | Daniel Gultsch | 2015-04-28 | 1 | -0/+3 |
| | | |||||
| * | fixed npe when rotating screen in contact details activity | Daniel Gultsch | 2015-04-28 | 1 | -4/+8 |
| | | |||||
| * | print stack trace on io error | Daniel Gultsch | 2015-04-28 | 1 | -6/+6 |
| | | |||||
| * | escape nick in highlight regex pattern | Daniel Gultsch | 2015-04-28 | 1 | -1/+1 |
| | | |||||
| * | revert undo timeout to a more reasonable value | Daniel Gultsch | 2015-04-28 | 1 | -1/+1 |
| | | |||||
| * | increased padding around switches in manage accounts | Daniel Gultsch | 2015-04-27 | 1 | -2/+4 |
| | | |||||
| * | handle returning from camera without picture | Daniel Gultsch | 2015-04-27 | 1 | -0/+3 |
| | | |||||
| * | use xmppserviceconnection to send iq packets in jingle connection | Daniel Gultsch | 2015-04-26 | 1 | -4/+4 |
| | | |||||
| * | hard code bitmap configs | Daniel Gultsch | 2015-04-26 | 1 | -2/+2 |
| | | |||||
| * | added changelog. removed deprecated todo list | Daniel Gultsch | 2015-04-26 | 2 | -23/+8 |
| | | |||||
| * | version bump to 1.3.0-beta | Daniel Gultsch | 2015-04-26 | 1 | -2/+2 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-04-26 | 9 | -3/+205 |
| | | |||||
| * | Merge pull request #1135 from BrianBlade/manage_certificates | Daniel Gultsch | 2015-04-25 | 4 | -5/+124 |
| |\ | | | | | | | Add option to remove manually approved certificates | ||||
| | * | Add option to remove manually approved certificates | BrianBlade | 2015-04-19 | 4 | -5/+124 |
| | | | | | | | | | | | | | | | | | | | | | - "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options" | ||||
| * | | fixed service discovery by properly storing and checking identities | Daniel Gultsch | 2015-04-25 | 3 | -30/+50 |
| | | | |||||
| * | | fixed #1039 | Daniel Gultsch | 2015-04-25 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #1146 from BrianBlade/minor_otr_tweaks | Daniel Gultsch | 2015-04-25 | 3 | -6/+17 |
| |\ \ | | | | | | | | | OTR: Fix onContactStatusChanged & dont archive OTR | ||||
| | * | | OTR: Fix onContactStatusChanged & dont archive OTR | BrianBlade | 2015-04-21 | 3 | -6/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix session handling on contact status change: Do not reset potentially active sessions; check peer's OTR-resource on disconnect - use no-permanent-store hint instead of no-store to ensure finished messages are delivered to offline/disconnected clients - add no-permanent-store to ask compliant servers not to archive OTR messages | ||||
| * | | | cleaned up file handling | Daniel Gultsch | 2015-04-25 | 3 | -71/+87 |
| | | | | |||||
| * | | | send invite to other instanzes after creating ad hoc conference. fixes #1136 | Daniel Gultsch | 2015-04-23 | 1 | -0/+8 |
| | | | | |||||
| * | | | fixed direct invites | Daniel Gultsch | 2015-04-21 | 1 | -12/+28 |
| |/ / | |||||
| * | | added missing translations from transifex | Daniel Gultsch | 2015-04-21 | 11 | -8/+24 |
| | | | |||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2015-04-20 | 1 | -2/+3 |
| |\ \ | |||||
| | * | | added reference to the location plugin to README | Daniel Gultsch | 2015-04-20 | 1 | -1/+2 |
| | | | | |||||
| | * | | added amazon app store link (us store) | Daniel Gultsch | 2015-04-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | pulled latest translations from transifex | Daniel Gultsch | 2015-04-20 | 6 | -3/+727 |
| |/ / | |||||
| * | | always hide pgp snackbar after decrypting a message. fixes #1075 | Daniel Gultsch | 2015-04-20 | 1 | -0/+1 |
| | | | |||||
| * | | removed some dead code | Daniel Gultsch | 2015-04-20 | 1 | -19/+0 |
| | | | |||||
| * | | fixed weird touch on snackbar switched conversation bug | Daniel Gultsch | 2015-04-20 | 1 | -3/+2 |
| | | | | | | | | | | | | when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons. | ||||
| * | | some code clean up to fix some rare NPE’s | Daniel Gultsch | 2015-04-19 | 2 | -4/+7 |
| |/ | |||||
| * | increased undo delay | iNPUTmice | 2015-04-17 | 1 | -1/+1 |
| | | |||||
| * | fixed a bug in DNS helper code. fixes #1130 | iNPUTmice | 2015-04-16 | 2 | -2/+2 |
| | | |||||
| * | bumped version to 1.3.0-alpha | iNPUTmice | 2015-04-15 | 1 | -2/+2 |
| | | |||||
| * | some bug fixes concerning 0byte files. fixes #1126 | iNPUTmice | 2015-04-15 | 2 | -1/+2 |
| | | |||||
| * | maintain state when rotating settings activity | iNPUTmice | 2015-04-14 | 2 | -18/+26 |
| | | |||||
| * | Merge branch 'BrianBlade-dont_trust_cas_preference' into development | iNPUTmice | 2015-04-14 | 5 | -5/+28 |
| |\ | |||||
| | * | Merge branch 'dont_trust_cas_preference' of ↵ | iNPUTmice | 2015-04-14 | 5 | -5/+28 |
| |/| | | | | | | | | | | | | | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml | ||||
| | * | Add option to use MTM without default TrustManager | BrianBlade | 2015-04-11 | 5 | -4/+27 |
| | | | | | | | | | | | | | | | | | | Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked. | ||||
| * | | always show save button when account info was modified. fixes #918 | iNPUTmice | 2015-04-14 | 1 | -5/+9 |
| | | | |||||
| * | | fixed disable account when sliding and not clicking the toggle | iNPUTmice | 2015-04-13 | 2 | -8/+9 |
| | | |