Commit Graph

16 Commits

Author SHA1 Message Date
iNPUTmice
a6a9ed4877 handle muc nicks with white spaces. fixed #884 2015-01-14 22:48:14 +01:00
iNPUTmice
241de062da cleaned up avatar / tile creation 2014-12-03 00:06:57 +01:00
iNPUTmice
1ff9293ee1 fix for concurrency issue 2014-11-29 13:09:56 +01:00
iNPUTmice
0ad6d0616f brought ad hoc conferences back. fixed #688 fixed #367 2014-11-20 18:20:42 +01:00
iNPUTmice
283d5058e5 synchronized around cache clear in avatar service 2014-11-17 20:01:56 +01:00
iNPUTmice
cf00f3fade happy hanukkah 2014-11-16 17:21:21 +01:00
iNPUTmice
c310ada8b3 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-09 17:05:20 +01:00
iNPUTmice
e9af0d4ca7 Merge branch 'master' into development 2014-11-09 17:02:49 +01:00
iNPUTmice
61f046a675 make avatar service not break on empty names 2014-11-09 17:02:39 +01:00
Sam Whited
180a0e4408 Rework `Account.getJid()' to return full JIDs
Remove `Account.getFullJid()'
2014-11-09 10:57:22 -05:00
Sam Whited
1a3327f2b1 Create avatar's for JID's w/o localparts 2014-11-09 07:00:40 -05:00
Sam Whited
5ce0cd3802 Fields that we sync on should be final 2014-11-09 07:00:40 -05:00
Sam Whited
f108fc5a5c Update more files to use JID objects 2014-11-09 07:00:40 -05:00
iNPUTmice
6a43bda4d7 fixed #617 2014-11-05 00:06:07 +01:00
Sam Whited
46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
Sam Whited
281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00