conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #146 from kruks23/development	Daniel Gultsch	2014-05-24	7	-24/+54
\|\ \| \| \| \|	More harcoded translations + Spanish
\| *	More harcoded translations + Spanish	kruks23	2014-05-24	7	-24/+54
\| \|
* \|	Merge pull request #140 from strb/mucicons	Daniel Gultsch	2014-05-24	1	-108/+41
\|\ \ \| \| \| \| \| \|	Refactored unknown contact picture generation
\| * \|	Refactored unknown contact picture generation	Andreas Straub	2014-05-21	1	-108/+41
\| \| \| \| \| \| \| \| \| \| \| \|	Introduce drawTile method in order to remove code duplication
* \| \|	Merge pull request #145 from kruks23/development	Daniel Gultsch	2014-05-23	5	-19/+47
\|\ \ \ \| \| \|/ \| \|/\|	Title activities translations + contacts translations + update Spanish
\| * \|	Title activities translations + contacts translations + update Spanish ↵	kruks23	2014-05-23	5	-19/+47
\|/ / \| \| \| \| \| \|	Translations
* \|	end otr sessions earlier / more often. can lead to unesessary handshakes but ↵	Daniel Gultsch	2014-05-23	3	-17/+32
\| \| \| \| \| \| \| \|	can improve reliabilty
* \|	fixed possible npe	Daniel Gultsch	2014-05-23	1	-0/+6
\| \|
* \|	code cleanup	Daniel Gultsch	2014-05-23	2	-10/+0
\| \|
* \|	updated readme	Daniel Gultsch	2014-05-23	1	-1/+1
\| \|
* \|	Merge pull request #143 from nachovfranco/mycommits	Daniel Gultsch	2014-05-23	2	-0/+195
\|\ \ \| \| \| \| \| \|	Galician translation
\| * \|	Galician translation	nachovfranco	2014-05-22	2	-0/+195
\| \| \|
* \| \|	Merge pull request #144 from kruks23/development	Daniel Gultsch	2014-05-23	3	-19/+46
\|\ \ \ \| \| \| \| \| \| \| \|	Contact details translations + update spanish translations
\| * \| \|	Contact details translations + update spanish translations	kruks23	2014-05-22	3	-19/+46
\|/ / /
* \| \|	offline crud of contacts	Daniel Gultsch	2014-05-22	5	-17/+48
\| \| \|
* \| \|	implementet missing methods on the new roster mgmt	Daniel Gultsch	2014-05-22	2	-3/+17
\|/ /
* \|	fixed #136	Daniel Gultsch	2014-05-22	2	-24/+36
\| \|
* \|	write contacts on system shutdown	Daniel Gultsch	2014-05-21	5	-132/+198
\| \|
* \|	added missing strings	Daniel Gultsch	2014-05-21	1	-1/+1
\| \|
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	Daniel Gultsch	2014-05-21	1	-2/+17
\|\\|
\| *	Merge pull request #138 from strb/highlight	Daniel Gultsch	2014-05-21	1	-2/+17
\| \|\ \| \| \| \| \| \|	Fix highlight detection in MUC channels
\| \| *	Fix highlight detection in MUC channels	Andreas Straub	2014-05-21	1	-2/+17
\| \|/ \| \| \| \| \| \| \| \| \| \|	We only detect highlights if a word starts with the nick (matched in case insensitive manner), followed by optional punctuation, followed by another word boundary.
* /	further improvment trying to deal with large images	Daniel Gultsch	2014-05-21	1	-1/+6
\|/
*	cleaned up shared text	Daniel Gultsch	2014-05-21	6	-26/+41
\|
*	auto retry image compression with decreasing sample size	Daniel Gultsch	2014-05-21	1	-17/+15
\|
*	close input stream	Daniel Gultsch	2014-05-20	1	-0/+1
\|
*	trying to deal with larger images	Daniel Gultsch	2014-05-20	1	-4/+17
\|
*	Merge pull request #131 from beriain/development	Daniel Gultsch	2014-05-20	1	-80/+121
\|\ \| \| \| \|	Update and fix basque translation
\| *	Update and fix basque translation	Beriain	2014-05-20	1	-80/+121
\| \|
* \|	Merge pull request #133 from kruks23/development	Daniel Gultsch	2014-05-20	5	-14/+18
\|\ \ \| \| \| \| \| \|	Update Spanish Translations + harcoded just_now
\| * \|	Update Spanish Translations + harcoded just_now	kruks23	2014-05-20	5	-14/+18
\| \| \|
\| * \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-05-20	8	-42/+33
\| \|\ \ \| \|/ / \|/\| \| \| \| \|	development
* \| \|	Merge pull request #128 from kruks23/development	Daniel Gultsch	2014-05-20	1	-3/+8
\|\ \ \ \| \| \| \| \| \| \| \|	Update Spanish Translations
* \| \| \|	highlight people in conferences by clicken on their picture	Daniel Gultsch	2014-05-20	1	-14/+27
\| \| \| \|
* \| \| \|	fixed ping time out after session resume	Daniel Gultsch	2014-05-20	1	-0/+1
\| \| \| \|
* \| \| \|	ported pending subscription support to new roster mgmt	Daniel Gultsch	2014-05-20	3	-28/+5
\| \| \| \|
* \| \| \|	added search icon	Daniel Gultsch	2014-05-20	4	-0/+0
\| \| \| \|
\| \| * \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-05-19	3	-41/+30
\| \| \|\ \ \| \|_\|/ / \|/\| \| \| \| \| \| \|	development
* \| \| \|	made roster persistant aka enabled versioning again	Daniel Gultsch	2014-05-19	3	-41/+30
\| \| \| \|
\| \| * \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-05-19	17	-642/+385
\| \|/\| \| \| \|/ / \|/\| \| \| \| \|	development
* \| \|	some code cleanup to deal with the roster mgmt changes from earlier	Daniel Gultsch	2014-05-19	3	-77/+54
\| \| \|
* \| \|	reworked roster/contact handling. might break some stuff. not sycing to disk yet	Daniel Gultsch	2014-05-19	16	-566/+332
\| \| \|
\| * \|	Update Spanish Translations	kruks23	2014-05-18	1	-3/+8
\| \| \|
\| * \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-05-18	10	-83/+92
\| \|\ \ \| \|/ / \|/\| \| \| \| \|	development
* \| \|	bind and session request more compatible	Daniel Gultsch	2014-05-18	4	-5/+21
\| \| \|
* \| \|	fixed #123 fixed122	Daniel Gultsch	2014-05-18	3	-31/+11
\| \| \|
* \| \|	cleaned up edit account dialog a little	Daniel Gultsch	2014-05-18	3	-20/+21
\| \| \|
* \| \|	fixed #53 aka server not found bug	Daniel Gultsch	2014-05-18	3	-27/+39
\| \| \|
\| * \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-05-17	3	-9/+13
\| \|\ \ \| \|/ / \|/\| \| \| \| \|	development
* \| \|	sending session after unsucesfull session resume. fixed #116	Daniel Gultsch	2014-05-17	1	-7/+8
\| \| \|