sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,453 Commits 5 Branches 297 Tags 50 MiB
Commit Graph

1453 Commits

Author SHA1 Message Date
iNPUTmice b824e55277 register nfc callback in every activity that provides a proper sharable uri 2014-11-04 17:10:35 +01:00
Daniel Gultsch 11ecf43da7 Merge pull request #622 from emdete/p1 
P1
 2014-11-04 17:02:46 +01:00
M. Dietrich 2ce95b19a9 optimize code abit 2014-11-04 13:32:44 +01:00
M. Dietrich b6c20d9260 implement "correct" ndef parsing 2014-11-04 13:32:37 +01:00
iNPUTmice b3582c970e made qr code available from muc and contact details as well 2014-11-04 12:15:14 +01:00
iNPUTmice 12e2f0bdd7 added missing return statement. fixed api bug 2014-11-04 11:04:05 +01:00
Daniel Gultsch 17070d972e Merge pull request #620 from emdete/p0 
P0
 2014-11-04 10:50:19 +01:00
M. Dietrich fb24bf98c9 be more OO 2014-11-04 10:49:10 +01:00
M. Dietrich 32396b3bde support pre JELLY_BEAN ndef 2014-11-04 10:48:59 +01:00
iNPUTmice 7a9327d960 fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete 2014-11-03 23:47:49 +01:00
iNPUTmice d458919c8f unfinishd qr code implemenation. thanks to @emdete 2014-11-03 22:47:07 +01:00
iNPUTmice 08cb23a886 fixed merge error 2014-11-03 21:22:26 +01:00
iNPUTmice 7d7be8efd8 Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc 
Conflicts:
	src/main/AndroidManifest.xml
 2014-11-03 21:07:24 +01:00
iNPUTmice a054a3fbb4 use different filter for nfc intents 2014-11-03 21:04:22 +01:00
iNPUTmice 28a186cd6c basic beam code / untested 2014-11-03 20:55:46 +01:00
iNPUTmice 4614ff343e create file explicitly before downloading image 2014-11-03 20:55:31 +01:00
Daniel Gultsch 962008fec8 Merge pull request #614 from SamWhited/spacefixes 
Fix some space/tab issues in README
 2014-11-03 20:30:52 +01:00
iNPUTmice c48407f3b4 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-03 20:28:58 +01:00
iNPUTmice 696dd07a41 basic beam code / untested 2014-11-03 20:00:20 +01:00
iNPUTmice ec9c264cf7 more error handling for http connection 2014-11-03 19:59:11 +01:00
iNPUTmice 21069003b0 disabled proguard. fixed gradle libs 2014-11-03 19:56:38 +01:00
Daniel Gultsch e496a5409b Merge pull request #615 from SamWhited/issue611 
Wrap "last seen" time
 2014-11-03 14:30:15 +01:00
Sam Whited 39ae34d3e6 Wrap "last seen" time. 
Fixes #611
 2014-11-03 08:28:20 -05:00
Sam Whited 515f2f379f Removed the last \t from the README... 2014-11-03 08:08:51 -05:00
Sam Whited 61466f352f Another tab fix. 2014-11-03 08:07:59 -05:00
Sam Whited f3401ab64f Fix some space/tab issues in README 2014-11-03 08:06:32 -05:00
Daniel Gultsch b54b1ca3b7 Merge pull request #605 from emdete/render_gradle_path 
adjust path in render script
 2014-11-03 13:30:10 +01:00
iNPUTmice 3e05ef77b1 version bump to 0.8.1 2014-11-03 11:20:51 +01:00
iNPUTmice 49920649db always use exif helper 2014-11-03 11:20:32 +01:00
iNPUTmice 27f42dfb63 more error handling in xmppconnection 2014-11-03 10:03:45 +01:00
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