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

Commit graph

  • f79d92ab67 highlight people in conferences by clicken on their picture Daniel Gultsch 2014-05-20 11:44:43 +02:00
  • 13f9f23946 fixed ping time out after session resume Daniel Gultsch 2014-05-20 11:05:03 +02:00
  • 8f92d8d109 ported pending subscription support to new roster mgmt Daniel Gultsch 2014-05-20 10:48:07 +02:00
  • a582d44dba added search icon Daniel Gultsch 2014-05-20 10:15:47 +02:00
  • a5a356a7a7 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-19 21:42:23 +02:00
  • 371c985c25 made roster persistant aka enabled versioning again Daniel Gultsch 2014-05-19 21:05:17 +02:00
  • 2a1067b20a Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-19 20:21:25 +02:00
  • a6f9a742c0 some code cleanup to deal with the roster mgmt changes from earlier Daniel Gultsch 2014-05-19 15:39:50 +02:00
  • 993477cd83 reworked roster/contact handling. might break some stuff. not sycing to disk yet Daniel Gultsch 2014-05-19 15:15:09 +02:00
  • 7994b6866b Update Spanish Translations kruks23 2014-05-18 19:33:38 +02:00
  • e27bb52575 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-18 19:10:52 +02:00
  • 590e2403ab bind and session request more compatible Daniel Gultsch 2014-05-18 17:32:20 +02:00
  • e857cf979d fixed #123 fixed122 Daniel Gultsch 2014-05-18 13:23:26 +02:00
  • 7fc7201abb cleaned up edit account dialog a little Daniel Gultsch 2014-05-18 11:49:44 +02:00
  • 0cdd74417f fixed #53 aka server not found bug Daniel Gultsch 2014-05-18 11:25:04 +02:00
  • b79ff3af6c Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-17 22:03:12 +02:00
  • 66aacf7e3e sending session after unsucesfull session resume. fixed #116 Daniel Gultsch 2014-05-17 21:57:44 +02:00
  • 2abb57be34 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-17 20:41:33 +02:00
  • c07d3deea3 Merge branch 'master' into development Daniel Gultsch 2014-05-17 19:33:55 +02:00
  • ae6c99012e bumped version 0.2.3 Daniel Gultsch 2014-05-17 19:23:52 +02:00
  • b7b25b472c receiving pgp images important bug fix Daniel Gultsch 2014-05-17 19:19:06 +02:00
  • 736e09fbb5 added record audio button Daniel Gultsch 2014-05-17 19:21:16 +02:00
  • 27060e303c made sending session more compliant Daniel Gultsch 2014-05-17 19:20:31 +02:00
  • 4c17937640 receiving pgp images important bug fix Daniel Gultsch 2014-05-17 19:19:06 +02:00
  • 4d2e50224c Merge branch 'master' into development Daniel Gultsch 2014-05-17 13:36:25 +02:00
  • fddb098857 updated changelog for version 0.2.2 Daniel Gultsch 2014-05-17 13:30:32 +02:00
  • 813896dbc9 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-17 13:04:33 +02:00
  • e34fddd7e1 Update Validator.java the-username 2014-05-15 20:43:10 +02:00
  • a32d95cdd3 fixed #66 Daniel Gultsch 2014-05-17 12:10:58 +02:00
  • cab9b10e35 spelling Daniel Gultsch 2014-05-17 12:02:14 +02:00
  • bab69ffcf9 fixed #108 Daniel Gultsch 2014-05-17 11:08:32 +02:00
  • 836366bf2d added translators to readme Daniel Gultsch 2014-05-17 10:50:29 +02:00
  • 84a4620649 version bump to 0.2.2 Daniel Gultsch 2014-05-17 10:04:57 +02:00
  • 8bf0945f2f permanent notification disapears now when account is being deleted + code clean up Daniel Gultsch 2014-05-17 10:03:15 +02:00
  • b84b67268b fixed #113 Daniel Gultsch 2014-05-17 09:43:47 +02:00
  • f9394e2e69 Merge pull request #120 from kruks23/development Daniel Gultsch 2014-05-16 23:13:08 +02:00
  • 9b95b07b97 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-16 22:49:52 +02:00
  • cd1afbd39a reworked message to conferences Daniel Gultsch 2014-05-16 22:46:15 +02:00
  • a0a5ca9585 fixed npe for otr sessions with non contacts Daniel Gultsch 2014-05-16 22:44:54 +02:00
  • e50f009004 Update Spanish Translations + harcoded pref_advanced_settings kruks23 2014-05-16 22:35:58 +02:00
  • 225447f2f5 updated german translation Daniel Gultsch 2014-05-16 16:16:35 +02:00
  • aa68045c58 offline sending of pgp fixed Daniel Gultsch 2014-05-16 13:42:20 +02:00
  • c8f8bab2a1 formating Daniel Gultsch 2014-05-16 13:18:52 +02:00
  • 1cf1e62e30 fixed null in shared link Daniel Gultsch 2014-05-16 12:07:58 +02:00
  • afd1ba657a Merge pull request #117 from BenoitBouvarel/development Daniel Gultsch 2014-05-16 11:55:17 +02:00
  • 3d0f08e319 French translation + hard-coded string > @string Benoit Bouvarel 2014-05-16 01:13:07 +02:00
  • 3426df21c1 Merge pull request #109 from kruks23/development Daniel Gultsch 2014-05-15 12:07:41 +02:00
  • 13d73a196c fixed npe Daniel Gultsch 2014-05-15 10:27:36 +02:00
  • ad19100b9d Update Spanish Translations kruks23 2014-05-14 19:18:07 +02:00
  • ca7e24c30d hiding the prepare image toast after error or success Daniel Gultsch 2014-05-14 18:43:58 +02:00
  • 08a26d2772 fixed possible npe Daniel Gultsch 2014-05-14 18:39:59 +02:00
  • f4eebd091c fixed #105 Daniel Gultsch 2014-05-14 18:32:58 +02:00
  • 81d2760505 made message parser non static Daniel Gultsch 2014-05-14 12:56:34 +02:00
  • 1f600be4dd code clean up Daniel Gultsch 2014-05-14 11:49:43 +02:00
  • 65e7294802 Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-14 00:09:38 +02:00
  • ebae779d73 one more entry to strings file Daniel Gultsch 2014-05-13 18:06:56 +02:00
  • bc87f59600 version bump Daniel Gultsch 2014-05-13 17:57:10 +02:00
  • a1a90a03e0 added presence selection Daniel Gultsch 2014-05-13 17:42:23 +02:00
  • 888de850cf Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-13 17:23:58 +02:00
  • a3d241020a Merge branch 'beriain-development' into development Daniel Gultsch 2014-05-13 17:22:45 +02:00
  • c0f5b26d1a Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development Daniel Gultsch 2014-05-13 17:22:06 +02:00
  • f1bdf1d4c5 Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-13 17:11:36 +02:00
  • 71545f4f66 code cleanup Daniel Gultsch 2014-05-13 17:11:27 +02:00
  • efac008ffb Fix Beriain 2014-05-13 16:52:35 +02:00
  • 9492e28902 takeing pictures over intent Daniel Gultsch 2014-05-13 16:48:39 +02:00
  • 8d27d0c44a Merge https://github.com/siacs/Conversations into development Beriain 2014-05-13 16:46:03 +02:00
  • 1150f47add Update basque translation and include preferences Beriain 2014-05-13 16:42:26 +02:00
  • a8010e7133 Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-13 15:40:59 +02:00
  • 84e79040df static method for providing content uri Daniel Gultsch 2014-05-13 15:37:11 +02:00
  • 6dfd885d34 submenu for attach file Daniel Gultsch 2014-05-13 15:25:04 +02:00
  • 7e66731960 ensure that iq response is being send out for jingle packets. remove jingle connection from manager after termination Daniel Gultsch 2014-05-13 14:49:09 +02:00
  • 3cd369fb7b german translation Daniel Gultsch 2014-05-13 13:51:13 +02:00
  • f38c7b22fd further translations Daniel Gultsch 2014-05-13 11:23:11 +02:00
  • ad9b9b9096 fixed npe in tag writer Daniel Gultsch 2014-05-13 10:23:26 +02:00
  • cce12af766 fixed french language Daniel Gultsch 2014-05-13 10:18:59 +02:00
  • 32d2efd459 Merge pull request #88 from BenoitBouvarel/development Daniel Gultsch 2014-05-12 23:29:26 +02:00
  • dee1ba3bdd Merge pull request #101 from kruks23/development Daniel Gultsch 2014-05-12 23:28:19 +02:00
  • ae768598fe Preferences Spanish Translations kruks23 2014-05-12 23:22:47 +02:00
  • cb706e9e82 Fix a typo in catalan translation alvar 2014-05-12 15:47:36 +02:00
  • d07139d3c4 Translation into catalan language alvar 2014-05-11 19:59:03 +02:00
  • ecea4a5cd2 fixed parsing error on missing %s Daniel Gultsch 2014-05-12 23:12:01 +02:00
  • 3858715ccf Update basque translation Beriain 2014-05-12 17:19:00 +02:00
  • 75f7695087 Merge https://github.com/siacs/Conversations into development Beriain 2014-05-12 17:09:32 +02:00
  • 4be8280beb marked version 0.2 - skipping beta Daniel Gultsch 2014-05-12 15:40:03 +02:00
  • 2fe9bbecdb added changelog entry Daniel Gultsch 2014-05-12 15:05:32 +02:00
  • 3455d10a4a Better error handling if attach file doesnt work (on permission denied) and unified encrypted and unencrypted file attachment Daniel Gultsch 2014-05-12 14:59:46 +02:00
  • 4d0bf7971e transfered preferences descritpions into strings.xml iNPUTmice 2014-05-11 13:55:15 +02:00
  • 20dfc32e2b Merge pull request #93 from kruks23/development Daniel Gultsch 2014-05-10 11:46:44 +02:00
  • fcc021aa94 Delete styles.xml kruks23 2014-05-10 11:26:53 +02:00
  • 1f32089ec0 Merge remote-tracking branch 'origin/development' into development kruks23 2014-05-10 11:23:56 +02:00
  • 3d913c2e0e Translation into spanish. kruks23 2014-05-10 11:23:04 +02:00
  • 8632954e61 fixed possible npe and possible exception iNPUTmice 2014-05-10 11:03:32 +02:00
  • 38d3da6c2b #79 First translation into spanish. kruks23 2014-05-06 20:34:51 +02:00
  • ef0bc6714a added dialog for otr file transfer Daniel Gultsch 2014-05-09 21:20:34 +02:00
  • f0eb80eb5c Merge branch 'development' of github.com:siacs/Conversations into development Daniel Gultsch 2014-05-09 20:57:08 +02:00
  • b6fa18a595 version 0.2 alpha and changelog Daniel Gultsch 2014-05-09 20:56:51 +02:00
  • 95504f5505 Merge pull request #91 from the-solipsist/patch-1 Daniel Gultsch 2014-05-09 20:50:48 +02:00
  • 3b8446e6d5 link to openkeychain from contact details Daniel Gultsch 2014-05-09 20:47:03 +02:00
  • a14a28973a nicer descriptions in notificaton for images and encrypted messages Daniel Gultsch 2014-05-09 20:46:43 +02:00
  • 536d4cca6d Corrected spelling of "formerly" in README.me the-solipsist 2014-05-09 01:23:13 +02:00