PiratX - The new way for communications

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| *	pulled translations from transifex	Daniel Gultsch	2015-12-07	1	-0/+26
\| \|
\| *	pulled new translations from transifex	Daniel Gultsch	2015-12-02	1	-26/+20
\| \|
* \|	modified strings	Christian S	2015-12-12	1	-0/+6
\| \|
* \|	updated strings	Christian S	2015-12-04	1	-1/+18
\| \|
* \|	typo	Christian S	2015-11-29	1	-1/+1
\| \|
* \|	added German strings for plugin loader	Christian S	2015-11-25	1	-0/+4
\| \|
* \|	modified some strings	Christian S	2015-11-15	1	-1/+2
\| \| \| \| \| \| \| \|	* added fork infos to about activity
* \|	rename Conversations to Pix-Art Messenger	Christian S	2015-11-14	1	-12/+12
\| \|
* \|	added german strings for crop library	Christian S	2015-11-14	1	-0/+5
\| \|
* \|	corrected german strings	Christian S	2015-10-22	1	-2/+2
\| \|
* \|	corrected strings-de	Christian S	2015-10-16	1	-11/+1
\| \|
* \|	Merge remote-tracking branch 'siacs/master' into development	Christian S	2015-10-16	1	-66/+86
\|\\|
\| *	pulled translations from transifex	Daniel Gultsch	2015-10-14	1	-0/+17
\| \|
\| *	pulled translations from transifex	Daniel Gultsch	2015-10-13	1	-67/+67
\| \|
* \|	updated german strings	Christian S	2015-10-10	1	-2/+2
\| \|
* \|	update missing strings	Christian S	2015-10-10	1	-0/+9
\| \|
* \|	Update strings.xml	Christian S.	2015-10-06	1	-1/+1
\| \|
* \|	updated German strings for updater	Christian S.	2015-10-06	1	-1/+1
\| \|
* \|	add german string for 'checking for updates'	Christian S.	2015-09-21	1	-0/+1
\| \|
* \|	copy commits	Christian S	2015-09-18	1	-1/+5
\|\\|
\| *	pulled translations from transifex	Daniel Gultsch	2015-09-15	1	-0/+5
\| \|
* \|	Merge branch 'siacs/master' into development	Christian S	2015-09-15	1	-1/+0
\|\\|
\| *	pulled translations from transifex	Daniel Gultsch	2015-09-14	1	-1/+0
\| \|
* \|	added some toasts to UpdaterActivity	Christian S	2015-09-06	1	-0/+2
\| \|
* \|	version 1.6.9 beta	Christian S	2015-09-06	1	-0/+8
\| \| \| \| \| \| \| \|	* in app updater
* \|	copy commits	Christian S	2015-08-29	1	-2/+5
\|\\|
\| *	pulled updated translations from transifex	Daniel Gultsch	2015-08-28	1	-1/+1
\| \|
\| *	added XEP number for http file upload	Daniel Gultsch	2015-08-27	1	-3/+6
\| \|
* \|	changed string back	Christian S	2015-08-26	1	-1/+1
\| \|
* \|	Version 1.6.5	Christian S	2015-08-26	1	-2/+4
\|\\|
\| *	pulled translations from transifex	Daniel Gultsch	2015-08-24	1	-2/+4
\| \|
\| *	renamed plain text to unencrypted. fixes #1331	Daniel Gultsch	2015-08-24	1	-2/+2
\| \|
* \|	replaced ... with …	Christian S	2015-08-19	1	-1/+1
\| \|
* \|	copy commits	Christian S	2015-08-19	1	-5/+28
\|\\|
\| *	pulled translations from transifex	Daniel Gultsch	2015-08-19	1	-1/+28
\| \|
* \|	Merge pull request #23 from kriztan/Subtitle	Christian S.	2015-08-18	1	-0/+1
\|\ \ \| \| \| \| \| \|	modified strings for subtitle typing info
\| * \|	add subtitle to ActionBar in chatviews	Christian S	2015-08-18	1	-0/+1
\| \|/ \| \| \| \| \| \| \| \| \| \|	* display typing information in ActionBar as subtitle for single user chats * display participants in ActionBar as subtitle for conferences
* \|	added German translation for undo string	Christian S.	2015-08-16	1	-2/+3
\| \|
* \|	copy commits	Christian S	2015-08-08	1	-0/+3
\|\\|
* \|	Merge pull request #18 from siacs/development	Christian S.	2015-08-03	1	-3/+0
\|\\| \| \| \| \|	copy commits
\| *	sync translations with transifex	Daniel Gultsch	2015-08-03	1	-3/+0
\| \|
* \|	removed username from typing info	Christian S	2015-07-30	1	-0/+1
\|/
*	pulled new translations from transifex	Daniel Gultsch	2015-07-20	1	-1/+1
\|
*	pulled translations	Daniel Gultsch	2015-07-18	1	-0/+2
\|
*	made 'check image on http host' message more generic. fixed #1281	Daniel Gultsch	2015-07-16	1	-5/+3
\|
*	pulled translations from transifex	Daniel Gultsch	2015-05-20	1	-0/+5
\|
*	pulled translations from transifex	Daniel Gultsch	2015-04-26	1	-1/+1
\|
*	Add option to remove manually approved certificates	BrianBlade	2015-04-19	1	-0/+11
\| \| \| \| \| \| \|	- "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options"
*	Merge branch 'dont_trust_cas_preference' of ↵	iNPUTmice	2015-04-14	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml
\| *	Add option to use MTM without default TrustManager	BrianBlade	2015-04-11	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked.