conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\
\| *	1) Renamed values-zh values-zh_rCN in accordance with #329 and Android conven...	Isaac Kwan	2014-10-03	4	-0/+343
* \|	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/>.	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.	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	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	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	Michael	2014-09-26	2	-0/+0
\| \| \|/ /
\| * \| \|	Merge pull request #499 from betheg/hardcoded_string	Daniel Gultsch	2014-09-27	1	-1/+1
\| \|\ \ \
\| \| * \| \|	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
\|/
*	version bump to 0.7.20.7.2	iNPUTmice	2014-09-23	2	-2/+13
*	changed method that determins whether or not sm is available	iNPUTmice	2014-09-23	1	-5/+1
*	refactored options menu handling a bit	iNPUTmice	2014-09-23	1	-140/+149
*	changed app title in cs translation	iNPUTmice	2014-09-23	1	-1/+1
*	dont mark message as send on resend	iNPUTmice	2014-09-23	1	-1/+6
*	fixed rare npe	iNPUTmice	2014-09-23	1	-20/+21
*	fixed very rare npe	iNPUTmice	2014-09-22	1	-1/+1
*	formating fixes for chinese	iNPUTmice	2014-09-22	1	-2/+2
*	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-09-22	1	-0/+260
\|\
\| *	Merge pull request #479 from AizazAZ/master	Daniel Gultsch	2014-09-22	1	-0/+260
\| \|\
\| \| *	Added Chinese (Simplified) Translation	AZ	2014-09-22	1	-0/+260
* \| \|	fixed #452	iNPUTmice	2014-09-22	6	-4/+30
\|/ /
* \|	don't show time stamp within the last 6 hours of a new day	iNPUTmice	2014-09-22	1	-1/+1
* \|	added 'model' to selectable resources. fixed #461	iNPUTmice	2014-09-22	1	-1/+15
* \|	show full date in message list, fixed #328	iNPUTmice	2014-09-21	2	-4/+20
* \|	changed message merger a bit	iNPUTmice	2014-09-21	1	-9/+10