| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-29 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java | ||||
| | * | Implements FS#173: Move access to colors to separate helper class | steckbrief | 2016-03-29 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 1 | -4/+3 |
| | |\ | |/ |/| | |||||
| * | | Changed access to presences according to new Presence representation in C | steckbrief | 2016-02-23 | 1 | -3/+3 |
| | | | |||||
| * | | Imports organized | steckbrief | 2016-02-12 | 1 | -1/+0 |
| | | | |||||
| * | | fixed importstrz/1.5.2.2 | lookshe | 2015-10-05 | 1 | -3/+3 |
| |/ | |||||
| * | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵ | steckbrief | 2015-10-04 | 1 | -0/+63 |
| 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 | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/src/main/java/de/thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java (follow)