Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bug fix for jingle | Daniel Gultsch | 2014-04-26 | 1 | -1/+1 |
| | |||||
* | unified presence selection for otr and file transfer | Daniel Gultsch | 2014-04-26 | 4 | -74/+100 |
| | |||||
* | fixed #75 | Daniel Gultsch | 2014-04-25 | 2 | -2/+3 |
| | |||||
* | setting backround color if image comes directly from cache | Daniel Gultsch | 2014-04-25 | 1 | -0/+1 |
| | |||||
* | couple of more optimazations on image loading | Daniel Gultsch | 2014-04-25 | 7 | -64/+43 |
| | |||||
* | smoother scrolling (first step) | Daniel Gultsch | 2014-04-25 | 9 | -62/+243 |
| | |||||
* | deny files with unknown file types | Daniel Gultsch | 2014-04-23 | 4 | -21/+76 |
| | |||||
* | added download button for images not accepted automatically | Daniel Gultsch | 2014-04-22 | 5 | -16/+78 |
| | |||||
* | added support for ibb | Daniel Gultsch | 2014-04-22 | 7 | -23/+313 |
| | |||||
* | code cleanup | Daniel Gultsch | 2014-04-21 | 2 | -28/+16 |
| | |||||
* | allow images to be opened with gallary app | Daniel Gultsch | 2014-04-21 | 7 | -5/+161 |
| | |||||
* | added missing transport id | Daniel Gultsch | 2014-04-21 | 1 | -0/+1 |
| | |||||
* | added proxy activate and a lot of code clean up. totatly untested | Daniel Gultsch | 2014-04-20 | 5 | -145/+161 |
| | |||||
* | made our spanish friends happy. fixed #68 | Daniel Gultsch | 2014-04-20 | 1 | -21/+22 |
| | |||||
* | fixed #50 | Daniel Gultsch | 2014-04-20 | 3 | -14/+32 |
| | |||||
* | more jingle bug fixes | Daniel Gultsch | 2014-04-19 | 3 | -12/+10 |
| | |||||
* | fixed replace contact in conversation | Daniel Gultsch | 2014-04-19 | 1 | -15/+15 |
| | |||||
* | made debugging verbose again on specific parts | Daniel Gultsch | 2014-04-19 | 2 | -4/+10 |
| | |||||
* | fixed default autoaccept file size and wrongly marked message | Daniel Gultsch | 2014-04-19 | 2 | -3/+3 |
| | |||||
* | cleaned up debug log a little bit | Daniel Gultsch | 2014-04-19 | 7 | -91/+118 |
| | |||||
* | fixed concurrent modification of contacts which led to missing presences | Daniel Gultsch | 2014-04-18 | 2 | -10/+15 |
| | |||||
* | tried to avoid some more race conditions in jingle | Daniel Gultsch | 2014-04-18 | 3 | -38/+80 |
| | |||||
* | updated minidns | Daniel Gultsch | 2014-04-18 | 1 | -5/+5 |
| | |||||
* | Merge branch 'master' into development | Daniel Gultsch | 2014-04-18 | 1 | -21/+25 |
|\ | |||||
| * | work around for bug in xmlpullparser | Daniel Gultsch | 2014-04-18 | 1 | -21/+25 |
| | | |||||
* | | lot of cleanup in jingle part | Daniel Gultsch | 2014-04-18 | 6 | -120/+326 |
| | | |||||
* | | put more string into strings.xml | Daniel Gultsch | 2014-04-18 | 4 | -11/+17 |
| | | |||||
* | | fixed destination bug | Daniel Gultsch | 2014-04-18 | 3 | -5/+15 |
| | | |||||
* | | fixed #63 | Daniel Gultsch | 2014-04-18 | 2 | -2/+21 |
| | | |||||
* | | fixed possible race conditions with presences | Daniel Gultsch | 2014-04-18 | 5 | -11/+23 |
| | | |||||
* | | added clear history dialog (no funcionality) | Daniel Gultsch | 2014-04-18 | 4 | -5/+52 |
| | | |||||
* | | jingle sessions now get terminated proberly on success | Daniel Gultsch | 2014-04-16 | 2 | -17/+34 |
| | | |||||
* | | made ui with sending images a little smoother | Daniel Gultsch | 2014-04-15 | 6 | -30/+61 |
| | | |||||
* | | added very basic, very untested gui on the receiving side | Daniel Gultsch | 2014-04-14 | 2 | -27/+59 |
| | | |||||
* | | tried to fix some race conditions. not adding duplicate candidates. needs ↵ | Daniel Gultsch | 2014-04-14 | 4 | -20/+45 |
| | | | | | | | | more checks though | ||||
* | | Merge pull request #59 from jelmer/typo-preemptively | Daniel Gultsch | 2014-04-14 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo: Preemptivly -> Preemptively. | ||||
| * | | Fix typo: Preemptivly -> Preemptively. | Jelmer Vernooij | 2014-04-14 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #58 from jelmer/fix-typo-assoziated | Daniel Gultsch | 2014-04-14 | 2 | -2/+2 |
|\ \ | | | | | | | Fix two typos: assoziated -> associated. | ||||
| * | | Fix two typos: assoziated -> associated. | Jelmer Vernooij | 2014-04-14 | 2 | -2/+2 |
|/ / | |||||
* | | added contributors and note to xep65 | Daniel Gultsch | 2014-04-13 | 1 | -0/+6 |
| | | |||||
* | | Some icon tweaks | Andreas Straub | 2014-04-13 | 1 | -14/+16 |
| | | | | | | | | Use Roboto Light, thinner lines between tiles, slightly smaller letters | ||||
* | | Added ellipsis tile for large conversations | Andreas Straub | 2014-04-13 | 1 | -5/+17 |
| | | | | | | | | | | For more than 4 members in a conversation, the fourth tile now contains an ellipsis to indicate this | ||||
* | | Major Contact Picture code cleanup | Andreas Straub | 2014-04-13 | 7 | -55/+71 |
| | | | | | | | | | | Notifications now have pseudotransparent icons, icons are generated in the correct size. | ||||
* | | transmitting files between two conversations works. no error handling and no ↵ | Daniel Gultsch | 2014-04-13 | 6 | -36/+136 |
| | | | | | | | | ui on the receiving end | ||||
* | | some code cleanup. added setting to auto accept files. socks5 connections ↵ | Daniel Gultsch | 2014-04-13 | 10 | -78/+234 |
| | | | | | | | | are now threaded | ||||
* | | more efficant way of calculating the sha1 sum. closing connections | Daniel Gultsch | 2014-04-13 | 10 | -109/+204 |
| | | |||||
* | | fixed minor typos | Daniel Gultsch | 2014-04-12 | 2 | -3/+2 |
| | | |||||
* | | Merge branch 'development' of https://github.com/strb/Conversations into ↵ | Daniel Gultsch | 2014-04-12 | 6 | -44/+205 |
|\ \ | | | | | | | | | | strb-development | ||||
| * | | Added tiled MUC icons | andy | 2014-04-12 | 1 | -16/+164 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, MUCs have icons with up to 4 tiles representing MUC members, similar to the gmail app. Some caveats: As of now, no ordering is imposed on the members, we simply pick the first (up to) 4 returned by the MucOptions object. This could be done better, e.g. by picking more important members first (based on affil/role), or even going so far as to order them by how recently they sent a message in the MUC. Also, the code generating the tiles is really messy right now (tons of copy and paste). It seems to work though. I will clean this up soon. | ||||
| * | | More Contact Picture refactors | andy | 2014-04-12 | 5 | -17/+40 |
| | | | | | | | | | | | | | | | Use polymorphism to avoid dynamic dispatch based on nulled parameters. Next up: Prettier MUC icons |