conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \|	fixed service discovery by properly storing and checking identities	Daniel Gultsch	2015-04-25	3	-30/+50
\| * \|	fixed #1039	Daniel Gultsch	2015-04-25	1	-0/+3
\| * \|	Merge pull request #1146 from BrianBlade/minor_otr_tweaks	Daniel Gultsch	2015-04-25	3	-6/+17
\| \|\ \
\| \| * \|	OTR: Fix onContactStatusChanged & dont archive OTR	BrianBlade	2015-04-21	3	-6/+17
\| * \| \|	cleaned up file handling	Daniel Gultsch	2015-04-25	3	-71/+87
\| * \| \|	send invite to other instanzes after creating ad hoc conference. fixes #1136	Daniel Gultsch	2015-04-23	1	-0/+8
\| * \| \|	fixed direct invites	Daniel Gultsch	2015-04-21	1	-12/+28
\| \|/ /
\| * \|	added missing translations from transifex	Daniel Gultsch	2015-04-21	11	-8/+24
\| * \|	Merge branch 'development' of github.com:siacs/Conversations into development	Daniel Gultsch	2015-04-20	1	-2/+3
\| \|\ \
\| \| * \|	added reference to the location plugin to README	Daniel Gultsch	2015-04-20	1	-1/+2
\| \| * \|	added amazon app store link (us store)	Daniel Gultsch	2015-04-20	1	-1/+1
\| * \| \|	pulled latest translations from transifex	Daniel Gultsch	2015-04-20	6	-3/+727
\| \|/ /
\| * \|	always hide pgp snackbar after decrypting a message. fixes #1075	Daniel Gultsch	2015-04-20	1	-0/+1
\| * \|	removed some dead code	Daniel Gultsch	2015-04-20	1	-19/+0
\| * \|	fixed weird touch on snackbar switched conversation bug	Daniel Gultsch	2015-04-20	1	-3/+2
\| * \|	some code clean up to fix some rare NPE’s	Daniel Gultsch	2015-04-19	2	-4/+7
\| \|/
\| *	increased undo delay	iNPUTmice	2015-04-17	1	-1/+1
\| *	fixed a bug in DNS helper code. fixes #1130	iNPUTmice	2015-04-16	2	-2/+2
\| *	bumped version to 1.3.0-alpha	iNPUTmice	2015-04-15	1	-2/+2
\| *	some bug fixes concerning 0byte files. fixes #1126	iNPUTmice	2015-04-15	2	-1/+2
\| *	maintain state when rotating settings activity	iNPUTmice	2015-04-14	2	-18/+26
\| *	Merge branch 'BrianBlade-dont_trust_cas_preference' into development	iNPUTmice	2015-04-14	5	-5/+28
\| \|\
\| \| *	Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...	iNPUTmice	2015-04-14	5	-5/+28
\| \|/\|
\| \| *	Add option to use MTM without default TrustManager	BrianBlade	2015-04-11	5	-4/+27
\| * \|	always show save button when account info was modified. fixes #918	iNPUTmice	2015-04-14	1	-5/+9
\| * \|	fixed disable account when sliding and not clicking the toggle	iNPUTmice	2015-04-13	2	-8/+9
\| * \|	fixed typos	iNPUTmice	2015-04-13	2	-2/+2
\| * \|	Merge pull request #1123 from lookshe/development	Daniel Gultsch	2015-04-13	1	-10/+18
\| \|\ \
\| \| * \|	Bugfix for issue #1121	lookshe	2015-04-13	1	-10/+18
\| * \| \|	shut up linter	iNPUTmice	2015-04-13	1	-0/+1
\| * \| \|	Maintain private chat on MUC. fixes #1097	iNPUTmice	2015-04-13	1	-1/+0
\| * \| \|	fixed regression where the selected conversation wasn't highlighted anymore o...	iNPUTmice	2015-04-13	3	-13/+12
\| \|/ /
\| * \|	allow sharing multiple images at once. fixes #1090	iNPUTmice	2015-04-11	3	-59/+111
\| * \|	don't resume old session when changing resource	iNPUTmice	2015-04-09	5	-7/+35
\| * \|	Merge pull request #1104 from BrianBlade/feature/swipe_out_conversation	Daniel Gultsch	2015-04-09	9	-71/+185
\| \|\ \
\| \| * \|	Enable end-conversation by swipe gesture	BrianBlade	2015-04-08	9	-71/+185
\| \|/ /
\| * \|	Merge pull request #1099 from BrianBlade/fix_otr_error_msgs	Daniel Gultsch	2015-04-02	2	-18/+24
\| \|\ \
\| \| * \|	Fix OTR-Error messages	BrianBlade	2015-04-01	2	-18/+24
\| \| \|/
\| * \|	Merge branch 'BrianBlade-account_state_switch' into development	iNPUTmice	2015-04-01	3	-17/+49
\| \|\ \
\| \| * \|	do not overlap account title and switch	iNPUTmice	2015-04-01	1	-1/+4
\| \| * \|	Merge branch 'account_state_switch' of https://github.com/BrianBlade/Conversa...	iNPUTmice	2015-04-01	3	-16/+45
\| \|/\| \|
\| \| * \|	Add toggle account-state switch	BrianBlade	2015-04-01	3	-16/+45
\| \| \|/
\| * \|	Merge pull request #1076 from rk4an/patch-1	Daniel Gultsch	2015-04-01	1	-0/+4
\| \|\ \
\| \| * \|	Update french translation	Erkan	2015-03-22	1	-0/+4
\| \| \|/
\| * /	pulled translations from transifex	iNPUTmice	2015-04-01	7	-15/+466
\| \|/
* /	fixed a bug in DNS helper code. fixes #1130	iNPUTmice	2015-04-16	2	-2/+2
\|/
*	bump version code1.2.0	iNPUTmice	2015-03-22	1	-2/+2
*	pulled translations	iNPUTmice	2015-03-22	5	-0/+21
*	properly set chat states when receiving otr status messages	iNPUTmice	2015-03-21	1	-1/+1
*	respond to unreadable OTR messages with error message. fixed #1021	iNPUTmice	2015-03-21	5	-3/+42