conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	fixed rare npe	iNPUTmice	2014-10-05	1	-0/+4
\|
*	Merge pull request #524 from betheg/muc_errors_conditions	Daniel Gultsch	2014-10-05	4	-1/+42
\|\ \| \| \| \|	MUC: differentiated a few more errors.
\| *	MUC: differentiated a few more errors.	Michael	2014-10-05	4	-1/+42
\| \|
* \|	Merge pull request #523 from betheg/leaked_window	Daniel Gultsch	2014-10-05	1	-1/+3
\|\ \ \| \| \| \| \| \|	fixed an 'activity has leaked window'
\| * \|	fixed an 'activity has leaked window'	Michael	2014-10-04	1	-1/+3
\| \|/
* \|	fixed #510	iNPUTmice	2014-10-05	1	-2/+48
\| \|
* \|	end otr session instead of only resetting	iNPUTmice	2014-10-05	1	-1/+1
\| \|
* \|	sending initial ping before going online after login/resume to ensure that ↵	iNPUTmice	2014-10-05	1	-2/+18
\|/ \| \| \|	all presences and messages have been loaded
*	no dns retry after nosrv error	iNPUTmice	2014-10-04	2	-6/+7
\|
*	added missing status messages after message scroll	iNPUTmice	2014-10-04	1	-0/+1
\|
*	reset pending subscription request	iNPUTmice	2014-10-04	1	-0/+1
\|
*	minor ui tweak	iNPUTmice	2014-10-04	1	-3/+4
\|
*	implemented ping (xep-0199) fixed #517	iNPUTmice	2014-10-03	1	-0/+3
\|
*	minor graphic tweaks in copy otr fingerprint to clipboard	iNPUTmice	2014-10-03	1	-1/+3
\|
*	let's own otr-fingerprint copy to clipboard.	Michael	2014-10-03	10	-10/+175
\|
*	fixed chinese translations	iNPUTmice	2014-10-03	5	-265/+263
\|
*	bug fixes	iNPUTmice	2014-10-03	2	-3/+2
\|
*	revised tablet ui. fixed #423	iNPUTmice	2014-10-03	9	-117/+175
\|
*	Merge pull request #518 from isaackwan/translation_zhrCN-TW2	Daniel Gultsch	2014-10-03	4	-0/+343
\|\ \| \| \| \|	Chinese Translation fixes
\| *	1) Renamed values-zh values-zh_rCN in accordance with #329 and Android ↵	Isaac Kwan	2014-10-03	4	-0/+343
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	conventions 2) Added arrays.xml translations for Simplified Chinese (zh_rCN) 3) Added translations (arrays.xml and strings.xml) for Traditional Chinese (zh_rTW)
* \|	fixed possible npe	iNPUTmice	2014-10-03	1	-1/+5
\| \|
* \|	check if display is off for notifications	iNPUTmice	2014-10-02	1	-2/+8
\| \|
* \|	mark conversation as read when displayed marker from another client is received	iNPUTmice	2014-10-02	4	-7/+27
\| \|
* \|	avoided unecessary message searchs	iNPUTmice	2014-10-02	1	-12/+20
\| \|
* \|	show displayed by contact on all devices	iNPUTmice	2014-10-02	2	-11/+9
\| \|
* \|	properly dismiss notifications	iNPUTmice	2014-10-02	2	-10/+25
\|/
*	calculate sample size for thumbnails as well	iNPUTmice	2014-09-30	1	-2/+15
\|
*	Merge pull request #505 from betheg/fix_invite	Daniel Gultsch	2014-09-30	1	-1/+3
\|\ \| \| \| \|	fixed muc invite with <body/>.
\| *	fixed muc invite with <body/>.	Michael	2014-09-29	1	-1/+3
\| \|
* \|	notifiy only when necessary	Daniel Gultsch	2014-09-29	7	-44/+68
\| \|
* \|	more improvments for new notification service	Daniel Gultsch	2014-09-28	8	-211/+53
\| \|
* \|	new notification service. first draft	Daniel Gultsch	2014-09-28	22	-84/+264
\|/
*	made muc passwords and prefereced encryption method persistant across restarts	iNPUTmice	2014-09-27	8	-12/+75
\|
*	Merge pull request #504 from betheg/inflate	Daniel Gultsch	2014-09-27	1	-2/+2
\|\ \| \| \| \|	add false argument to inflate.
\| *	add false argument to inflate.	Michael	2014-09-27	1	-2/+2
\| \|
* \|	fixed link	iNPUTmice	2014-09-27	1	-1/+1
\| \|
* \|	added flattr button	iNPUTmice	2014-09-27	1	-1/+4
\|/
*	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-09-27	6	-1/+17
\|\
\| *	Merge pull request #485 from kruks23/translation5	Daniel Gultsch	2014-09-27	1	-0/+7
\| \|\ \| \| \| \| \| \|	Update Spanish Translations
\| \| *	Update Spanish Translations	kruks23	2014-09-24	1	-0/+7
\| \| \|
\| * \|	Merge pull request #487 from weiss/add-german-translations	Daniel Gultsch	2014-09-27	2	-0/+9
\| \|\ \ \| \| \| \| \| \| \| \|	Add missing German translations
\| \| * \|	Add missing German translations	Holger Weiß	2014-09-24	2	-0/+9
\| \| \| \|
\| * \| \|	Merge pull request #498 from betheg/locale_folder	Daniel Gultsch	2014-09-27	2	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	fix lint-warning: Wrong locale name
\| \| * \| \|	fix lint-warning: Wrong locale name	Michael	2014-09-26	2	-0/+0
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	The Hebrew ("he") language code is rewritten as "iw"
\| * \| \|	Merge pull request #499 from betheg/hardcoded_string	Daniel Gultsch	2014-09-27	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	fix lint-warning: Hardcoded text
\| \| * \| \|	fix lint-warning: Hardcoded text	Michael	2014-09-26	1	-1/+1
\| \| \|/ /
* \| / /	fixed some lint warnings. thanks @betheg	iNPUTmice	2014-09-27	5	-1/+10
\|/ / /
* \| \|	anwser to xmpp: style uris. fixed open conversations from android address book	iNPUTmice	2014-09-27	5	-20/+107
\| \| \|
* \| \|	revised send button in landscape mode	iNPUTmice	2014-09-27	2	-2/+3
\|/ /
* /	added Aizaz AZ as translator to readme	iNPUTmice	2014-09-24	1	-0/+1
\|/