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

Commit graph

  • d88c9ca28e Merge pull request #667 from SamWhited/licensesuntranslatable Daniel Gultsch 2014-11-15 13:12:16 +01:00
  • 85dfe27503 Make licenses info untranslatable Sam Whited 2014-11-14 22:33:18 -05:00
  • 2ed0ed0c68 Spelling fixes in Italian translation Sam Whited 2014-11-14 22:16:58 -05:00
  • 22c0d3392b Spelling fix in German translation Sam Whited 2014-11-14 22:13:42 -05:00
  • 2ca6d98bcc Add SCRAM-SHA1 support Sam Whited 2014-11-12 15:35:44 -05:00
  • ab5554ae57 Merge pull request #664 from squidpickles/development Daniel Gultsch 2014-11-14 21:01:21 +01:00
  • 4314bbc9b5 Added check for empty from on group chat packet Kevin Rauwolf 2014-11-14 11:40:43 -08:00
  • 439accf80a Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-14 19:49:49 +01:00
  • a61f2f74c0 fixed possible npe when loading null counterpart into message iNPUTmice 2014-11-14 19:49:44 +01:00
  • 20e087c1b1 Merge pull request #653 from kriztan/patch-2 Daniel Gultsch 2014-11-14 12:16:57 +01:00
  • 724204573a made presences synchronized iNPUTmice 2014-11-13 14:44:19 +01:00
  • b4c6501b01 made presences synchronized iNPUTmice 2014-11-13 14:44:19 +01:00
  • 9db884b8df more npe checks in muc packet parser iNPUTmice 2014-11-13 14:27:10 +01:00
  • 904121ab34 more npe checks in muc packet parser iNPUTmice 2014-11-13 14:27:10 +01:00
  • 6a05240f78 Merge pull request #656 from SamWhited/authrefactor Daniel Gultsch 2014-11-12 23:01:18 +01:00
  • bccb92f05b Merge pull request #659 from SamWhited/jidfixes Daniel Gultsch 2014-11-12 23:01:04 +01:00
  • d8735d76f7 Make sure we're storing the display JID as Unicode Sam Whited 2014-11-12 16:19:16 -05:00
  • 3905199df7 Update German language kriztan 2014-11-12 20:09:14 +01:00
  • 345fca41fc Refactor authentication code Sam Whited 2014-11-12 10:15:38 -05:00
  • 1050ef5b7d Update German language kriztan 2014-11-12 13:13:59 +01:00
  • 48dd74644d check if account is online before doing smp iNPUTmice 2014-11-12 12:45:59 +01:00
  • 607a693923 Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification iNPUTmice 2014-11-11 17:45:16 +01:00
  • eb0d1ee880 use auto register for verify otr listeners iNPUTmice 2014-11-11 17:42:09 +01:00
  • 1e4370f361 small bug fix iNPUTmice 2014-11-10 23:47:04 +01:00
  • 66e7fb053f added snackbar to indicate smp. more error handling in verify activity iNPUTmice 2014-11-10 22:03:23 +01:00
  • 20756f7a0b initial smp support iNPUTmice 2014-11-10 19:23:54 +01:00
  • 90e371b6db auto register/unregister listeners iNPUTmice 2014-11-11 17:39:28 +01:00
  • c7f9623999 temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds iNPUTmice 2014-11-11 00:16:43 +01:00
  • 64c4eccdbf small bug fix iNPUTmice 2014-11-10 23:47:04 +01:00
  • a7d10045d0 added snackbar to indicate smp. more error handling in verify activity iNPUTmice 2014-11-10 22:03:23 +01:00
  • 348982832d initial smp support iNPUTmice 2014-11-10 19:23:54 +01:00
  • 9f1e9d0e73 made Jid class parse otr session ids iNPUTmice 2014-11-10 11:37:31 +01:00
  • b3af94ec88 more refactoring for presence selection. removed getTo, getFrom and getJid from Element iNPUTmice 2014-11-10 01:24:35 +01:00
  • 5be8b6596f formating iNPUTmice 2014-11-09 21:27:37 +01:00
  • 5ec7315a66 Merge pull request #645 from betheg/about_all_libs Daniel Gultsch 2014-11-09 21:18:32 +01:00
  • 035665bf19 fixed private messages iNPUTmice 2014-11-09 21:14:37 +01:00
  • a9c18caa39 add libidn to pref_about_message. Michael 2014-11-09 21:00:44 +01:00
  • 5e8298e639 Merge pull request #644 from SamWhited/barejidchecks Daniel Gultsch 2014-11-09 20:05:38 +01:00
  • 5722bfcc52 s/getResourcepart().isEmpty()/isBareJid()/ Sam Whited 2014-11-09 13:13:19 -05:00
  • 6a9229889e use isBareJid instead of getResourcePart().isEmpty() iNPUTmice 2014-11-09 19:06:43 +01:00
  • e0aaea35b8 fixed muc sender history for some cases (where the previous nick was a valid jid) iNPUTmice 2014-11-09 18:24:01 +01:00
  • 223062bf2d migrated some otr stuff to new jid classes iNPUTmice 2014-11-09 17:46:00 +01:00
  • 1f11ced854 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-09 17:05:20 +01:00
  • 1ad4846fbb Merge pull request #642 from SamWhited/accountgetjid Daniel Gultsch 2014-11-09 17:06:09 +01:00
  • fd39745b6b Merge pull request #643 from SamWhited/idndependfix Daniel Gultsch 2014-11-09 17:04:47 +01:00
  • a88ec073f0 Remove unused dependency Sam Whited 2014-11-09 11:03:22 -05:00
  • 0531ccc7ee Merge branch 'master' into development iNPUTmice 2014-11-09 17:02:49 +01:00
  • 4515487e67 make avatar service not break on empty names iNPUTmice 2014-11-09 17:02:39 +01:00
  • 6360db04e3 Rework `Account.getJid()' to return full JIDs Sam Whited 2014-11-09 10:57:22 -05:00
  • bcffa01b38 fixed null pointer in message merger iNPUTmice 2014-11-09 16:47:31 +01:00
  • 7501b9be6e refactored code to always contain full jid for counterpart iNPUTmice 2014-11-09 16:21:13 +01:00
  • 8d4550de69 fixed full jid for account iNPUTmice 2014-11-09 16:20:36 +01:00
  • 0c8c599995 return null if from ist not set in abstract stanza iNPUTmice 2014-11-09 16:18:53 +01:00
  • 9d38b0af81 Merge pull request #641 from kruks23/translation8 Daniel Gultsch 2014-11-09 15:20:25 +01:00
  • f3721a1776 Merge pull request #639 from SamWhited/issue631 Daniel Gultsch 2014-11-09 15:20:06 +01:00
  • 23581c2ab6 Check for illegal arguments to the toASCII func Sam Whited 2014-11-09 09:05:02 -05:00
  • a979506ab0 add all used libs to the pref_about_message. Michael 2014-11-08 15:00:33 +01:00
  • e90a550559 Update Spanish Translations kruks23 2014-11-09 13:29:30 +01:00
  • 6e404381f0 Fix contact highlighting in MUC Sam Whited 2014-11-09 07:20:08 -05:00
  • c12c7506fb Fix issue with IDN SRV records Sam Whited 2014-11-07 23:08:31 -05:00
  • 3df9228c0f Fix crash on account creation Sam Whited 2014-11-07 22:48:17 -05:00
  • 863bc57865 Don't crash on packets with no "from" specified Sam Whited 2014-11-07 22:36:30 -05:00
  • da5f8855e0 Create avatar's for JID's w/o localparts Sam Whited 2014-11-07 22:34:54 -05:00
  • 5d593a9012 Fields that we sync on should be final Sam Whited 2014-11-07 22:21:18 -05:00
  • 980a536b77 Fix bug introduced by rebase Sam Whited 2014-11-07 17:48:30 -05:00
  • c915947fbe Fix letter avatar selection in MUC Sam Whited 2014-11-07 09:32:22 -05:00
  • fccb0380f6 More formatting fixes in MUC Sam Whited 2014-11-07 09:14:37 -05:00
  • 0db367951d Format contact names in MUC properly Sam Whited 2014-11-07 09:09:28 -05:00
  • 66716db908 Fix JID parsing error Sam Whited 2014-11-06 14:57:49 -05:00
  • 4ddf90c1a9 It builds again! Sam Whited 2014-11-06 14:49:39 -05:00
  • c702e3622e Add a packet JID place I missed... Sam Whited 2014-11-06 14:46:09 -05:00
  • a046c81dd7 Update more files to use JID objects Sam Whited 2014-11-06 14:45:38 -05:00
  • b20e3d4b24 Update another chunk of stuff to use JID objects Sam Whited 2014-11-06 14:33:13 -05:00
  • 5ade99c7f0 Update more files to use JID objects Sam Whited 2014-11-06 14:10:03 -05:00
  • b9c67ba7ce Move a chunk of classes over to using JID objects Sam Whited 2014-11-05 15:55:47 -05:00
  • ece291a8a9 Use factories to generate JIDs Sam Whited 2014-11-05 09:40:16 -05:00
  • d9a06d6fb4 Improve JID error handling Sam Whited 2014-11-05 09:21:29 -05:00
  • d5e69bb0e5 Add first attempt at JID class Sam Whited 2014-11-05 09:00:31 -05:00
  • 527af80fd2 Add jxmpp-stringprep-libidn dependency Sam Whited 2014-11-05 08:35:01 -05:00
  • 101e328f22 bumped gradle files + changelog iNPUTmice 2014-11-09 11:09:52 +01:00
  • 67af26b601 version bump to 0.8.3 + changelog iNPUTmice 2014-11-09 11:08:09 +01:00
  • cbd6d360b6 fixed #634 iNPUTmice 2014-11-09 10:51:54 +01:00
  • d879d1e425 use proper theme for MTM iNPUTmice 2014-11-09 10:51:35 +01:00
  • 045b17dd26 got rid of MTM and mRandom variable in favor of using a reference to service iNPUTmice 2014-11-09 10:50:45 +01:00
  • 01adfcf06d check if socket was null before doing ssl connect iNPUTmice 2014-11-08 20:52:02 +01:00
  • 386e7f04f8 update conversation fragment on every backend connect iNPUTmice 2014-11-08 20:51:27 +01:00
  • 1dd228091f Merge pull request #549 from emdete/p2 Daniel Gultsch 2014-11-08 13:32:13 +01:00
  • c9294b372f bug fixes for the previous ui refactoring iNPUTmice 2014-11-07 21:49:31 +01:00
  • ea133bd66b UI code refactoring iNPUTmice 2014-11-07 15:38:20 +01:00
  • 5791f53b1f fixed #633 iNPUTmice 2014-11-06 17:25:14 +01:00
  • d949738433 don't show avatar on initial account creation iNPUTmice 2014-11-06 16:51:50 +01:00
  • 8ec409a261 linked conference iNPUTmice 2014-11-06 10:48:00 +01:00
  • 9cf3c9d2a7 linked conference room iNPUTmice 2014-11-06 10:46:06 +01:00
  • 23c949dea0 version bump to 0.8.2 iNPUTmice 2014-11-06 10:32:04 +01:00
  • 0958affcb9 fixed notifications for images iNPUTmice 2014-11-05 21:37:40 +01:00
  • 7a62b088d6 fixed #617 iNPUTmice 2014-11-05 00:06:07 +01:00
  • 7cc8539b67 reformated license a bit iNPUTmice 2014-11-04 23:47:15 +01:00
  • f263ee78e4 Merge pull request #626 from SamWhited/issue612 Daniel Gultsch 2014-11-04 22:59:32 +01:00
  • 632264f6e1 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-04 22:56:36 +01:00
  • c62c95533b Merge pull request #616 from SamWhited/license-compliance Daniel Gultsch 2014-11-04 22:56:33 +01:00