Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-01-13 | 1 | -2/+5 |
|\ | |||||
* | | Merge trz/rename into trz/rebase | steckbrief | 2015-10-22 | 1 | -4/+2 |
|\| | |||||
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplus | steckbrief | 2015-06-19 | 1 | -181/+0 |
| | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed | ||||
* | | Merge tag '1.5.2' into trz/rebase | lookshe | 2015-08-11 | 1 | -0/+1 |
| | | |||||
* | | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference | steckbrief | 2015-06-19 | 1 | -2/+4 |
| | | |||||
* | | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 1 | -0/+4 |
|/ | |||||
* | properly remove invalid avatar | iNPUTmice | 2015-02-22 | 1 | -0/+1 |
| | |||||
* | always call to cancel before loading new avatars | iNPUTmice | 2015-02-18 | 1 | -12/+14 |
| | |||||
* | fixed avatar cache lookup in ListItemAdapter | iNPUTmice | 2015-02-16 | 1 | -4/+1 |
| | |||||
* | made image view background more colorful while waiting on actual avatar to load | iNPUTmice | 2015-02-15 | 1 | -1/+2 |
| | |||||
* | loading avatars in seperate tasks | iNPUTmice | 2015-02-15 | 1 | -2/+89 |
| | |||||
* | click on dynamic tag to filter for that tag | Daniel Gultsch | 2015-01-02 | 1 | -0/+22 |
| | |||||
* | further npe checks | iNPUTmice | 2014-12-03 | 1 | -5/+11 |
| | |||||
* | happy hanukkah | iNPUTmice | 2014-11-16 | 1 | -0/+21 |
| | |||||
* | Update more files to use JID objects | Sam Whited | 2014-11-09 | 1 | -1/+1 |
| | |||||
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -1/+1 |
| | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+44 |