conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	more null checks for otr fingerprints	iNPUTmice	2014-12-20	1	-1/+1
\|
*	don't include empty fingerprints in list of otrfingerprints	iNPUTmice	2014-12-20	1	-4/+6
\|
*	fixed another break continue bug	iNPUTmice	2014-12-20	1	-3/+2
\|
*	inject ui callback into running mam query	iNPUTmice	2014-12-20	3	-4/+6
\|
*	Merge pull request #794 from svetlemodry/development	Daniel Gultsch	2014-12-20	1	-2/+2
\|\ \| \| \| \|	Czech image transfer string fix
\| *	Czech image transfer string fix	Jaroslav Lichtblau	2014-12-19	1	-2/+2
\| \|
* \|	Merge pull request #797 from kruks23/translation	Daniel Gultsch	2014-12-20	1	-4/+12
\|\ \ \| \| \| \| \| \|	Update spanish translations
\| * \|	Update spanish translations	kruks23	2014-12-20	1	-4/+12
\|/ /
* \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	iNPUTmice	2014-12-19	2	-0/+16
\|\ \ \| \| \| \| \| \| \| \| \|	development
\| * \|	Merge pull request #789 from svetlemodry/development	Daniel Gultsch	2014-12-19	1	-0/+8
\| \|\\| \| \| \| \| \| \|	Czech translation updated
\| \| *	Czech translation updated	Jaroslav Lichtblau	2014-12-18	1	-0/+8
\| \|/ \| \| \| \| \| \|	added missing strings
\| *	Merge pull request #787 from kriztan/patch-1	Daniel Gultsch	2014-12-18	1	-0/+8
\| \|\ \| \| \| \| \| \|	Update german translations
\| \| *	Update german translations	kriztan	2014-12-18	1	-0/+8
\| \|/
* /	fixed #755	iNPUTmice	2014-12-19	1	-1/+1
\|/
*	clean up conversation history after swtiching to a different conversation	iNPUTmice	2014-12-17	3	-4/+12
\|
*	show error if jid couldn't be parsed in new contact dialog	iNPUTmice	2014-12-17	1	-15/+10
\|
*	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	iNPUTmice	2014-12-17	3	-18/+19
\|\ \| \| \| \| \| \|	development
\| *	Merge pull request #783 from SamWhited/quiet-hours	Daniel Gultsch	2014-12-17	3	-18/+19
\| \|\ \| \| \| \| \| \|	Update summary in TimePreference change listener
\| \| *	Handle time comparisons using longs	Sam Whited	2014-12-16	2	-13/+8
\| \| \|
\| \| *	Update summary in TimePreference change listener	Sam Whited	2014-12-15	1	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensures the summary is updated even if we change the time preference programatically; also allows other places to stop the summary from being updated by setting a new listener.
* \| \|	made scroling smoother + bug fixes for history loading	iNPUTmice	2014-12-17	4	-21/+48
\| \| \|
* \| \|	smoothed out scrolling a bit	iNPUTmice	2014-12-17	3	-23/+45
\|/ /
* \|	properly detect images in share with	iNPUTmice	2014-12-17	1	-6/+6
\| \|
* \|	Merge branch 'issue756' of https://github.com/SamWhited/Conversations into ↵	iNPUTmice	2014-12-17	2	-25/+37
\|\ \ \| \| \| \| \| \| \| \| \|	SamWhited-issue756
\| * \|	Allow sending of any filetype via intent	Sam Whited	2014-12-15	2	-25/+37
\| \|/ \| \| \| \| \| \|	Fixes #756
* /	properly count mam messages	iNPUTmice	2014-12-17	2	-4/+13
\|/
*	go through mam history page by page. load mam dynamically on scroll	iNPUTmice	2014-12-15	5	-43/+108
\|
*	Merge pull request #782 from SamWhited/quiet-hours	Daniel Gultsch	2014-12-15	1	-3/+3
\|\ \| \| \| \|	Make some magic number constants final
\| *	Make some magic number constants final	Sam Whited	2014-12-15	1	-3/+3
\| \|
* \|	fixed crashing on unparsed jids	iNPUTmice	2014-12-15	1	-4/+4
\| \|
* \|	Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵	iNPUTmice	2014-12-15	1	-68/+64
\|\\| \| \| \| \| \| \|	into SamWhited-quiet-hours
\| *	Make silent notification when quiet hours are on	Sam Whited	2014-12-15	1	-68/+64
\| \| \| \| \| \| \| \| \| \|	Notify, just don't play a sound or vibrate Also make the Java annoyingly verbose... I can't help myself... ahh!
* \|	migrated more jid parsing to use getAttributeAsJid. added error logging	iNPUTmice	2014-12-15	4	-32/+8
\| \|
* \|	Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵	iNPUTmice	2014-12-15	4	-29/+176
\|\\| \| \| \| \| \| \|	into SamWhited-quiet-hours
\| *	Add quiet hours feature	Sam Whited	2014-12-14	4	-29/+176
\| \|
* \|	fixed history deletion. fixed #780	iNPUTmice	2014-12-15	2	-1/+11
\| \|
* \|	Merge pull request #775 from kruks23/translation1	Daniel Gultsch	2014-12-15	1	-33/+33
\|\ \ \| \| \| \| \| \|	Update spanish translations.
\| * \|	Update spanish translations.	kruks23	2014-12-13	1	-33/+33
\| \| \|
* \| \|	Merge pull request #781 from drizzt/patch-1	Daniel Gultsch	2014-12-15	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	fixed typo in italian translation
\| * \| \|	fixed typo in italian translation	drizzt	2014-12-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	s/gallaria/galleria/
* \| \| \|	avoid npe on weird platform bugs	iNPUTmice	2014-12-15	1	-30/+30
\|/ / /
* \| \|	run mam queries only when online	iNPUTmice	2014-12-14	2	-4/+31
\| \| \|
* \| \|	more patches for dns helper	iNPUTmice	2014-12-14	1	-13/+19
\| \|/ \|/\|
* \|	possible dns fixes	iNPUTmice	2014-12-14	2	-3/+12
\| \|
* \|	refactored the way certain messages are being found within a conversation	iNPUTmice	2014-12-14	5	-117/+193
\| \|
* \|	avoiding concurrent modification	iNPUTmice	2014-12-13	2	-6/+3
\| \|
* \|	fixed regression	iNPUTmice	2014-12-13	1	-3/+3
\| \|
* \|	reverse through mam history when loading larger chuncks	iNPUTmice	2014-12-13	5	-22/+79
\| \|
* \|	Merge branch 'feature/mam' into development	iNPUTmice	2014-12-13	17	-75/+535
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
\| * \|	various mam improvments	iNPUTmice	2014-12-13	6	-39/+130
\| \| \|