562 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
iNPUTmice	71886ed2ab	localized date. rounded minutes, hours and dates in last seen	2014-06-07 13:57:03 +02:00
iNPUTmice	ea8f3a2675	possible fix to be able to images and encrypted messages at a faster rate	2014-06-07 13:25:27 +02:00
iNPUTmice	df7f7c5c4e	do not just simply resend images	2014-06-06 20:06:06 +02:00
iNPUTmice	3fd371cd53	fixed last_seen_now	2014-06-06 19:39:55 +02:00
iNPUTmice	fc656c5571	removed presence from last seen	2014-06-06 19:37:34 +02:00
Daniel Gultsch	246776067a	put xep333 parsing into parser class	2014-06-06 18:49:35 +02:00
Daniel Gultsch	476ab656ef	refactored presence parsing into dedicated class	2014-06-06 18:26:40 +02:00
iNPUTmice	5cd750cb5e	Merge branch 'kruks23-development' into development	2014-06-06 16:44:40 +02:00
iNPUTmice	c489f368b8	added abbrev_all to date format	2014-06-06 16:44:14 +02:00
kruks23	99e5098780	#158 Try to solve MM/dd date in each locale	2014-06-06 16:15:15 +02:00
iNPUTmice	a1507d91ff	fixes #172	2014-06-06 13:59:39 +02:00
iNPUTmice	e820c98cb7	Merge branch 'development' of github.com:siacs/Conversations into development	2014-06-06 11:39:33 +02:00
iNPUTmice	5fe926b645	basic last seen feature. no peristancy just yet. no polish	2014-06-06 11:39:17 +02:00
Daniel Gultsch	356a5724f6	Merge pull request #178 from kruks23/development ... Update Spanish Translations	2014-06-05 11:52:07 +02:00
iNPUTmice	a583471af8	read marker is now a little less in your face	2014-06-05 01:57:00 +02:00
kruks23	a4e06db14f	Update Spanish Translations	2014-06-05 00:07:43 +02:00
iNPUTmice	9a448f822f	image provider path name now with .webp ending	2014-06-04 22:35:08 +02:00
iNPUTmice	83e919f8af	experimental gui to display read status	2014-06-04 21:40:17 +02:00
iNPUTmice	dc50e0a7e3	fixed regression with newly created conversations not being shown properly	2014-06-04 19:25:53 +02:00
iNPUTmice	7e4e7426ee	received and displayed messages (xep 333) are now marked properly	2014-06-04 18:44:15 +02:00
iNPUTmice	ba2ad82c7e	more bug fixes for the pgp problem	2014-06-04 12:31:19 +02:00
iNPUTmice	2f2aa7aa21	fixed pgp on incoming carbon messages	2014-06-04 11:55:38 +02:00
iNPUTmice	657df84155	Merge branch 'feature/xep-0333' into development	2014-06-03 15:50:32 +02:00
iNPUTmice	cedc1f40b3	answer to xep 184 message receipts. fixes #95	2014-06-03 15:48:51 +02:00
Daniel Gultsch	41dde747c2	Merge pull request #176 from imaginator/patch-1 ... small typo	2014-06-03 15:11:38 +02:00
Simon Tennant	f7bf62171f	small type	2014-06-03 15:06:35 +02:00
iNPUTmice	99793fa909	version bump to 0.3	2014-06-03 11:18:42 +02:00
iNPUTmice	4e82f4337e	added pgp sig on muc rename	2014-06-03 11:04:17 +02:00
iNPUTmice	3db0f688fb	Merge branch 'development' of github.com:siacs/Conversations into development	2014-06-02 21:27:58 +02:00
iNPUTmice	5b6140dc64	long press on images revails share with intent	2014-06-02 21:27:40 +02:00
Daniel Gultsch	7e1e080eb6	Merge pull request #169 from alethea/self-typo ... Fixed typo in source	2014-06-02 00:28:54 +02:00
Alethea Rose Butler	5881fc0412	Fixed typo in source "sefl" -> "self"	2014-06-01 17:45:20 -04:00
iNPUTmice	236453295c	version bump	2014-06-01 19:53:36 +02:00
iNPUTmice	f94254de16	updated changelog and readme for the 0.3 release	2014-06-01 19:48:44 +02:00
iNPUTmice	1982151630	linked openkeychain install dialog from decrypt messages box	2014-06-01 19:29:57 +02:00
iNPUTmice	c17db8e34e	changed roster to concurrent hashmap	2014-06-01 19:17:05 +02:00
iNPUTmice	32a21e1ab9	unified crypto messages and made lock icon work for conferences	2014-06-01 19:08:42 +02:00
iNPUTmice	8ea73feec4	added warning when public keys are missing	2014-06-01 18:52:27 +02:00
Daniel Gultsch	304f8672d9	Merge pull request #168 from strb/mucicons ... Fix tile rendering for larger conferences	2014-06-01 18:37:47 +02:00
Andreas Straub	f1505f9f36	Fix tile rendering for larger conferences	2014-06-01 16:30:21 +02:00
iNPUTmice	1a4b1f8a2f	show dialog when no contact in a muc has pgp support	2014-06-01 11:24:35 +02:00
iNPUTmice	5d0e1374b2	OpenPGP key display in muc details is now prettier and linked to openkeychain	2014-06-01 10:22:42 +02:00
Daniel Gultsch	ca49603c85	Merge pull request #167 from alethea/up-navigation ... Up navigation	2014-06-01 09:55:40 +02:00
Alethea Butler	97957bcfb9	Removed TASK_ON_HOME flag from intent created from share	2014-05-31 13:33:46 -04:00
Alethea Butler	d67d792409	Made the navigateUp override behave like a navigate up	2014-05-31 12:53:23 -04:00
Alethea Butler	b04fd2337e	Refactored into onNavigateUp	2014-05-31 11:50:09 -04:00
Alethea Butler	04977aedc4	Made ConversationActivity singleTask	2014-05-31 11:07:55 -04:00
iNPUTmice	15096aa0dd	Merge branch 'development' of github.com:siacs/Conversations into development	2014-05-31 11:55:24 +02:00
Daniel Gultsch	1ffba8bd62	Merge pull request #164 from alethea/development ... Fix home button up navigation	2014-05-31 11:55:17 +02:00
iNPUTmice	57ded7ee58	fixed regression that led to the wakelock not being released again	2014-05-31 11:54:32 +02:00