conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \|
* \| \|	Merge branch 'master' into development	Daniel Gultsch	2014-05-17	2	-2/+5
\|\ \ \
\| * \| \|	bumped version 0.2.30.2.3	Daniel Gultsch	2014-05-17	2	-2/+5
\| \| \| \|
\| * \| \|	receiving pgp images important bug fix	Daniel Gultsch	2014-05-17	1	-1/+1
\| \| \| \|
\| \| * \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-05-17	7	-4/+22
\| \| \|\ \ \| \|_\|/ / \|/\| \| \| \| \| \| \|	development
* \| \| \|	added record audio button	Daniel Gultsch	2014-05-17	4	-1/+13
\| \| \| \|
* \| \| \|	made sending session more compliant	Daniel Gultsch	2014-05-17	1	-2/+2
\| \| \| \|
* \| \| \|	receiving pgp images important bug fix	Daniel Gultsch	2014-05-17	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' into development	Daniel Gultsch	2014-05-17	1	-0/+6
\|\\| \| \|
\| * \| \|	updated changelog for version 0.2.2	Daniel Gultsch	2014-05-17	1	-0/+6
\| \| \| \|
\| \| * \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-05-17	10	-32/+25
\| \| \|\ \ \| \|_\|/ / \|/\| \| \| \| \| \| \|	development
* \| \| \|	Update Validator.java	the-username	2014-05-17	1	-1/+1
\| \| \| \|
* \| \| \|	fixed #66	Daniel Gultsch	2014-05-17	2	-4/+1
\| \| \| \|
* \| \| \|	spelling	Daniel Gultsch	2014-05-17	1	-1/+1
\| \| \| \|
* \| \| \|	fixed #108	Daniel Gultsch	2014-05-17	1	-3/+4
\| \| \| \|
* \| \| \|	added translators to readme	Daniel Gultsch	2014-05-17	1	-3/+6
\|/ / /
* \| \|	version bump to 0.2.20.2.2	Daniel Gultsch	2014-05-17	1	-2/+2
\| \| \|
* \| \|	permanent notification disapears now when account is being deleted + code ↵	Daniel Gultsch	2014-05-17	3	-16/+9
\| \| \| \| \| \| \| \| \| \| \| \|	clean up
* \| \|	fixed #113	Daniel Gultsch	2014-05-17	1	-2/+1
\| \| \|
* \| \|	Merge pull request #120 from kruks23/development	Daniel Gultsch	2014-05-16	2	-1/+33
\|\ \ \ \| \| \| \| \| \| \| \|	Update Spanish Translations + harcoded pref_advanced_options
\| \| * \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	kruks23	2014-05-16	3	-20/+27
\| \|/\| \| \| \|/ / \|/\| \| \| \| \|	development
* \| \|	reworked message to conferences	Daniel Gultsch	2014-05-16	2	-16/+19
\| \| \|
* \| \|	fixed npe for otr sessions with non contacts	Daniel Gultsch	2014-05-16	1	-4/+8
\| \| \|
\| * \|	Update Spanish Translations + harcoded pref_advanced_settings	kruks23	2014-05-16	2	-1/+33
\|/ /
* \|	updated german translation	Daniel Gultsch	2014-05-16	2	-34/+71
\| \|
* \|	offline sending of pgp fixed	Daniel Gultsch	2014-05-16	2	-25/+43
\| \|