sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • f4eebd091c fixed #105 Daniel Gultsch 2014-05-14 18:32:58 +0200
  • 81d2760505 made message parser non static Daniel Gultsch 2014-05-14 12:56:34 +0200
  • 1f600be4dd code clean up Daniel Gultsch 2014-05-14 11:49:43 +0200
  • 65e7294802 Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-14 00:09:38 +0200
  • ebae779d73 one more entry to strings file Daniel Gultsch 2014-05-13 18:06:56 +0200
  • bc87f59600 version bump 0.2.1 Daniel Gultsch 2014-05-13 17:57:10 +0200
  • a1a90a03e0 added presence selection Daniel Gultsch 2014-05-13 17:42:23 +0200
  • 888de850cf Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-13 17:23:58 +0200
  • a3d241020a Merge branch 'beriain-development' into development Daniel Gultsch 2014-05-13 17:22:45 +0200
  • c0f5b26d1a Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development Daniel Gultsch 2014-05-13 17:22:06 +0200
  • f1bdf1d4c5 Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-13 17:11:36 +0200
  • 71545f4f66 code cleanup Daniel Gultsch 2014-05-13 17:11:27 +0200
  • efac008ffb Fix Beriain 2014-05-13 16:52:35 +0200
  • 9492e28902 takeing pictures over intent Daniel Gultsch 2014-05-13 16:48:39 +0200
  • 8d27d0c44a Merge https://github.com/siacs/Conversations into development Beriain 2014-05-13 16:46:03 +0200
  • 1150f47add Update basque translation and include preferences Beriain 2014-05-13 16:42:26 +0200
  • a8010e7133 Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-13 15:40:59 +0200
  • 84e79040df static method for providing content uri Daniel Gultsch 2014-05-13 15:37:11 +0200
  • 6dfd885d34 submenu for attach file Daniel Gultsch 2014-05-13 15:25:04 +0200
  • 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 +0200
  • 3cd369fb7b german translation Daniel Gultsch 2014-05-13 13:51:13 +0200
  • f38c7b22fd further translations Daniel Gultsch 2014-05-13 11:23:11 +0200
  • ad9b9b9096 fixed npe in tag writer Daniel Gultsch 2014-05-13 10:23:26 +0200
  • cce12af766 fixed french language Daniel Gultsch 2014-05-13 10:18:59 +0200
  • 32d2efd459 Merge pull request #88 from BenoitBouvarel/development Daniel Gultsch 2014-05-12 23:29:26 +0200
  • dee1ba3bdd Merge pull request #101 from kruks23/development Daniel Gultsch 2014-05-12 23:28:19 +0200
  • ae768598fe Preferences Spanish Translations kruks23 2014-05-12 23:22:47 +0200
  • cb706e9e82 Fix a typo in catalan translation alvar 2014-05-12 15:47:36 +0200
  • d07139d3c4 Translation into catalan language alvar 2014-05-11 19:59:03 +0200
  • ecea4a5cd2 fixed parsing error on missing %s Daniel Gultsch 2014-05-12 23:12:01 +0200
  • 3858715ccf Update basque translation Beriain 2014-05-12 17:19:00 +0200
  • 75f7695087 Merge https://github.com/siacs/Conversations into development Beriain 2014-05-12 17:09:32 +0200
  • 4be8280beb marked version 0.2 - skipping beta 0.2 Daniel Gultsch 2014-05-12 15:40:03 +0200
  • 2fe9bbecdb added changelog entry Daniel Gultsch 2014-05-12 15:05:32 +0200
  • 3455d10a4a Better error handling if attach file doesnt work (on permission denied) and unified encrypted and unencrypted file attachment 0.2-beta Daniel Gultsch 2014-05-12 14:59:46 +0200
  • 4d0bf7971e transfered preferences descritpions into strings.xml iNPUTmice 2014-05-11 13:55:15 +0200
  • 20dfc32e2b Merge pull request #93 from kruks23/development Daniel Gultsch 2014-05-10 11:46:44 +0200
  • fcc021aa94 Delete styles.xml kruks23 2014-05-10 11:26:53 +0200
  • 1f32089ec0 Merge remote-tracking branch 'origin/development' into development kruks23 2014-05-10 11:23:56 +0200
  • 3d913c2e0e Translation into spanish. kruks23 2014-05-10 11:23:04 +0200
  • 8632954e61 fixed possible npe and possible exception iNPUTmice 2014-05-10 11:03:32 +0200
  • 38d3da6c2b #79 First translation into spanish. kruks23 2014-05-06 20:34:51 +0200
  • ef0bc6714a added dialog for otr file transfer 0.2-alpha Daniel Gultsch 2014-05-09 21:20:34 +0200
  • f0eb80eb5c Merge branch 'development' of github.com:siacs/Conversations into development Daniel Gultsch 2014-05-09 20:57:08 +0200
  • b6fa18a595 version 0.2 alpha and changelog Daniel Gultsch 2014-05-09 20:56:51 +0200
  • 95504f5505 Merge pull request #91 from the-solipsist/patch-1 Daniel Gultsch 2014-05-09 20:50:48 +0200
  • 3b8446e6d5 link to openkeychain from contact details Daniel Gultsch 2014-05-09 20:47:03 +0200
  • a14a28973a nicer descriptions in notificaton for images and encrypted messages Daniel Gultsch 2014-05-09 20:46:43 +0200
  • 536d4cca6d Corrected spelling of "formerly" in README.me the-solipsist 2014-05-09 01:23:13 +0200
  • b0a0863ba2 Merge pull request #89 from dschuermann/fix-otr-message Daniel Gultsch 2014-05-08 20:08:49 +0200
  • 8a2da100d5 Improve OTR fingerprint dialog and fix german sentence Dominik Schürmann 2014-05-08 19:03:32 +0200
  • 30aea38713 Merge pull request #2 from siacs/development Dominik Schürmann 2014-05-08 18:46:37 +0200
  • c555a9d03c sending text message after returing from pending intent Daniel Gultsch 2014-05-08 17:31:53 +0200
  • 7fa61564b8 better flow after returning from openkeychain for various actions Daniel Gultsch 2014-05-08 16:52:19 +0200
  • 42c07bf4ae Update basque translation Beriain 2014-05-08 15:59:32 +0200
  • 1b2ce1a309 Merge pull request #1 from siacs/development Dominik Schürmann 2014-05-08 14:40:03 +0200
  • 99a56a2bde offer to announce pgp key if pgp encryption is selected from menu Daniel Gultsch 2014-05-08 14:35:21 +0200
  • 0ed29c1c77 more informative dialog if contact doesn't announce public key Daniel Gultsch 2014-05-08 14:23:09 +0200
  • dc73a25ae4 code cleanup Daniel Gultsch 2014-05-08 11:53:00 +0200
  • 0d8bf660db fixed download button on pgp images Daniel Gultsch 2014-05-08 10:14:12 +0200
  • f4330b3a48 Merge pull request #87 from dschuermann/development Daniel Gultsch 2014-05-07 20:06:12 +0200
  • fa81beac3d Use git submodule with openpgp-api-lib only Dominik Schürmann 2014-05-07 18:52:11 +0200
  • 650e1ebda8 Add readme Dominik Schürmann 2014-05-07 17:01:17 +0200
  • 14dd8cc078 Initial import from main repo Dominik Schürmann 2014-05-07 16:31:28 +0200
  • 02e8db4f4c updated readme Daniel Gultsch 2014-05-07 16:02:05 +0200
  • 02673b2866 Traduction Francaise Benoit Bouvarel 2014-05-07 15:38:27 +0200
  • 5a407c766c fixed #70 #65 Daniel Gultsch 2014-05-07 13:19:50 +0200
  • daa000dd75 improved next encryption selection Daniel Gultsch 2014-05-07 13:09:40 +0200
  • 247f45f46b remembering text. awesome Daniel Gultsch 2014-05-07 12:59:15 +0200
  • 12a3865c47 correct status after error iq Daniel Gultsch 2014-05-07 12:58:57 +0200
  • 955b7dbc7e wee bit of code cleanup Daniel Gultsch 2014-05-07 12:33:55 +0200
  • 6b20a213b0 basic german translation Daniel Gultsch 2014-05-06 22:14:02 +0200
  • 2b37dfbe93 Merge pull request #80 from beriain/development Daniel Gultsch 2014-05-06 21:40:11 +0200
  • 461f2ffb16 basic pgp encrypted file transfer Daniel Gultsch 2014-05-06 21:34:30 +0200
  • 0578fb3850 #79 First translation into spanish. kruks23 2014-05-06 20:34:51 +0200
  • b8023b4dfc Merge https://github.com/siacs/Conversations into development Beriain 2014-05-06 16:56:59 +0200
  • 86887274c7 Update basque and spanish translations Beriain 2014-05-06 16:50:27 +0200
  • f7033cb7e0 content name and creator are properly set Daniel Gultsch 2014-05-03 18:47:53 +0200
  • 2df57f38a0 properly reply to iq requests. reply to disco Daniel Gultsch 2014-05-03 17:42:44 +0200
  • 4822d4dce7 allow roster pushes only from bare jid or null Daniel Gultsch 2014-05-03 17:07:37 +0200
  • be2f7e047a more cleanup in res files Daniel Gultsch 2014-05-03 17:06:54 +0200
  • 4893d8030b removed unnecessary files Daniel Gultsch 2014-05-03 17:04:41 +0200
  • 3cfb4a0cd6 added restart button to openkeychain dialog Daniel Gultsch 2014-05-03 15:24:19 +0200
  • 794f9d6cc8 Add Basque and Spanish translations Mikel 2014-05-02 21:21:56 +0200
  • 82bccedf70 nicer dialog screen if openkeychain is not installed Daniel Gultsch 2014-05-02 12:02:18 +0200
  • 37c8e157d0 reworked openpgp integration part #1 Daniel Gultsch 2014-05-01 22:33:49 +0200
  • 4b66b4b5d1 bug fix for jingle Daniel Gultsch 2014-04-26 17:26:22 +0200
  • f36f218469 unified presence selection for otr and file transfer Daniel Gultsch 2014-04-26 12:40:21 +0200
  • a55ddb889e fixed #75 Daniel Gultsch 2014-04-25 23:14:43 +0200
  • 6942840061 setting backround color if image comes directly from cache Daniel Gultsch 2014-04-25 23:09:15 +0200
  • 645139eb68 couple of more optimazations on image loading Daniel Gultsch 2014-04-25 23:06:20 +0200
  • bf2d0d5596 smoother scrolling (first step) Daniel Gultsch 2014-04-25 16:24:56 +0200
  • 18c183a767 deny files with unknown file types Daniel Gultsch 2014-04-23 21:19:56 +0200
  • 9a8e55acd1 added download button for images not accepted automatically Daniel Gultsch 2014-04-22 18:46:40 +0200
  • aa5f775fc7 added support for ibb Daniel Gultsch 2014-04-22 13:11:53 +0200
  • d151ad9031 code cleanup Daniel Gultsch 2014-04-21 20:39:57 +0200
  • 77da0c6b5d allow images to be opened with gallary app Daniel Gultsch 2014-04-21 19:51:03 +0200
  • fc6a16c31b added missing transport id Daniel Gultsch 2014-04-21 12:03:26 +0200
  • 4d730fd1ed added proxy activate and a lot of code clean up. totatly untested Daniel Gultsch 2014-04-20 22:34:27 +0200
  • 04418484a2 made our spanish friends happy. fixed #68 Daniel Gultsch 2014-04-20 20:53:36 +0200