Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-03 | 3 | -0/+157 |
|\ | |||||
| * | Implements FS#26: Introduction of dialog to choose whether to resize a ↵ | steckbrief | 2015-11-03 | 3 | -0/+157 |
| | | | | | | | | picture or not | ||||
| * | added comment for clarification, why the timestamp of the first msg of msg ↵ | steckbrief | 2015-10-17 | 1 | -1/+1 |
| | | | | | | | | list is needed to query older msgs with mam | ||||
| * | Removed unused imports | steckbrief | 2015-10-15 | 1 | -4/+0 |
| | | |||||
| * | Fixes FS#81 - avoid jumps after loading messages | steckbrief | 2015-10-15 | 1 | -10/+32 |
| | | |||||
* | | fixed importstrz/1.5.2.2 | lookshe | 2015-10-05 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2015-10-05 | 2 | -166/+0 |
|/ | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | ||||
* | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵ | steckbrief | 2015-10-04 | 1 | -0/+47 |
| | | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added | ||||
* | moved merged files to correct location | lookshe | 2015-08-16 | 2 | -0/+166 |