conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	added group add button	iNPUTmice	2014-07-10	2	-16/+21
\|
*	added action bar menu to start conversation	iNPUTmice	2014-07-10	2	-0/+29
\|
*	changed support lib to v13. added tabs and fragments to start conversation ↵	iNPUTmice	2014-07-10	2	-1/+10
\| \| \| \|	activity
*	moved hint box to the bottom	iNPUTmice	2014-07-10	2	-50/+63
\|
*	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-07-09	1	-5/+11
\|\
\| *	Merge pull request #245 from beriain/development	Daniel Gultsch	2014-07-08	1	-5/+11
\| \|\ \| \| \| \| \| \|	Update strings.xml and fix some strings
\| \| *	Update strings.xml	Aitor Beriain	2014-07-07	1	-5/+11
\| \| \|
* \| \|	unified warnings/error msgs	iNPUTmice	2014-07-09	9	-124/+33
\|/ /
* \|	uniformed colors. made colors a little material	iNPUTmice	2014-07-08	23	-108/+107
\| \|
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-07-07	2	-29/+120
\|\\|
\| *	Merge pull request #256 from kruks23/development	Daniel Gultsch	2014-07-07	1	-0/+2
\| \|\ \| \| \| \| \| \|	Update Spanish Translations
\| \| *	Update Spanish Translations	kruks23	2014-07-07	1	-0/+2
\| \| \|
\| * \|	Merge pull request #257 from BenoitBouvarel/development	Daniel Gultsch	2014-07-07	1	-29/+118
\| \|\ \ \| \| \|/ \| \|/\|	French translation updated
\| \| *	Update strings.xml	Benoit Bouvarel	2014-07-07	1	-31/+25
\| \| \|
\| \| *	French translation updated	Benoit Bouvarel	2014-07-07	1	-3/+98
\| \| \|
* \| \|	changed icons to light	iNPUTmice	2014-07-07	59	-6/+4
\|/ /
* /	styled action bar green	iNPUTmice	2014-07-07	1	-0/+23
\|/
*	small ui overhauls. unified text sizes. made text a bit smaller. moved ↵	iNPUTmice	2014-07-04	12	-33/+48
\| \| \| \|	messages more closer together
*	fixed #247	iNPUTmice	2014-07-04	1	-3/+3
\|
*	Update translation	Wenzel Pünter	2014-07-03	1	-2/+2
\|
*	Add missing German translations	Wenzel Pünter	2014-07-03	1	-9/+94
\|
*	fixed some tiny ui glitches	iNPUTmice	2014-07-02	2	-4/+4
\|
*	removed old notification icon	iNPUTmice	2014-06-30	3	-0/+0
\|
*	added error message for #240	iNPUTmice	2014-06-30	1	-0/+1
\|
*	Merge pull request #237 from kruks23/development	Daniel Gultsch	2014-06-30	1	-2/+6
\|\ \| \| \| \|	Update Spanish Translations
\| *	Update Spanish Translations	kruks23	2014-06-29	1	-2/+6
\| \|
* \|	more error handling for jingle connections	iNPUTmice	2014-06-29	1	-0/+1
\|/
*	made warnings in chats i tiny bit smaller	iNPUTmice	2014-06-27	2	-13/+18
\|
*	Update spanish mins ago	kruks23	2014-06-24	1	-2/+2
\|
*	added rendering script for artwork	iNPUTmice	2014-06-24	10	-0/+0
\|
*	new logo	iNPUTmice	2014-06-23	11	-0/+0
\|
*	removed duplicate entries	iNPUTmice	2014-06-21	1	-4/+0
\|
*	Merge branch 'development' of https://github.com/beriain/Conversations into ↵	iNPUTmice	2014-06-20	1	-240/+249
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	beriain-development Conflicts: res/values-eu/strings.xml
\| *	Update strings.xml	Aitor Beriain	2014-06-18	1	-3/+6
\| \|
\| *	Update strings.xml	Aitor Beriain	2014-06-09	1	-3/+30
\| \|
* \|	Rounded minutes ago and last seen + Update Spanish Translations	kruks23	2014-06-15	2	-9/+16
\| \|
* \|	moved last seen to contact details	iNPUTmice	2014-06-13	3	-26/+10
\| \|
* \|	finished offline otr	iNPUTmice	2014-06-12	1	-3/+1
\| \|
* \|	fixed scrolling issues	iNPUTmice	2014-06-10	1	-1/+1
\| \|
* \|	don't display 'enter password' message if OpenKeychain is not installed. ↵	iNPUTmice	2014-06-09	3	-1/+3
\| \| \| \| \| \| \| \|	made status messages in chat not selectable
* \|	Merge pull request #188 from DerHamster/worktest	Daniel Gultsch	2014-06-09	1	-1/+1
\|\ \ \| \| \| \| \| \|	small fix ( zerfifikat -> zertifikat )
\| * \|	small fix ( zerfifikat -> zertifikat )	eric	2014-06-09	1	-1/+1
\| \| \|
* \| \|	updated languages	iNPUTmice	2014-06-09	1	-5/+30
\|/ /
* \|	Update Spanish Translations	kruks23	2014-06-09	1	-16/+23
\| \|
* \|	localized date. rounded minutes, hours and dates in last seen	iNPUTmice	2014-06-07	3	-2/+3
\| \|
* \|	fixed last_seen_now	iNPUTmice	2014-06-06	1	-1/+1
\| \|
* \|	removed presence from last seen	iNPUTmice	2014-06-06	2	-2/+5
\| \|
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-06-06	1	-3/+7
\|\ \
\| * \	Merge pull request #178 from kruks23/development	Daniel Gultsch	2014-06-05	1	-3/+7
\| \|\ \ \| \| \| \| \| \| \| \|	Update Spanish Translations
\| \| * \|	Update Spanish Translations	kruks23	2014-06-05	1	-3/+7
\| \| \| \|