Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #901 from kriztan/patch-2 | Daniel Gultsch | 2015-01-18 | 2 | -0/+6 |
|\ | | | | | Added new file type names for file transfers | ||||
| * | Added new file type names for file transfers | Christian S | 2015-01-18 | 2 | -0/+6 |
| | | | | | | | | | | - apk - vcard | ||||
* | | Merge pull request #898 from SamWhited/unknown_filetype_string_fix | Daniel Gultsch | 2015-01-18 | 2 | -2/+3 |
|\ \ | |/ |/| | Fix string substitutions with unknown filetypes | ||||
| * | Fix string substitutions with unknown filetypes | Sam Whited | 2015-01-17 | 2 | -2/+3 |
|/ | |||||
* | Merge pull request #897 from SamWhited/download_file_fixes | Daniel Gultsch | 2015-01-17 | 8 | -24/+18 |
|\ | | | | | Correct the download file string on notifications | ||||
| * | Correct the download file string on notifications | Sam Whited | 2015-01-17 | 8 | -24/+18 |
|/ | | | | Fixes #896 | ||||
* | Merge branch 'SamWhited-download-button-notification' into development | iNPUTmice | 2015-01-16 | 8 | -29/+71 |
|\ | |||||
| * | Add download button on notification if applicable | Sam Whited | 2015-01-16 | 8 | -29/+71 |
|/ | |||||
* | sending read marker when resuming activity and conversation is open | iNPUTmice | 2015-01-15 | 1 | -1/+4 |
| | |||||
* | show toast when avatar has been published - fixed #874 | iNPUTmice | 2015-01-15 | 2 | -13/+14 |
| | |||||
* | added dedicated button to disable foreground service in perma notification | iNPUTmice | 2015-01-15 | 6 | -3/+11 |
| | |||||
* | fixed #888 | iNPUTmice | 2015-01-15 | 1 | -1/+1 |
| | |||||
* | Merge pull request #886 from rtreffer/development | Daniel Gultsch | 2015-01-14 | 24 | -2949/+1 |
|\ | | | | | Switch to maven central minidns | ||||
| * | Switch to maven central minidns | Rene Treffer | 2015-01-14 | 24 | -2949/+1 |
| | | |||||
* | | Merge pull request #885 from SamWhited/display-enter-key | Daniel Gultsch | 2015-01-14 | 5 | -26/+52 |
|\ \ | | | | | | | Add option to swap enter/emoticon key | ||||
| * | | Add option to swap enter/emoticon key | Sam Whited | 2015-01-14 | 5 | -26/+52 |
| | | | |||||
* | | | handle muc nicks with white spaces. fixed #884 | iNPUTmice | 2015-01-14 | 2 | -3/+4 |
| |/ |/| | |||||
* | | Merge pull request #883 from SamWhited/ciphers | Daniel Gultsch | 2015-01-14 | 5 | -43/+94 |
|\ \ | |/ |/| | Harden TLS cipher suites | ||||
| * | Harden the TLS connection cipher suites | Sam Whited | 2015-01-14 | 5 | -43/+94 |
|/ | |||||
* | Merge pull request #882 from SamWhited/apiandjavafixes | Daniel Gultsch | 2015-01-14 | 1 | -15/+30 |
|\ | | | | | Type safety and deprecated API forward-compatibility fixes for Notifications | ||||
| * | Ensure type safety in Pebble notifications | Sam Whited | 2015-01-13 | 1 | -15/+30 |
| | | | | | | | | Also use forward-compatible screen-on detection | ||||
* | | Merge pull request #881 from SamWhited/about-padding-fix | Daniel Gultsch | 2015-01-14 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix bottom padding on about page | ||||
| * | Fix bottom padding on about page | Sam Whited | 2015-01-13 | 1 | -1/+1 |
|/ | |||||
* | added faq about beta testing | Daniel Gultsch | 2015-01-13 | 1 | -0/+10 |
| | |||||
* | make use of different dimensions for different screen sizes | Daniel Gultsch | 2015-01-13 | 15 | -114/+56 |
| | |||||
* | Merge pull request #872 from Elinvention/development | Daniel Gultsch | 2015-01-13 | 1 | -25/+104 |
|\ | | | | | Updated Italian translations | ||||
| * | Updated Italian translations | Elia | 2015-01-13 | 1 | -25/+104 |
| | | |||||
* | | Merge pull request #873 from SamWhited/about-margin-fix | Daniel Gultsch | 2015-01-13 | 1 | -4/+4 |
|\ \ | |/ |/| | Use margin instead of padding on about screen | ||||
| * | Use margin instead of padding in about screen | Sam Whited | 2015-01-12 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #870 from svetlemodry/development | Daniel Gultsch | 2015-01-12 | 1 | -9/+37 |
|\ \ | |/ |/| | Czech translation | ||||
| * | Czech translation | Jaroslav Lichtblau | 2015-01-12 | 1 | -9/+37 |
|/ | | | | updated | ||||
* | Merge pull request #868 from SamWhited/ignore-extra-translations | Daniel Gultsch | 2015-01-12 | 1 | -1/+1 |
|\ | | | | | Don't fail on extra translations | ||||
| * | Don't fail on extra translations | Sam Whited | 2015-01-12 | 1 | -1/+1 |
| | | |||||
* | | catch bug in guessContentType | Daniel Gultsch | 2015-01-12 | 1 | -1/+6 |
|/ | |||||
* | context menu for files and offered files. fixed #848 fixed #849 | Daniel Gultsch | 2015-01-12 | 3 | -17/+24 |
| | |||||
* | reworked message preview / message meta information (ie file offered, ↵ | Daniel Gultsch | 2015-01-12 | 5 | -168/+171 |
| | | | | | | received * file) fixed #837 | ||||
* | Merge pull request #866 from SamWhited/xep0245 | Daniel Gultsch | 2015-01-12 | 5 | -159/+206 |
|\ | | | | | Add XEP-0245 (/me command) support | ||||
| * | Add XEP-0245 (/me command) support | Sam Whited | 2015-01-11 | 5 | -159/+206 |
| | | |||||
* | | do not check image file size over http if accepted file size is 0 | Daniel Gultsch | 2015-01-11 | 2 | -6/+11 |
| | | |||||
* | | keep proper image file extension | Daniel Gultsch | 2015-01-11 | 4 | -26/+39 |
|/ | |||||
* | updated travis file to build with android-m2repository | Daniel Gultsch | 2015-01-11 | 1 | -0/+1 |
| | |||||
* | shortened some string | Daniel Gultsch | 2015-01-11 | 2 | -2/+3 |
| | |||||
* | fixed #860 | Daniel Gultsch | 2015-01-10 | 1 | -0/+1 |
| | |||||
* | use latest support library | Daniel Gultsch | 2015-01-10 | 1 | -1/+1 |
| | |||||
* | make room persistant when changing subject or other muc options | Daniel Gultsch | 2015-01-10 | 3 | -16/+26 |
| | |||||
* | don't crash when selecting a conversation by uuid did not work | Daniel Gultsch | 2015-01-10 | 1 | -16/+20 |
| | |||||
* | fixed regression in tablet ui | Daniel Gultsch | 2015-01-09 | 1 | -0/+2 |
| | |||||
* | Introduced expert options to control enter-is-send | Daniel Gultsch | 2015-01-09 | 5 | -5/+27 |
| | | | | (default == off) | ||||
* | code cleanup for jingle proxy discovery | Daniel Gultsch | 2015-01-09 | 4 | -99/+72 |
| | |||||
* | ensure that everyone is member before making a room private | Daniel Gultsch | 2015-01-09 | 3 | -6/+32 |
| |