| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-17 | 1 | -0/+1 |
|\ |
|
| * | Log error in case logcat command could not be executed; Show toast in case no... | steckbrief | 2015-12-17 | 1 | -0/+1 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-16 | 1 | -0/+5 |
|\| |
|
| * | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis... | steckbrief | 2015-12-16 | 1 | -0/+5 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 1 | -3/+6 |
|\| |
|
| * | Implements FS#89 - Change about information | steckbrief | 2015-12-04 | 1 | -3/+6 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 1 | -0/+6 |
|\| |
|
| * | Partially implements FS#6: Conference ID changed to c+bugs@confere | steckbrief | 2015-11-20 | 1 | -0/+1 |
| * | Implements FS#67: Introduce central logging class to use log prefix, new acti... | steckbrief | 2015-11-20 | 1 | -0/+5 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-03 | 1 | -0/+9 |
|\| |
|
| * | Implements FS#26: Introduction of dialog to choose whether to resize a pictur... | steckbrief | 2015-11-03 | 1 | -0/+4 |
| * | Implements FS#24: Introduce setting for picture resizing | steckbrief | 2015-10-30 | 1 | -0/+5 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-23 | 1 | -2/+2 |
|\| |
|
| * | Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values... | steckbrief | 2015-10-23 | 1 | -2/+2 |
* | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2015-10-05 | 1 | -0/+25 |
|\| |
|
| * | Publishing additional information in message details dialog such as message t... | steckbrief | 2015-10-04 | 1 | -0/+21 |
| * | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op... | steckbrief | 2015-10-04 | 1 | -0/+4 |
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-11 | 1 | -129/+152 |
| |\
| |/
|/| |
|
| * | App-Name changed to "Conversations+" in strings.xml | steckbrief | 2015-06-19 | 1 | -1/+1 |
* | | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1 | lookshe | 2015-08-11 | 1 | -129/+152 |
|/ |
|
* | changed received and read confirmation setting to one list and put it to sett... | lookshe | 2015-04-14 | 1 | -3/+4 |
* | added settings for accepting and downloading files | lookshe | 2015-04-12 | 1 | -1/+7 |
* | differ between received and read message | lookshe | 2015-04-11 | 1 | -1/+3 |
* | no trim of messages or password | lookshe | 2015-04-11 | 1 | -0/+3 |
* | Merge tag '1.2.0' into trz/master | steckbrief | 2015-03-30 | 1 | -0/+14 |
|\ |
|
| * | Added multiple select to Choose Contact Activity | Andreas Straub | 2015-03-18 | 1 | -0/+4 |
| * | show geo uris as 'location' in overview | iNPUTmice | 2015-03-10 | 1 | -0/+2 |
| * | display geo uris as location. show 'send loction' in share menu if request lo... | iNPUTmice | 2015-03-07 | 1 | -0/+3 |
| * | added typing notifications through XEP-0085. fixed #210 | iNPUTmice | 2015-02-21 | 1 | -0/+4 |
| * | added actions to error notification | iNPUTmice | 2015-02-10 | 1 | -0/+1 |
* | | Merge master-origin | steckbrief | 2015-02-20 | 1 | -15/+53 |
|\| |
|
| * | Remove title_activity_conversations and use app_name instead | kruks23 | 2015-01-30 | 1 | -1/+0 |
| * | Use Material Design Icons on API 21+ | Sam Whited | 2015-01-29 | 1 | -0/+1 |
| * | show checkbox to hide offline contacts | iNPUTmice | 2015-01-21 | 1 | -0/+1 |
| * | Remove legacy SSL support | Sam Whited | 2015-01-19 | 1 | -2/+0 |
| * | proper desc for offering and sending images in conversations overview | iNPUTmice | 2015-01-18 | 1 | -0/+2 |
| * | use same helper methods for images and files | iNPUTmice | 2015-01-18 | 1 | -7/+3 |
| * | Merge pull request #901 from kriztan/patch-2 | Daniel Gultsch | 2015-01-18 | 1 | -0/+2 |
| |\ |
|
| | * | Added new file type names for file transfers | Christian S | 2015-01-18 | 1 | -0/+2 |
| * | | Fix string substitutions with unknown filetypes | Sam Whited | 2015-01-17 | 1 | -0/+1 |
| |/ |
|
| * | Correct the download file string on notifications | Sam Whited | 2015-01-17 | 1 | -4/+4 |
| * | Add download button on notification if applicable | Sam Whited | 2015-01-16 | 1 | -0/+1 |
| * | show toast when avatar has been published - fixed #874 | iNPUTmice | 2015-01-15 | 1 | -0/+1 |
| * | added dedicated button to disable foreground service in perma notification | iNPUTmice | 2015-01-15 | 1 | -1/+2 |
| * | Merge pull request #885 from SamWhited/display-enter-key | Daniel Gultsch | 2015-01-14 | 1 | -0/+2 |
| |\ |
|
| | * | Add option to swap enter/emoticon key | Sam Whited | 2015-01-14 | 1 | -0/+2 |
| * | | Harden the TLS connection cipher suites | Sam Whited | 2015-01-14 | 1 | -1/+1 |
| |/ |
|
| * | context menu for files and offered files. fixed #848 fixed #849 | Daniel Gultsch | 2015-01-12 | 1 | -2/+1 |
| * | reworked message preview / message meta information (ie file offered, receive... | Daniel Gultsch | 2015-01-12 | 1 | -5/+8 |
| * | shortened some string | Daniel Gultsch | 2015-01-11 | 1 | -2/+2 |