PiratX - The new way for communications

	Commit message (Collapse)	Author	Age	Files	Lines
*	fixed presence splitting	iNPUTmice	2014-09-20	1	-1/+1
\|
*	fixed #470	iNPUTmice	2014-09-20	4	-43/+60
\|
*	scroll fixes	iNPUTmice	2014-09-19	1	-6/+7
\|
*	add a forgotten break and remove some unused imports	Michael	2014-09-13	3	-3/+1
\|
*	check if market is available before starting to install openkey chain	iNPUTmice	2014-09-11	1	-2/+17
\|
*	match color in contact details to the colors in the send button. also ↵	iNPUTmice	2014-09-11	3	-13/+17
\| \| \| \|	migrated some other colors from hard coding to using resources
*	missed show=chat for send button colorization	iNPUTmice	2014-09-11	1	-0/+4
\|
*	IT'S CHRISTMAS ALREADY!	iNPUTmice	2014-09-10	2	-37/+120
\|
*	Merge branch 'master' of github.com:siacs/Conversations	iNPUTmice	2014-09-09	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/eu/siacs/conversations/crypto/PgpEngine.java src/eu/siacs/conversations/persistance/FileBackend.java src/eu/siacs/conversations/ui/ShareWithActivity.java
\| *	fixed #406	iNPUTmice	2014-09-02	1	-12/+8
\| \|
* \|	setting to increase font size. fixed #420	iNPUTmice	2014-09-08	7	-34/+53
\| \|
* \|	simplefied some code that might have been the source for some strange bugs	iNPUTmice	2014-09-08	1	-25/+15
\| \|
* \|	introduced downloadable interface. reverted some of the changes made to OTR	iNPUTmice	2014-09-08	2	-13/+5
\| \|
* \|	fixed sending offline pgp messages	iNPUTmice	2014-09-08	1	-7/+7
\| \|
* \|	settings to force encryption and setting for not saving messages to disk. ↵	iNPUTmice	2014-09-08	2	-29/+42
\| \| \| \| \| \| \| \|	fixed #353
* \|	warn on missing presence subscription	iNPUTmice	2014-09-08	2	-12/+26
\| \|
* \|	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2014-09-07	1	-1/+0
\|\ \
\| * \	Merge pull request #426 from betheg/remove_strings	Daniel Gultsch	2014-09-07	1	-1/+0
\| \|\ \ \| \| \| \| \| \| \| \|	deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
\| \| * \|	deleted some unused string-resources and imports, also deleted ↵	Michael	2014-09-07	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	edit_account_dialog.xml.
* \| \| \|	fixed #321 - delete otr fingerprints	iNPUTmice	2014-09-07	1	-3/+32
\|/ / /
* / /	fixed #425	iNPUTmice	2014-09-07	1	-1/+1
\|/ /
* \|	made shareing text with conferences possible again	iNPUTmice	2014-09-07	1	-24/+28
\| \|
* \|	added missing breaks oO	iNPUTmice	2014-09-07	1	-0/+2
\| \|
* \|	fixed npe	iNPUTmice	2014-09-07	1	-0/+3
\| \|
* \|	made otr a little bit more solid when there is no presence subscription	iNPUTmice	2014-09-06	3	-2/+6
\| \|
* \|	warn user if no presence subscription exists	iNPUTmice	2014-09-05	1	-0/+34
\| \|
* \|	reconnect accounts when resource has been changed in settings	iNPUTmice	2014-09-04	1	-3/+39
\| \|
* \|	made muc password dialog hide the password (password field)	iNPUTmice	2014-09-04	2	-10/+29
\| \|
* \|	added support for password protected muc - fixed #203 and fixed #395	iNPUTmice	2014-09-03	1	-17/+47
\| \|
* \|	changed order of snackbar hints	iNPUTmice	2014-09-03	1	-12/+11
\| \|
* \|	added ability to disable notifications for specific conversations - fixed #322	iNPUTmice	2014-09-03	2	-0/+41
\| \|
* \|	made emoticon parsing enableable - default false	iNPUTmice	2014-09-03	2	-2/+10
\| \|
* \|	fixed #410 by removing that config option	iNPUTmice	2014-09-02	6	-31/+7
\| \|
* \|	refactored share with activity	iNPUTmice	2014-09-02	5	-224/+232
\| \|
* \|	fixed #406	iNPUTmice	2014-09-02	1	-12/+8
\| \|
* \|	transform ascii to emoticons (on display only)	M. Dietrich	2014-09-01	2	-2/+2
\| \|
* \|	show merged time and status in message adapter	iNPUTmice	2014-08-31	1	-3/+3
\| \|
* \|	add missing blank before nick	iNPUTmice	2014-08-31	1	-0/+3
\| \|
* \|	Smarter nickname highlight insert in confernces	Bahtiar `kalkin-` Gadimov	2014-08-31	1	-6/+3
\| \|
* \|	some code cleanup	iNPUTmice	2014-08-31	13	-85/+111
\| \|
* \|	Merge pull request #391 from betheg/fix_typo	Daniel Gultsch	2014-08-31	1	-4/+4
\|\ \ \| \| \| \| \| \|	fix forgotten spelling.
\| * \|	Merge remote-tracking branch 'upstream/development' into fix_typo	Michael	2014-08-29	3	-3/+11
\| \|\\|
\| * \|	fix forgotten spelling.	Michael	2014-08-28	1	-4/+4
\| \| \|
* \| \|	experimental message merging	iNPUTmice	2014-08-31	1	-4/+11
\| \|/ \|/\|
* \|	fixed link to old resource	iNPUTmice	2014-08-29	1	-2/+2
\| \|
* \|	fixed npe	iNPUTmice	2014-08-29	1	-0/+4
\| \|
* \|	fixed #389	iNPUTmice	2014-08-29	1	-1/+5
\|/
*	fixed spelling thanks @betheg	iNPUTmice	2014-08-28	3	-10/+10
\|
*	translated missing string in settings	iNPUTmice	2014-08-27	1	-2/+6
\|
*	fixed message hint	iNPUTmice	2014-08-25	1	-51/+61
\|