moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-06 01:05:08 -05:00
Code Issues Releases Wiki Activity
1,773 Commits 5 Branches 73 Tags 39 MiB
05d1f46c15
Commit Graph

1773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
M. Dietrich
c7d59f1985 adjust path in render script 2014-11-01 22:44:09 +01:00
iNPUTmice
1ea2e7dc3b fixed arrayoutofbounds + spelling 2014-11-01 14:33:34 +01:00
Daniel Gultsch
a0f694ea44 Merge pull request #600 from SamWhited/gradle 
Build system and library changes (Gradle / Subtree merging)
 2014-11-01 13:51:05 +01: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
iNPUTmice
142384e580 version bump and changelog 2014-10-30 11:55:25 +01:00
iNPUTmice
f2c1a80059 Merge branch 'development' 2014-10-30 11:20:35 +01:00
iNPUTmice
7b4f3637db only end otr session if there is more than one contact presence. reset otherwise 2014-10-30 10:59:41 +01:00
iNPUTmice
e4567e7a62 cleanup for clear conversation history. small otr fixes 2014-10-30 00:31:44 +01:00
iNPUTmice
1b62d94093 replace the exif interface with a small static class from 3d gallery 2014-10-29 18:12:32 +01:00
iNPUTmice
03593ba56f proper error state for images 2014-10-29 11:31:03 +01:00
iNPUTmice
64209829f7 fixed 'share image' context menu 2014-10-29 09:57:34 +01:00
iNPUTmice
bb26a84269 fixed intent managment 2014-10-29 09:57:03 +01:00
Daniel Gultsch
a11e6dda8f Merge pull request #593 from weiss/improve-german-translations 
Improve some of the German translations
 2014-10-29 09:50:36 +01:00
Holger Weiß
241c4402c0 Improve some of the German translations 2014-10-28 20:44:36 +01:00
iNPUTmice
962e8183f6 end otr session if plain text message from another instance is being received 2014-10-28 18:02:12 +01:00
Sam Whited
a362bd1021 Tweak README some more 2014-10-28 12:31:28 -04:00
Sam Whited
fdc10c794f Fix typo in subtree merge directions 2014-10-28 12:26:41 -04:00
Sam Whited
f7f4c79419 Add subtree merge directions to README 2014-10-28 12:24:25 -04:00
Sam Whited
e3f4742ed8 Version 5, compatible with OpenKeychain 2.9.1 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJUDaeBAAoJEHGMBwEAASKCBAEH/iu7405Mim34yjZzUyHrREPq
 soQoQEr2f3A8FnEQDX+q4RhTEGG3WNzw9FDcf4Aot6d1dyL6DZMy/AaslQyAPNSf
 AlFyQ36YU44BwgTsHxjxgQ2Vdiff2tfS8wK6He4wGfC48WFvpMeD9VIwHTwtT37F
 RW011BBshlcd3fVX7qVdiQ/TKJsKTy4+LmJhf3UsZ7McZ5hkmkA+HwoHb+B+NEQN
 UMhdFeMrK/GKEY1ALmm1Dv6DRO7AKGOmmrQ24/ciHD4DF/0OkUP5tISRRZfG/oRn
 J+gYBH3FcJy4tb9pLDFDGLB/OpX1kulPLEeUlQrV98guD2hV3KBYVZ0Hs0Bqqdk=
 =wKIt
 -----END PGP SIGNATURE-----

Subtree merged in openpgp api lib
 2014-10-28 12:16:35 -04:00
iNPUTmice
f256a466d8 improvements on findConversation 2014-10-28 17:15:35 +01:00
iNPUTmice
161623eca2 always show verify fingerprint if there is an active otr session 2014-10-28 17:15:13 +01:00
Sam Whited
4a1bae3a69 Subtree merged in minidns 2014-10-28 12:14:21 -04:00
Sam Whited
ccba01ef19 Remove minidns dir 2014-10-28 12:13:53 -04:00
Sam Whited
41d2e72be7 Subtree merged in MemorizingTrustManager 2014-10-28 12:11:51 -04:00
Sam Whited
89c294af11 Don't use submodules 2014-10-28 12:07:04 -04:00
iNPUTmice
7dcce220cb reworked dns retry 2014-10-27 21:48:25 +01:00
iNPUTmice
915def24f9 removed unnecessary logging from avatar service 2014-10-27 21:48:09 +01:00
iNPUTmice
698572d218 proper cleanup after pgp image decryption 2014-10-27 21:47:41 +01:00
iNPUTmice
f45a841caf fixed url parsing 2014-10-27 21:47:17 +01:00
iNPUTmice
da822ebae8 check for links in pgp encrypted messages as well 2014-10-27 11:00:03 +01:00
Daniel Gultsch
b7f596363b Merge pull request #590 from weiss/update-german-translations 
Update German translations
 2014-10-27 10:00:03 +01:00
Holger Weiß
08fc3c7f04 Update German translations 2014-10-26 23:49:25 +01:00
iNPUTmice
b045dea549 set divider for image meta information to '|' to not conflict with URL. breaks images downloaded in between 0.7.3 and now 2014-10-26 20:18:57 +01:00
Daniel Gultsch
d86b7f3192 Merge pull request #588 from betheg/remove_unused_cast 
remove some unused cast
 2014-10-26 20:17:50 +01:00
Daniel Gultsch
cb21eac501 Merge pull request #587 from betheg/fix_possible_fallthrough 
fix possible fallthrough.
 2014-10-26 20:14:09 +01:00
Michael
020dc863b1 remove some unused cast 2014-10-26 18:54:10 +01:00
Michael
8dae4b1eb9 fix possible fallthrough. 2014-10-26 18:30:58 +01:00
Sam Whited
b888967b35 Set the root project name 2014-10-26 10:58:50 -04:00
Daniel Gultsch
284ad1b053 Merge pull request #586 from SamWhited/issue585 
Use consistent numbering
 2014-10-26 15:48:18 +01:00
Sam Whited
a5e73850b8 Use consistent numbering 
Fixes #585
 2014-10-26 10:37:21 -04:00
Sam Whited
ef25720f0f Include build number in output of release builds 2014-10-26 10:22:37 -04:00
Sam Whited
4024136b1c Use full URI for android application Gradle plugin 2014-10-26 10:14:38 -04:00
Sam Whited
b82a0e6528 Remove useless include from Gradle settings 2014-10-26 10:13:16 -04:00
Sam Whited
a6d0042e5c Move submodules back to libs/ 2014-10-26 09:54:41 -04:00
Sam Whited
90898ec3d4 Add some logic for signing releases 2014-10-26 09:11:28 -04:00
Sam Whited
c83e49d1b8 Update otr4j to 0.21 2014-10-26 09:05:12 -04:00
Sam Whited
7f484513be Pull otr4j form Maven repo 2014-10-26 08:54:41 -04:00
iNPUTmice
8171633eb9 don't merge downloadable messages 2014-10-24 23:18:19 +02:00
iNPUTmice
8fb8985412 added message option to download images 2014-10-24 19:30:03 +02:00
Daniel Gultsch
1ea8feaf24 Merge pull request #582 from kruks23/translation7 
Update Spanish Translations
 2014-10-24 18:55:23 +02:00