thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 10 Pull requests 1 Wiki Activity Actions

Commit graph

  • c748a7cece Add last seen info to the database Sam Whited 2014-11-04 16:09:27 -05:00
  • 72e728560f adjust api level wrapping M. Dietrich 2014-11-04 20:02:33 +01:00
  • 129eae46a4 Shorten license text and fix height of scrollview Sam Whited 2014-11-04 13:26:48 -05:00
  • 46d6d27b27 Use normal text size and color Sam Whited 2014-11-04 13:17:15 -05:00
  • a7cd57a0c5 Make links clickable in about text Sam Whited 2014-11-04 13:09:56 -05:00
  • d49b2e5562 link to account details when touching own avatar iNPUTmice 2014-11-04 18:52:29 +01:00
  • 6a6ad33435 Convert about dialog to activity Sam Whited 2014-11-04 12:08:30 -05:00
  • 2a5080aeff Use real copyright symbol © Sam Whited 2014-11-03 08:49:05 -05:00
  • 9271841125 Move AboutDialog to correct path Sam Whited 2014-11-03 08:44:19 -05:00
  • 107ff7195c Add about dialog with license info Sam Whited 2014-10-21 22:53:30 -04:00
  • bf6e49c51b clear avatar cache after nick name change iNPUTmice 2014-11-04 18:27:20 +01:00
  • aac40085cd Merge pull request #625 from SamWhited/linterfix Daniel Gultsch 2014-11-04 17:59:26 +01:00
  • 4b33ca9737 Make linter ignore properly checked API mismatch Sam Whited 2014-11-04 11:52:47 -05:00
  • 1a693ef0ba show avatar in editaccount iNPUTmice 2014-11-04 17:38:41 +01:00
  • 8a12483508 register nfc callback in every activity that provides a proper sharable uri iNPUTmice 2014-11-04 17:10:35 +01:00
  • b8066d9421 Merge pull request #622 from emdete/p1 Daniel Gultsch 2014-11-04 17:02:46 +01:00
  • 971a05feef optimize code abit M. Dietrich 2014-11-04 13:27:54 +01:00
  • 00a26b71d9 implement "correct" ndef parsing M. Dietrich 2014-11-04 13:14:29 +01:00
  • ca5f2c82ca made qr code available from muc and contact details as well iNPUTmice 2014-11-04 12:15:14 +01:00
  • bad0629151 added missing return statement. fixed api bug iNPUTmice 2014-11-04 11:04:05 +01:00
  • 6d9c32bd1c Merge pull request #620 from emdete/p0 Daniel Gultsch 2014-11-04 10:50:19 +01:00
  • 28d52dea17 be more OO M. Dietrich 2014-11-04 09:35:36 +01:00
  • 51ee7b3abf support pre JELLY_BEAN ndef M. Dietrich 2014-11-04 09:30:03 +01:00
  • fa4427a5b9 fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete iNPUTmice 2014-11-03 23:47:49 +01:00
  • bc95323609 unfinishd qr code implemenation. thanks to @emdete iNPUTmice 2014-11-03 22:47:07 +01:00
  • ef594db52b fixed merge error iNPUTmice 2014-11-03 21:22:26 +01:00
  • 40ac6fd0d6 Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc iNPUTmice 2014-11-03 21:07:24 +01:00
  • cc24d52cc1 use different filter for nfc intents iNPUTmice 2014-11-03 21:04:22 +01:00
  • b359c48094 basic beam code / untested iNPUTmice 2014-11-03 20:00:20 +01:00
  • 7e8451e488 create file explicitly before downloading image iNPUTmice 2014-11-03 20:55:31 +01:00
  • 6e0c99c6ff Merge pull request #614 from SamWhited/spacefixes Daniel Gultsch 2014-11-03 20:30:52 +01:00
  • 1e02270bd6 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-03 20:28:58 +01:00
  • 14fd9096da basic beam code / untested iNPUTmice 2014-11-03 20:00:20 +01:00
  • eb8dcbd938 more error handling for http connection iNPUTmice 2014-11-03 19:59:11 +01:00
  • 2303b731eb disabled proguard. fixed gradle libs iNPUTmice 2014-11-03 19:56:38 +01:00
  • f83aeeaffe Merge pull request #615 from SamWhited/issue611 Daniel Gultsch 2014-11-03 14:30:15 +01:00
  • 65c05155a3 Wrap "last seen" time. Sam Whited 2014-11-03 08:28:20 -05:00
  • 37bf68bb0c Removed the last \t from the README... Sam Whited 2014-11-03 08:08:51 -05:00
  • 9c37c6c10a Another tab fix. Sam Whited 2014-11-03 08:07:59 -05:00
  • 848e6051b3 Fix some space/tab issues in README Sam Whited 2014-11-03 08:06:32 -05:00
  • 9582a6f82c Merge pull request #605 from emdete/render_gradle_path Daniel Gultsch 2014-11-03 13:30:10 +01:00
  • 4657f37254 version bump to 0.8.1 iNPUTmice 2014-11-03 11:20:51 +01:00
  • 22141dfe17 always use exif helper iNPUTmice 2014-11-03 11:20:32 +01:00
  • b107a9ab94 more error handling in xmppconnection iNPUTmice 2014-11-03 10:03:45 +01:00
  • bada53b82c adjust path in render script M. Dietrich 2014-11-01 22:27:11 +01:00
  • 6152e6ecf5 fixed arrayoutofbounds + spelling iNPUTmice 2014-11-01 14:33:34 +01:00
  • ad0f851072 Merge pull request #600 from SamWhited/gradle Daniel Gultsch 2014-11-01 13:51:05 +01:00
  • 686570a5be Merge branch 'gradle' into development Sam Whited 2014-10-30 15:20:20 -04:00
  • be01507763 version bump and changelog iNPUTmice 2014-10-30 11:55:25 +01:00
  • 79d59d9bf2 Merge branch 'development' iNPUTmice 2014-10-30 11:20:35 +01:00
  • 619bb7fd51 only end otr session if there is more than one contact presence. reset otherwise iNPUTmice 2014-10-30 10:59:41 +01:00
  • 8287d376fe cleanup for clear conversation history. small otr fixes iNPUTmice 2014-10-30 00:31:44 +01:00
  • b1bd1665e3 replace the exif interface with a small static class from 3d gallery iNPUTmice 2014-10-29 18:12:32 +01:00
  • 552c6f7807 proper error state for images iNPUTmice 2014-10-29 11:31:03 +01:00
  • 989ee5870c fixed 'share image' context menu iNPUTmice 2014-10-29 09:57:34 +01:00
  • 736634e642 fixed intent managment iNPUTmice 2014-10-29 09:57:03 +01:00
  • 0eacb0646a Merge pull request #593 from weiss/improve-german-translations Daniel Gultsch 2014-10-29 09:50:36 +01:00
  • 80b1f5cb41 Improve some of the German translations Holger Weiß 2014-10-28 20:44:36 +01:00
  • 988d19dcf4 end otr session if plain text message from another instance is being received iNPUTmice 2014-10-28 18:02:12 +01:00
  • c52ace3a11 Tweak README some more Sam Whited 2014-10-28 12:31:28 -04:00
  • 1616f96682 Fix typo in subtree merge directions Sam Whited 2014-10-28 12:26:41 -04:00
  • d29c8f1008 Add subtree merge directions to README Sam Whited 2014-10-28 12:24:25 -04:00
  • 1fc7a8a655 Subtree merged in openpgp api lib Sam Whited 2014-10-28 12:16:35 -04:00
  • 1f3b2b9942 improvements on findConversation iNPUTmice 2014-10-28 17:15:35 +01:00
  • 4f1ed6abae always show verify fingerprint if there is an active otr session iNPUTmice 2014-10-28 17:15:13 +01:00
  • 2f3214ba98 Subtree merged in minidns Sam Whited 2014-10-28 12:14:21 -04:00
  • 856b0b3fdc Remove minidns dir Sam Whited 2014-10-28 12:13:53 -04:00
  • f84c50af6e Subtree merged in MemorizingTrustManager Sam Whited 2014-10-28 12:11:51 -04:00
  • 5b002237ff Don't use submodules Sam Whited 2014-10-28 12:07:04 -04:00
  • d342b87b0d reworked dns retry iNPUTmice 2014-10-27 21:48:25 +01:00
  • fbe56194a2 removed unnecessary logging from avatar service iNPUTmice 2014-10-27 21:48:09 +01:00
  • 864f21e207 proper cleanup after pgp image decryption iNPUTmice 2014-10-27 21:47:41 +01:00
  • 6011a9e39b fixed url parsing iNPUTmice 2014-10-27 21:47:17 +01:00
  • 4446a36af6 check for links in pgp encrypted messages as well iNPUTmice 2014-10-27 11:00:03 +01:00
  • 768afa7fa2 Merge pull request #590 from weiss/update-german-translations Daniel Gultsch 2014-10-27 10:00:03 +01:00
  • dee8028bc0 Update German translations Holger Weiß 2014-10-26 23:49:25 +01:00
  • efe647f084 set divider for image meta information to '|' to not conflict with URL. breaks images downloaded in between 0.7.3 and now iNPUTmice 2014-10-26 20:18:57 +01:00
  • f2268b5601 Merge pull request #588 from betheg/remove_unused_cast Daniel Gultsch 2014-10-26 20:17:50 +01:00
  • dd8596c5c2 Merge pull request #587 from betheg/fix_possible_fallthrough Daniel Gultsch 2014-10-26 20:14:09 +01:00
  • 87bcafe7af remove some unused cast Michael 2014-10-26 18:54:10 +01:00
  • a11abcf198 fix possible fallthrough. Michael 2014-10-26 18:30:58 +01:00
  • d841e2f6a0 Set the root project name Sam Whited 2014-10-26 10:58:50 -04:00
  • d885a55ffc Merge pull request #586 from SamWhited/issue585 Daniel Gultsch 2014-10-26 15:48:18 +01:00
  • ec3aae4fb1 Use consistent numbering Sam Whited 2014-10-26 10:37:21 -04:00
  • 240515fe8e Include build number in output of release builds Sam Whited 2014-10-26 10:22:37 -04:00
  • 0726ef60fc Use full URI for android application Gradle plugin Sam Whited 2014-10-26 10:14:38 -04:00
  • aa79a50418 Remove useless include from Gradle settings Sam Whited 2014-10-26 10:13:16 -04:00
  • bbd86f7bc9 Move submodules back to libs/ Sam Whited 2014-10-26 09:35:11 -04:00
  • b8f3e5aee0 Add some logic for signing releases Sam Whited 2014-10-26 09:11:28 -04:00
  • 32321c7419 Update otr4j to 0.21 Sam Whited 2014-10-26 09:05:12 -04:00
  • b6ffdf828b Pull otr4j form Maven repo Sam Whited 2014-10-26 08:54:41 -04:00
  • 6777b6c51d don't merge downloadable messages iNPUTmice 2014-10-24 23:18:19 +02:00
  • a2366fad98 added message option to download images iNPUTmice 2014-10-24 19:30:03 +02:00
  • 40172f2b9a Merge pull request #582 from kruks23/translation7 Daniel Gultsch 2014-10-24 18:55:23 +02:00
  • ea27fbe985 Update Spanish Translations kruks23 2014-10-24 18:52:38 +02:00
  • f691b1eb1a also show some text in new image notification iNPUTmice 2014-10-24 18:27:53 +02:00
  • 401eb10cb7 picture notification and some drive by bug fixes iNPUTmice 2014-10-24 14:34:46 +02:00
  • 0ba709b912 Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-10-24 13:29:39 +02:00
  • ec5f7312c3 notify only after image has been received over http. introduced mini grace for catching up with SM or offline messages iNPUTmice 2014-10-24 13:29:18 +02:00
  • f04eea2b81 Merge pull request #581 from kruks23/translation7 Daniel Gultsch 2014-10-23 21:35:41 +02:00