210 Commits

Author	SHA1	Message	Date
Daniel Gultsch	393807ab2d	Merge pull request #692 from kriztan/patch-3 ... Update german translations	2014-11-19 17:22:50 +01:00
Aitor Beriain	24b5d0eb26	Update basque translation	2014-11-19 16:12:31 +01:00
kriztan	6847594363	Update german translations	2014-11-19 08:51:23 +01:00
kruks23	3ccee22c86	Update spanish translations	2014-11-19 00:16:45 +01:00
kruks23	8f33f3540a	Update spanish translations	2014-11-18 23:53:37 +01:00
iNPUTmice	66087cb360	put error notification into notification service	2014-11-18 15:26:28 +01:00
iNPUTmice	dcebc120ac	show dynamic tags in contacts activity as well	2014-11-18 14:24:06 +01:00
iNPUTmice	ab832bcff7	properly remove conversations context menu	2014-11-18 13:51:04 +01:00
iNPUTmice	d2a4855a1e	added rendered versions of new icons	2014-11-18 00:42:19 +01:00
iNPUTmice	240d2d68c8	context menu for conversations. fixed #630	2014-11-18 00:07:27 +01:00
iNPUTmice	f41c3eee04	context menu for muc participants + refactor trueCounterpart to use Jid class	2014-11-17 20:02:46 +01:00
iNPUTmice	283d5058e5	synchronized around cache clear in avatar service	2014-11-17 20:01:56 +01:00
Daniel Gultsch	e664a0c936	Merge pull request #680 from ferdev1/patch-2 ... Fix string 2	2014-11-17 18:14:50 +01:00
iNPUTmice	e30e84c819	slightly modified logo / launcher icon	2014-11-17 17:23:58 +01:00
ferdev1	6c13b8a9a1	Update strings.xml	2014-11-17 17:13:20 +01:00
iNPUTmice	ceecc8ffe7	Merge branch 'development' of https://github.com/siacs/Conversations into development	2014-11-17 01:54:19 +01:00
iNPUTmice	967cd922e1	highlight muc members by touching their name in muc details. fixed #503	2014-11-17 01:54:01 +01:00
ferdev1	c147f44cf1	Fix string	2014-11-16 18:11:14 +01:00
iNPUTmice	cf00f3fade	happy hanukkah	2014-11-16 17:21:21 +01:00
iNPUTmice	2067b9bd8d	made scan and show qr code more accessible in VerifyOtrActivity	2014-11-16 02:10:29 +01:00
kruks23	0dc711d710	Update Spanish Translations	2014-11-15 20:48:31 +01:00
Sam Whited	251f4d6d7f	Add incompatible server status	2014-11-15 11:29:58 -05:00
Sam Whited	c09d450db8	Add security error status	2014-11-15 11:21:47 -05:00
iNPUTmice	35bf13f5ef	Merge branch 'feature/file_transfer' into development ... Conflicts: src/main/res/values/strings.xml	2014-11-15 15:52:15 +01:00
iNPUTmice	07b07115d6	Merge branch 'feature/foreground_service' into development ... Conflicts: src/main/res/values/strings.xml	2014-11-15 15:51:27 +01:00
iNPUTmice	5b9c690c47	Merge branch 'feature/otr_verification' into development	2014-11-15 15:50:35 +01:00
iNPUTmice	3c6b3506e3	turn on foreground service in expert settings	2014-11-15 15:34:34 +01:00
iNPUTmice	41f7848f2c	handled more error cases	2014-11-15 15:34:12 +01:00
iNPUTmice	47d44448f3	fixed description in notifications and conversation overview	2014-11-15 15:34:12 +01:00
iNPUTmice	cc4f3702a8	made file transfers cancelable	2014-11-15 15:34:12 +01:00
iNPUTmice	4ab558715c	adepted conversationadapter to deal with files	2014-11-15 15:34:12 +01:00
iNPUTmice	e7a70a46e0	some mime and pgp fixes for file transfer	2014-11-15 15:34:12 +01:00
iNPUTmice	c7acfe85c3	progress for http images as well. fixed open button for sent files	2014-11-15 15:34:12 +01:00
iNPUTmice	7a90ca429b	basic arbitrary file transfer	2014-11-15 15:34:11 +01:00
Daniel Gultsch	e2fb32841b	Merge pull request #666 from SamWhited/localefixes ... Spelling fixes	2014-11-15 13:12:29 +01:00
Sam Whited	8650bc2e13	Make licenses info untranslatable	2014-11-14 22:33:18 -05:00
Sam Whited	bae2b7ddc6	Spelling fixes in Italian translation	2014-11-14 22:16:58 -05:00
Sam Whited	62404b234c	Spelling fix in German translation	2014-11-14 22:13:42 -05:00
kriztan	fca3e3c756	Update German language ... deleted 'pref_about_message'	2014-11-12 20:09:14 +01:00
kriztan	b971965697	Update German language	2014-11-12 13:13:59 +01:00
iNPUTmice	e33fc26cbe	added snackbar to indicate smp. more error handling in verify activity	2014-11-11 17:40:51 +01:00
iNPUTmice	6cd2ff0d88	initial smp support	2014-11-11 17:40:51 +01:00
iNPUTmice	26b4788733	formating	2014-11-09 21:27:37 +01:00
Daniel Gultsch	a01ff66537	Merge pull request #645 from betheg/about_all_libs ... add all used libs to the pref_about_message	2014-11-09 21:18:32 +01:00
Michael	b1da9ae3cc	add libidn to pref_about_message.	2014-11-09 21:02:35 +01:00
Michael	f146c203a9	add all used libs to the pref_about_message. ... also improve the notice a bit.	2014-11-09 13:59:38 +01:00
kruks23	6f6f15d563	Update Spanish Translations	2014-11-09 13:29:30 +01:00
iNPUTmice	f8d5d6b2b5	reformated license a bit	2014-11-04 23:47:15 +01:00
Sam Whited	df786cbf01	Shorten license text and fix height of scrollview	2014-11-04 13:26:48 -05:00
Sam Whited	7b67f1a19c	Use normal text size and color	2014-11-04 13:17:15 -05:00
Sam Whited	55c81eaf15	Make links clickable in about text	2014-11-04 13:09:56 -05:00
Sam Whited	f10dd428ba	Convert about dialog to activity	2014-11-04 12:48:46 -05:00
Sam Whited	97b4b012d0	Use real copyright symbol ©	2014-11-04 12:48:25 -05:00
Sam Whited	df54ee75b4	Add about dialog with license info	2014-11-04 12:47:58 -05:00
iNPUTmice	cd5a56e8e7	show avatar in editaccount	2014-11-04 17:38:41 +01:00
iNPUTmice	b3582c970e	made qr code available from muc and contact details as well	2014-11-04 12:15:14 +01:00
iNPUTmice	d458919c8f	unfinishd qr code implemenation. thanks to @emdete	2014-11-03 22:47:07 +01:00
Sam Whited	39ae34d3e6	Wrap "last seen" time. ... Fixes #611	2014-11-03 08:28:20 -05:00
Sam Whited	46f147a82c	Merge branch 'gradle' into development ... Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib	2014-10-30 15:33:13 -04:00
Sam Whited	281ce3105f	Make conversations the root project	2014-10-22 15:47:11 -04:00