conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	couple of bug fixes related to muc renaming	iNPUTmice	2014-07-15	5	-15/+20
\|
*	fixed #276	iNPUTmice	2014-07-15	1	-0/+9
\|
*	unregister bookmark on conversation when bookmark is deleted	iNPUTmice	2014-07-15	2	-0/+7
\|
*	added confirm dialog before contact and bookmark removal	iNPUTmice	2014-07-15	3	-12/+50
\|
*	bug fix on deleting conference bookmarks	iNPUTmice	2014-07-15	1	-1/+1
\|
*	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-07-15	1	-4/+22
\|\
\| *	Merge pull request #275 from BenoitBouvarel/development	Daniel Gultsch	2014-07-15	1	-4/+22
\| \|\ \| \| \| \| \| \|	Update french translation
\| \| *	Update strings.xml	Benoit Bouvarel	2014-07-15	1	-4/+22
\| \| \|
* \| \|	use nick from bookmark if available	iNPUTmice	2014-07-15	6	-65/+78
\|/ /
* \|	pushing bookmarks back to server	iNPUTmice	2014-07-15	6	-12/+87
\| \|
* \|	use proper picture on bookmarked conferences when joined. use bookmark title ↵	iNPUTmice	2014-07-14	7	-23/+59
\| \| \| \| \| \| \| \|	when no subject is set
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-07-14	1	-1/+5
\|\ \
\| * \	Merge pull request #273 from kruks23/development	Daniel Gultsch	2014-07-13	1	-1/+5
\| \|\ \ \| \| \| \| \| \| \| \|	Update Spanish Translations
\| \| * \|	Update Spanish Translations	kruks23	2014-07-13	1	-1/+5
\| \|/ /
* \| \|	fetch bookmarks from server	iNPUTmice	2014-07-14	8	-17/+254
\| \| \|
* \| \|	fixed spelling in README and added mission statement to docs	iNPUTmice	2014-07-14	2	-1/+26
\|/ /
* \|	more faq	iNPUTmice	2014-07-12	1	-0/+17
\| \|
* \|	spelling in readme	iNPUTmice	2014-07-12	1	-2/+2
\| \|
* \|	added two more qna to the faq	iNPUTmice	2014-07-12	1	-0/+24
\| \|
* \|	added statement about status and priority to faq	iNPUTmice	2014-07-12	1	-6/+23
\| \|
* \|	fixed #268	iNPUTmice	2014-07-12	1	-0/+0
\| \|
* \|	refactored ui listeners a little bit	iNPUTmice	2014-07-12	9	-294/+398
\| \|
* \|	made conversation list thread safe	iNPUTmice	2014-07-12	4	-8/+15
\| \|
* \|	moved iq parser to seperate class as well	iNPUTmice	2014-07-12	3	-97/+108
\| \|
* \|	cleanup for presence parser	iNPUTmice	2014-07-12	3	-19/+11
\| \|
* \|	moved most of the message/presence generation into seperate classes	iNPUTmice	2014-07-12	9	-135/+150
\| \|
* \|	made message parser and presence parser implement interface On*PacketReceived	iNPUTmice	2014-07-12	3	-151/+147
\| \|
* \|	switch SearchView with custom action view	iNPUTmice	2014-07-11	5	-94/+149
\| \|
* \|	added join conference dialog	iNPUTmice	2014-07-11	7	-7/+110
\| \|
* \|	improved iterating over hashmap	iNPUTmice	2014-07-11	2	-12/+5
\| \|
* \|	fishing invites and delivery reports out of carbon copied messages	iNPUTmice	2014-07-11	1	-6/+10
\| \|
* \|	made jingle connection array thread safe	iNPUTmice	2014-07-11	2	-5/+4
\| \|
* \|	cleanup. removed old contacts activity. WARNING: this will temporarly ↵	iNPUTmice	2014-07-11	10	-752/+21
\| \| \| \| \| \| \| \|	disable muc invites
* \|	changed 'show time threshold' to 6h	iNPUTmice	2014-07-11	1	-1/+1
\| \|
* \|	fixed #255 and made some other improvements to the subscription mgmt	iNPUTmice	2014-07-11	5	-53/+49
\| \|
* \|	Merge pull request #262 from kruks23/development	Daniel Gultsch	2014-07-11	2	-4/+17
\|\ \ \| \| \| \| \| \|	Show time in messages previous days
\| * \|	Update Spanish Translations	kruks23	2014-07-10	1	-3/+16
\| \| \|
\| * \|	Show time in messages previous days	kruks23	2014-07-10	1	-2/+2
\| \| \|
\| * \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-07-10	43	-83/+600
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	development
\| * \ \	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-07-09	12	-156/+59
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	development
\| * \| \| \|	Show time in messages previous days	kruks23	2014-07-08	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	dirty push / delete flags are not set/reset correctly	iNPUTmice	2014-07-10	1	-4/+2
\| \| \| \| \|
* \| \| \| \|	added bitcoin address	iNPUTmice	2014-07-10	1	-3/+4
\| \| \| \| \|
* \| \| \| \|	formating and paypal disclaimer	iNPUTmice	2014-07-10	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	add donate button	iNPUTmice	2014-07-10	1	-2/+4
\| \| \| \| \|
* \| \| \| \|	fixed #38	iNPUTmice	2014-07-10	8	-13/+130
\| \|_\|/ / \|/\| \| \|
* \| \| \|	added create contact dialog	iNPUTmice	2014-07-10	3	-4/+106
\| \| \| \|
* \| \| \|	added contextual menu for contacts	iNPUTmice	2014-07-10	6	-15/+85
\| \| \| \|
* \| \| \|	small changes	iNPUTmice	2014-07-10	3	-28/+13
\| \| \| \|
* \| \| \|	made searchview text color white	iNPUTmice	2014-07-10	1	-0/+4
\| \| \| \|