1072 Commits

Author	SHA1	Message	Date
Aitor Beriain	d9182fe81c	Update basque translation	2014-11-27 18:33:42 +01:00
iNPUTmice	3d8a2e7923	Merge branch 'development' of https://github.com/siacs/Conversations into development	2014-11-27 10:30:27 +01:00
iNPUTmice	7ba41c6a8e	fixed npe. fixed #717	2014-11-27 10:30:06 +01:00
iNPUTmice	2f02d8d398	create conversation with bare jid	2014-11-27 10:26:53 +01:00
iNPUTmice	0b8032dbd6	use getAttributeAsJid method	2014-11-27 10:26:34 +01:00
kriztan	e1e28e9ef6	Update german translations ... modified translations a bit	2014-11-26 11:39:40 +01:00
Daniel Gultsch	7a75a8bc5a	Merge pull request #713 from betheg/muc ... MUC: do not add yourself to the muc user list.	2014-11-24 11:53:28 +01:00
Daniel Gultsch	6f21dc84d5	Merge pull request #714 from betheg/muc_bookmark_cd ... MUC: option to set/delete bookmark in conference details.	2014-11-24 09:31:29 +01:00
Michael	31b539daf7	MUC: option to set/delete bookmark in conference details.	2014-11-23 21:37:45 +01:00
kriztan	4d841587c8	Update german translations	2014-11-23 15:21:12 +01:00
Michael	dbe8280662	add an listener for the muc roster update. ... this is for the ConferenceDetailsActivity to show precence updates immediately.	2014-11-23 15:19:44 +01:00
Michael	bdfdc5fb10	MUC: do not add yourself to the muc user list.	2014-11-23 15:19:07 +01:00
kruks23	ca761bac3c	Update spanish translations	2014-11-22 00:37:41 +01:00
iNPUTmice	28fefad834	work around to not confuse irc transport with real conference servers	2014-11-21 20:34:19 +01:00
Daniel Gultsch	36f8a31d7d	Merge pull request #706 from betheg/unused_imports ... remove unused imports.	2014-11-21 20:03:46 +01:00
iNPUTmice	81a1a48b8d	update action bar with conversations updates as well	2014-11-21 20:02:13 +01:00
Michael	febbefefa5	MUC: set from when join muc.	2014-11-21 19:37:50 +01:00
Michael	dc0dba3faf	remove unused imports.	2014-11-21 19:17:27 +01:00
iNPUTmice	424de3ea3a	move task to back and not finish when hitting back button	2014-11-21 18:57:27 +01:00
Michael	44faec7051	STATUS_CODE_SELF_PRESENCE is not set in all case.	2014-11-21 16:14:56 +01:00
iNPUTmice	888475d4fe	additional null pointer saftey checks	2014-11-21 15:25:57 +01:00
iNPUTmice	de0b36fc78	verify contacts key only on initiating side of smp	2014-11-21 13:42:25 +01:00
iNPUTmice	92ad4cb736	changed listener timing and cache clearing after muc presences	2014-11-20 22:44:31 +01:00
iNPUTmice	66abdfccd4	create file and dirs before creating file	2014-11-20 22:02:32 +01:00
Daniel Gultsch	8fe3b2974b	Merge pull request #698 from kriztan/patch-1 ... Update german translations	2014-11-20 21:47:12 +01:00
Michael	3e3767cb06	change status codes string 'number' to a better readable constant.	2014-11-20 21:37:56 +01:00
kriztan	13bb46d550	Update german translations	2014-11-20 19:20:49 +01:00
iNPUTmice	a207240881	fixed potential NPEs	2014-11-20 18:42:47 +01:00
iNPUTmice	a142dcc263	import fixes	2014-11-20 18:33:04 +01:00
iNPUTmice	8b10ea676c	Merge branch 'development' of https://github.com/siacs/Conversations into development	2014-11-20 18:20:45 +01:00
iNPUTmice	0ad6d0616f	brought ad hoc conferences back. fixed #688 fixed #367	2014-11-20 18:20:42 +01:00
Sam Whited	73d184352e	Remove broken / unused imports	2014-11-19 14:57:23 -05:00
iNPUTmice	e9948f6b84	sent read marker to full jid	2014-11-19 17:40:42 +01:00
iNPUTmice	cbf42ee12c	some saftey checks before registering listeners in XmppActivity	2014-11-19 17:31:28 +01:00
Daniel Gultsch	4b9a507633	Merge pull request #691 from kruks23/development ... Update spanish translation	2014-11-19 17:22:57 +01:00
Daniel Gultsch	393807ab2d	Merge pull request #692 from kriztan/patch-3 ... Update german translations	2014-11-19 17:22:50 +01:00
Aitor Beriain	24b5d0eb26	Update basque translation	2014-11-19 16:12:31 +01:00
kriztan	6847594363	Update german translations	2014-11-19 08:51:23 +01:00
kruks23	3ccee22c86	Update spanish translations	2014-11-19 00:16:45 +01:00
kruks23	8f33f3540a	Update spanish translations	2014-11-18 23:53:37 +01:00
iNPUTmice	66087cb360	put error notification into notification service	2014-11-18 15:26:28 +01:00
iNPUTmice	1122e084a0	simplified message merge condition	2014-11-18 14:49:49 +01:00
iNPUTmice	10bf2b77a8	synchronized message list in conversation fragment	2014-11-18 14:43:15 +01:00
iNPUTmice	dcebc120ac	show dynamic tags in contacts activity as well	2014-11-18 14:24:06 +01:00
iNPUTmice	ab832bcff7	properly remove conversations context menu	2014-11-18 13:51:04 +01:00
iNPUTmice	d29c861d03	disabled broken conversations context menu	2014-11-18 03:12:51 +01:00
iNPUTmice	018a0c7978	better usage of synchronized in some places	2014-11-18 03:10:59 +01:00
iNPUTmice	090e6ecf09	better exception handling in XmppConnection.connect. (never return without throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary	2014-11-18 01:48:16 +01:00
iNPUTmice	d2a4855a1e	added rendered versions of new icons	2014-11-18 00:42:19 +01:00
iNPUTmice	240d2d68c8	context menu for conversations. fixed #630	2014-11-18 00:07:27 +01:00