Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-10-20 | 1 | -10/+8 |
|\ | |||||
| * | Confirmation dialog added before sending delete command for remote file | steckbrief | 2016-08-23 | 1 | -10/+8 |
| | | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-10 | 1 | -3/+4 |
|\| | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | ||||
| * | Fixes FS#158: user decision dialog heading configurable and translateable | steckbrief | 2016-03-10 | 1 | -3/+4 |
| | | |||||
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 1 | -1/+1 |
| |\ | |/ |/| | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-03 | 1 | -1/+1 |
|/ | |||||
* | Implements FS#26: Introduction of dialog to choose whether to resize a ↵ | steckbrief | 2015-11-03 | 1 | -0/+70 |
picture or not |