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

Commit graph

  • b0a0863ba2 Merge pull request #89 from dschuermann/fix-otr-message Daniel Gultsch 2014-05-08 20:08:49 +02:00
  • 8a2da100d5 Improve OTR fingerprint dialog and fix german sentence Dominik Schürmann 2014-05-08 19:03:32 +02:00
  • 30aea38713 Merge pull request #2 from siacs/development Dominik Schürmann 2014-05-08 18:46:37 +02:00
  • c555a9d03c sending text message after returing from pending intent Daniel Gultsch 2014-05-08 17:31:53 +02:00
  • 7fa61564b8 better flow after returning from openkeychain for various actions Daniel Gultsch 2014-05-08 16:52:19 +02:00
  • 42c07bf4ae Update basque translation Beriain 2014-05-08 15:59:32 +02:00
  • 1b2ce1a309 Merge pull request #1 from siacs/development Dominik Schürmann 2014-05-08 14:40:03 +02:00
  • 99a56a2bde offer to announce pgp key if pgp encryption is selected from menu Daniel Gultsch 2014-05-08 14:35:21 +02:00
  • 0ed29c1c77 more informative dialog if contact doesn't announce public key Daniel Gultsch 2014-05-08 14:23:09 +02:00
  • dc73a25ae4 code cleanup Daniel Gultsch 2014-05-08 11:53:00 +02:00
  • 0d8bf660db fixed download button on pgp images Daniel Gultsch 2014-05-08 10:14:12 +02:00
  • f4330b3a48 Merge pull request #87 from dschuermann/development Daniel Gultsch 2014-05-07 20:06:12 +02:00
  • fa81beac3d Use git submodule with openpgp-api-lib only Dominik Schürmann 2014-05-07 18:52:11 +02:00
  • 650e1ebda8 Add readme Dominik Schürmann 2014-05-07 17:01:17 +02:00
  • 14dd8cc078 Initial import from main repo Dominik Schürmann 2014-05-07 16:31:28 +02:00
  • 02e8db4f4c updated readme Daniel Gultsch 2014-05-07 16:02:05 +02:00
  • 02673b2866 Traduction Francaise Benoit Bouvarel 2014-05-07 15:38:27 +02:00
  • 5a407c766c fixed #70 #65 Daniel Gultsch 2014-05-07 13:19:50 +02:00
  • daa000dd75 improved next encryption selection Daniel Gultsch 2014-05-07 13:09:40 +02:00
  • 247f45f46b remembering text. awesome Daniel Gultsch 2014-05-07 12:59:15 +02:00
  • 12a3865c47 correct status after error iq Daniel Gultsch 2014-05-07 12:58:57 +02:00
  • 955b7dbc7e wee bit of code cleanup Daniel Gultsch 2014-05-07 12:33:55 +02:00
  • 6b20a213b0 basic german translation Daniel Gultsch 2014-05-06 22:14:02 +02:00
  • 2b37dfbe93 Merge pull request #80 from beriain/development Daniel Gultsch 2014-05-06 21:40:11 +02:00
  • 461f2ffb16 basic pgp encrypted file transfer Daniel Gultsch 2014-05-06 21:34:30 +02:00
  • 0578fb3850 #79 First translation into spanish. kruks23 2014-05-06 20:34:51 +02:00
  • b8023b4dfc Merge https://github.com/siacs/Conversations into development Beriain 2014-05-06 16:56:59 +02:00
  • 86887274c7 Update basque and spanish translations Beriain 2014-05-06 16:50:27 +02:00
  • f7033cb7e0 content name and creator are properly set Daniel Gultsch 2014-05-03 18:47:53 +02:00
  • 2df57f38a0 properly reply to iq requests. reply to disco Daniel Gultsch 2014-05-03 17:42:44 +02:00
  • 4822d4dce7 allow roster pushes only from bare jid or null Daniel Gultsch 2014-05-03 17:07:37 +02:00
  • be2f7e047a more cleanup in res files Daniel Gultsch 2014-05-03 17:06:54 +02:00
  • 4893d8030b removed unnecessary files Daniel Gultsch 2014-05-03 17:04:41 +02:00
  • 3cfb4a0cd6 added restart button to openkeychain dialog Daniel Gultsch 2014-05-03 15:24:19 +02:00
  • 794f9d6cc8 Add Basque and Spanish translations Mikel 2014-05-02 21:21:56 +02:00
  • 82bccedf70 nicer dialog screen if openkeychain is not installed Daniel Gultsch 2014-05-02 12:02:18 +02:00
  • 37c8e157d0 reworked openpgp integration part #1 Daniel Gultsch 2014-05-01 22:33:49 +02:00
  • 4b66b4b5d1 bug fix for jingle Daniel Gultsch 2014-04-26 17:26:22 +02:00
  • f36f218469 unified presence selection for otr and file transfer Daniel Gultsch 2014-04-26 12:40:21 +02:00
  • a55ddb889e fixed #75 Daniel Gultsch 2014-04-25 23:14:43 +02:00
  • 6942840061 setting backround color if image comes directly from cache Daniel Gultsch 2014-04-25 23:09:15 +02:00
  • 645139eb68 couple of more optimazations on image loading Daniel Gultsch 2014-04-25 23:06:20 +02:00
  • bf2d0d5596 smoother scrolling (first step) Daniel Gultsch 2014-04-25 16:24:56 +02:00
  • 18c183a767 deny files with unknown file types Daniel Gultsch 2014-04-23 21:19:56 +02:00
  • 9a8e55acd1 added download button for images not accepted automatically Daniel Gultsch 2014-04-22 18:46:40 +02:00
  • aa5f775fc7 added support for ibb Daniel Gultsch 2014-04-22 13:11:53 +02:00
  • d151ad9031 code cleanup Daniel Gultsch 2014-04-21 20:39:57 +02:00
  • 77da0c6b5d allow images to be opened with gallary app Daniel Gultsch 2014-04-21 19:51:03 +02:00
  • fc6a16c31b added missing transport id Daniel Gultsch 2014-04-21 12:03:26 +02:00
  • 4d730fd1ed added proxy activate and a lot of code clean up. totatly untested Daniel Gultsch 2014-04-20 22:34:27 +02:00
  • 04418484a2 made our spanish friends happy. fixed #68 Daniel Gultsch 2014-04-20 20:53:36 +02:00
  • d140ef6390 fixed #50 Daniel Gultsch 2014-04-20 20:48:16 +02:00
  • 8003e53013 more jingle bug fixes Daniel Gultsch 2014-04-19 11:58:35 +02:00
  • 7299fe7c8b fixed replace contact in conversation Daniel Gultsch 2014-04-19 02:58:34 +02:00
  • 8c59668273 made debugging verbose again on specific parts Daniel Gultsch 2014-04-19 02:19:26 +02:00
  • 1235e3daca fixed default autoaccept file size and wrongly marked message Daniel Gultsch 2014-04-19 01:51:50 +02:00
  • 5c0873c7ca cleaned up debug log a little bit Daniel Gultsch 2014-04-19 01:14:30 +02:00
  • 7ccbf0008a fixed concurrent modification of contacts which led to missing presences Daniel Gultsch 2014-04-18 21:26:01 +02:00
  • 1e5f916b2a tried to avoid some more race conditions in jingle Daniel Gultsch 2014-04-18 11:57:28 +02:00
  • 8cc72b5a56 updated minidns Daniel Gultsch 2014-04-18 09:32:17 +02:00
  • 625fbe7d81 Merge branch 'master' into development Daniel Gultsch 2014-04-18 01:07:45 +02:00
  • 18c0c31b65 work around for bug in xmlpullparser Daniel Gultsch 2014-04-17 10:34:25 +02:00
  • 07cf07ad58 lot of cleanup in jingle part Daniel Gultsch 2014-04-17 14:52:10 +02:00
  • 8006931f80 put more string into strings.xml Daniel Gultsch 2014-04-16 23:58:53 +02:00
  • 0de0cb90a0 fixed destination bug Daniel Gultsch 2014-04-16 23:11:37 +02:00
  • e29ce19f20 fixed #63 Daniel Gultsch 2014-04-16 19:48:04 +02:00
  • a04d736f75 fixed possible race conditions with presences Daniel Gultsch 2014-04-16 19:14:20 +02:00
  • 4a36abf30f added clear history dialog (no funcionality) Daniel Gultsch 2014-04-16 18:16:23 +02:00
  • e711da7248 jingle sessions now get terminated proberly on success Daniel Gultsch 2014-04-16 12:50:53 +02:00
  • bdf9770a61 made ui with sending images a little smoother Daniel Gultsch 2014-04-15 15:19:02 +02:00
  • 513f3c47b2 added very basic, very untested gui on the receiving side Daniel Gultsch 2014-04-14 21:21:13 +02:00
  • 18c3333271 tried to fix some race conditions. not adding duplicate candidates. needs more checks though Daniel Gultsch 2014-04-14 20:35:11 +02:00
  • 2014af0f7e Merge pull request #59 from jelmer/typo-preemptively Daniel Gultsch 2014-04-14 10:23:06 +02:00
  • 9704bcf1c3 Merge pull request #58 from jelmer/fix-typo-assoziated Daniel Gultsch 2014-04-14 10:22:48 +02:00
  • 3727b90ce1 Fix typo: Preemptivly -> Preemptively. Jelmer Vernooij 2014-04-14 02:38:21 +02:00
  • 802c21a793 Fix two typos: assoziated -> associated. Jelmer Vernooij 2014-04-14 02:22:03 +02:00
  • 1e25b2aa5b added contributors and note to xep65 Daniel Gultsch 2014-04-13 22:36:36 +02:00
  • e4f9a38c76 Some icon tweaks Andreas Straub 2014-04-13 20:46:29 +02:00
  • 132689376c Added ellipsis tile for large conversations Andreas Straub 2014-04-13 20:44:17 +02:00
  • 901ce085a7 Major Contact Picture code cleanup Andreas Straub 2014-04-13 20:41:06 +02:00
  • 152be6eb1a Add gitignore Rene Treffer 2014-04-13 21:12:20 +02:00
  • 084ab51b1d transmitting files between two conversations works. no error handling and no ui on the receiving end Daniel Gultsch 2014-04-13 21:10:36 +02:00
  • 7dfe4ae082 some code cleanup. added setting to auto accept files. socks5 connections are now threaded Daniel Gultsch 2014-04-13 18:09:40 +02:00
  • 27d5966ac3 more efficant way of calculating the sha1 sum. closing connections Daniel Gultsch 2014-04-13 11:32:45 +02:00
  • 7b554f2001 fixed minor typos Daniel Gultsch 2014-04-12 10:45:25 +02:00
  • f57b669f83 Merge branch 'development' of https://github.com/strb/Conversations into strb-development Daniel Gultsch 2014-04-12 10:22:18 +02:00
  • d936a830e4 add sha1 sum to file Daniel Gultsch 2014-04-12 10:02:48 +02:00
  • f3b07250dd Added tiled MUC icons andy 2014-04-12 03:24:30 +02:00
  • c230733736 More Contact Picture refactors andy 2014-04-12 01:36:44 +02:00
  • 3d6f03e859 Refactor UIHelper to use getContactPicture andy 2014-04-11 22:30:50 +02:00
  • 96be96f9f8 open latest conversation from notification Daniel Gultsch 2014-04-11 23:05:45 +02:00
  • 259bb446ca first file transfer between gajim and conversations. still a lot to do though Daniel Gultsch 2014-04-11 22:49:26 +02:00
  • c0e0a70869 socks5 initialisation works. doesn't get activate though Daniel Gultsch 2014-04-11 21:13:09 +02:00
  • 51100ab48b failed messages get now marked inline Daniel Gultsch 2014-04-11 09:13:56 +02:00
  • 644473205a incomming jingle packets are routed to their connection. added presence chooser in gui Daniel Gultsch 2014-04-10 14:12:08 +02:00
  • ba0bedc5fa changed behaviour of expecption handler to check if accounts are working before removing the stacktrace Daniel Gultsch 2014-04-10 13:19:58 +02:00
  • 298c7adcd1 disocover stream hosts (xep-0065) cleaned up disco Daniel Gultsch 2014-04-08 23:15:55 +02:00
  • 92dcf85701 fixed npe Daniel Gultsch 2014-04-08 10:23:05 +02:00
  • 78bd6c423f fixed #52. thanks @strb Daniel Gultsch 2014-04-07 23:58:59 +02:00
  • 3f403fb8a9 jingle connection and manager. able to trigger dialog in gajim Daniel Gultsch 2014-04-07 20:05:45 +02:00