aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-1/+3
|\
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-54/+0
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-16/+30
|/
* Changed online color to green instead of primaryAnders Sandblad2015-01-231-1/+1
* Add incompatible server statusSam Whited2014-11-151-65/+13
* Add security error statusSam Whited2014-11-151-0/+4
* Make account status an enumSam Whited2014-11-151-11/+11
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-1/+1
* Update more files to use JID objectsSam Whited2014-11-091-1/+1
* Merge branch 'gradle' into developmentSam Whited2014-10-301-1/+1
* Make conversations the root projectSam Whited2014-10-221-0/+102