Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-22 | 1 | -25/+37 |
|\ | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 1 | -9/+0 |
|\| | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java | ||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-10 | 1 | -2/+1 |
|\| | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | ||||
* | | Imports organized | steckbrief | 2016-02-12 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-10 | 1 | -14/+35 |
|\| | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-06 | 2 | -1/+14 |
|\| | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 2 | -13/+40 |
|\| | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 1 | -3/+3 |
|\| | |||||
* | | Merge trz/rename into trz/rebase | steckbrief | 2015-10-22 | 1 | -1/+1 |
|\| | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-15 | 2 | -14/+32 |
|\| | |||||
| * | moved merged files to correct location0.0.3 | lookshe | 2015-08-16 | 2 | -166/+0 |
|/ | |||||
* | - Introduction of SwipeRefreshLayout for conversation view | steckbrief | 2015-08-12 | 2 | -0/+166 |
- OnScrollListener for ListView of messages removed and replaced with swipe refresh - Loading of messages now possible even if no message is present in conversation |