Commit graph

  • b0710cdf04 Merge branch 'master' into development Daniel Gultsch 2015-08-23 13:57:14 +02:00
  • bea7b2bcc1 Merge pull request #1348 from betheg/zxing Daniel Gultsch 2015-08-23 13:36:08 +02:00
  • 560e63564d added changelog for 1.6.1 Daniel Gultsch 2015-08-23 13:29:55 +02:00
  • 10a9bd3864 update zxing to v3.2.1 Michael 2015-08-23 13:27:06 +02:00
  • 96c6c793b3 version bump to 1.6.1 Daniel Gultsch 2015-08-23 13:25:04 +02:00
  • e1dc7f990d Add error handling to OMEMO PEP code Andreas Straub 2015-08-23 13:23:10 +02:00
  • c0502c2165 remove the READ_PHONE_STATE permission. Michael 2015-08-23 12:39:20 +02:00
  • 3d6fb9b21d remove callbacks directly from iterator Daniel Gultsch 2015-08-23 10:20:29 +02:00
  • 1688b65965 don't make subsequent iq request when original stanza returned an error Daniel Gultsch 2015-08-23 08:27:05 +02:00
  • 496f531e2e modified clearIqCallbacks into 2-step process Daniel Gultsch 2015-08-23 08:01:47 +02:00
  • fed7a521ab replaced ... with … Christian S 2015-08-19 20:18:26 +02:00
  • 0201281566 some little image preview changes Christian S 2015-08-19 20:18:00 +02:00
  • 64609fa37f forked NotificationService from siacs/development Christian S 2015-08-19 19:23:49 +02:00
  • 24f235f2f4 removed duplicates Christian S 2015-08-19 19:19:38 +02:00
  • 772ba2ec91 removed duplicate string Christian S 2015-08-19 19:16:51 +02:00
  • 497e5c57b9 copy commits Christian S 2015-08-19 18:59:12 +02:00
  • 06fffc13cd Merge branch 'master' into development Daniel Gultsch 2015-08-19 13:16:59 +02:00
  • 7c822c9b75 pulled translations from transifex Daniel Gultsch 2015-08-19 13:03:14 +02:00
  • 9e26375d2f simulate old behaviour with messages being set to waiting while offline Daniel Gultsch 2015-08-19 13:00:52 +02:00
  • c9b2638778 Merge branch 'master' into development Daniel Gultsch 2015-08-19 12:49:24 +02:00
  • 52f0622dd3 fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d Daniel Gultsch 2015-08-19 12:47:50 +02:00
  • dafcee6a5b Merge branch 'master' into development Daniel Gultsch 2015-08-19 12:29:23 +02:00
  • 6e1870b00a check if inputstream is null before cropping avatar images Daniel Gultsch 2015-08-19 12:25:17 +02:00
  • 9ebd6d503c catch package manager has died exception Daniel Gultsch 2015-08-19 12:24:42 +02:00
  • 5d3be343ee Merge pull request #23 from kriztan/Subtitle Christian S. 2015-08-18 17:22:15 +02:00
  • 81aeef7f58 add subtitle to ActionBar in chatviews Christian S 2015-08-18 16:23:10 +02:00
  • f8b203ffff added German translation for undo string Christian S. 2015-08-16 15:30:05 +02:00
  • cd5fea0fc5 added translation for undo string Christian S. 2015-08-16 15:29:16 +02:00
  • 9edcca1045 Merge branch 'master' into development Daniel Gultsch 2015-08-16 15:01:06 +02:00
  • 569bc435d3 increased version code Daniel Gultsch 2015-08-16 15:00:27 +02:00
  • 5b1dda9148 deal with broken frameworks Daniel Gultsch 2015-08-16 14:55:40 +02:00
  • d7b3060fc8 catch broken base64 in avatars Daniel Gultsch 2015-08-16 14:55:24 +02:00
  • 344a266c3e reduced image preview size Christian S. 2015-08-16 13:10:24 +02:00
  • 51a2645349 synchronize packetCallbacks Daniel Gultsch 2015-08-16 12:12:22 +02:00
  • c082066118 catch null pointer in ScramSHA1 sasl Daniel Gultsch 2015-08-16 11:50:33 +02:00
  • 2048493193 Merge branch 'siacs/development' into development Christian S 2015-08-15 20:22:05 +02:00
  • 85eb81b095 Update CHANGELOG.md Christian S. 2015-08-15 19:57:55 +02:00
  • f4a2e4f2ce Merge branch 'master' of https://github.com/kriztan/Conversations Christian S 2015-08-15 19:44:48 +02:00
  • a118cb0e5e version 1.6.0 Christian S 2015-08-15 19:43:23 +02:00
  • c387495146 added 'ics' to well-known extentions Christian S. 2015-08-15 19:37:14 +02:00
  • e8e0eccd82 version bump to 1.7.0-alpha to start new development cycle Daniel Gultsch 2015-08-15 19:26:52 +02:00
  • 5501502e89 Merge branch 'depend_on_sm' into development Daniel Gultsch 2015-08-15 19:18:38 +02:00
  • 11fbc3d79e version bump to 1.6.0 Daniel Gultsch 2015-08-15 19:14:09 +02:00
  • ecac1e5943 Merge branch 'development' Daniel Gultsch 2015-08-15 19:12:51 +02:00
  • 6aec49f06d Update license string with libraries Andreas Straub 2015-08-15 19:07:55 +02:00
  • 45d68c200e Display error message if all contact keys purged Andreas Straub 2015-08-15 18:52:47 +02:00
  • 83e1e6468e fully depend on sm Daniel Gultsch 2015-08-13 18:25:10 +02:00
  • 1f34fb742c Merge branch 'development' Daniel Gultsch 2015-08-15 14:26:37 +02:00
  • 32826ec29d provide extra interface to close sockets. fixes #1330 Daniel Gultsch 2015-08-15 14:14:33 +02:00
  • 75bafd573e Merge pull request #1329 from hlad/server_info_http_upload Daniel Gultsch 2015-08-15 13:58:48 +02:00
  • 4539643f27 show HTTP upload availability on Edit account screen hlad 2015-08-14 22:24:05 +02:00
  • 5dc7c73b4b rename axolotl to omemo Christian S 2015-08-12 21:34:09 +02:00
  • a0145e779d version 1.6.0 beta 3 Christian S 2015-08-12 12:41:13 +02:00
  • 81b7e27a46 version bump to 1.6.0-beta.2 Daniel Gultsch 2015-08-11 20:38:12 +02:00
  • dad90762b4 do not touch pictures that are already in the right format fixed #522 Daniel Gultsch 2015-08-11 16:50:00 +02:00
  • 3677c6ec98 use same code that is used to open files for images fixes #1323 Daniel Gultsch 2015-08-11 15:23:52 +02:00
  • c0dcf4a55a changed color of 'whispered' prefix fixes #1326 Daniel Gultsch 2015-08-11 15:13:17 +02:00
  • fd81491b05 put wake locks on out of band file transfers Daniel Gultsch 2015-08-10 19:48:36 +02:00
  • d30515a85a report wrong file size in otr encrypted jingle file transfers to be compatible with conversations > 1.6 Daniel Gultsch 2015-08-10 12:55:37 +02:00
  • b5e90850d8 provide more detailed error toasts for http file download Daniel Gultsch 2015-08-10 12:15:14 +02:00
  • d2ded8ad50 Merge pull request #1324 from fiaxh/omemo_logo Daniel Gultsch 2015-08-09 23:16:50 +02:00
  • e8bcd39166 OMEMO logo fiaxh 2015-08-09 22:50:35 +02:00
  • b7f00ddac3 fixed image preview in notfications for images that arrived over jingle Daniel Gultsch 2015-08-08 17:19:40 +02:00
  • a6e00837af decreased right hand side padding in contact keys Daniel Gultsch 2015-08-08 14:09:02 +02:00
  • 6ef1f09084 also hide encryption options in MUCs Christian S 2015-08-08 13:56:52 +02:00
  • ef736ec0d8 add config option to hide all encryption modes Christian S 2015-08-08 13:53:04 +02:00
  • 66a72b1adb modified avatar sizes Christian S 2015-08-08 13:52:39 +02:00
  • 8b9b74ff7e renamed multi-end / axolotl to OMEMO Daniel Gultsch 2015-08-08 13:29:21 +02:00
  • 6fcef5fcff modified image preview size and avatar size Christian S 2015-08-08 13:24:57 +02:00
  • efdf3b6c1c removed dead code Daniel Gultsch 2015-08-08 13:13:23 +02:00
  • dfc8b308a0 version bump to 1.6.0 beta2 Christian S 2015-08-08 12:48:56 +02:00
  • e3f2fa24e2 added one more well-known file type Christian S 2015-08-08 12:48:40 +02:00
  • 632719979a modified settings Christian S 2015-08-08 12:44:36 +02:00
  • 20fde69785 copy commits Christian S 2015-08-08 12:42:31 +02:00
  • cac577fa4e don't request ack for iq stanzas before stream managment is initialized fixes #1322 Daniel Gultsch 2015-08-08 10:26:36 +02:00
  • 7437d0fe0c Increase number of published prekeys for release Andreas Straub 2015-08-07 12:28:45 +02:00
  • 53ce5d223e request server-ACKs for iq stanzas Daniel Gultsch 2015-08-06 20:48:55 +02:00
  • 6694af8fca fail old/invalid iq stanzas on bind Daniel Gultsch 2015-08-06 14:54:37 +02:00
  • 5c0853f302 hide multi-end and otr encryption in conferences Daniel Gultsch 2015-08-06 13:09:53 +02:00
  • 34b22dea48 Improve TrustKeysActivity slider responsiveness Andreas Straub 2015-08-05 22:22:37 +02:00
  • a1c43d8fdf added config.java variable to hide openpgp as an encryption method Daniel Gultsch 2015-08-05 18:52:34 +02:00
  • e10e9942de changed text selection color Daniel Gultsch 2015-08-05 18:30:49 +02:00
  • c617cf6ef8 added Config.java varibale to lock account creation to specfic domain Daniel Gultsch 2015-08-03 22:58:17 +02:00
  • 582e570f5f Merge pull request #18 from siacs/development Christian S. 2015-08-03 19:11:14 +02:00
  • 9b91d0bf75 sync translations with transifex Daniel Gultsch 2015-08-03 14:04:26 +02:00
  • edd2ead7b4 version bump for ShortcutBadger Daniel Gultsch 2015-08-03 14:01:58 +02:00
  • 2d1abca302 copy commits Christian S 2015-08-02 08:54:53 +02:00
  • 6c69e17eef added changelog for version 1.6 Daniel Gultsch 2015-08-01 23:41:49 +02:00
  • 3b440b5a9b version bump to 1.6.0-beta Daniel Gultsch 2015-08-01 23:38:28 +02:00
  • a6bbe4d4ce lets try jpeg for a while Daniel Gultsch 2015-08-01 23:37:41 +02:00
  • 2bf30bb296 temporarily renamed new encryption method to 'Multi-End' until a better name has been found Daniel Gultsch 2015-08-01 23:36:59 +02:00
  • 5529337da3 use content-type in http slot request and stick with during upload Daniel Gultsch 2015-08-01 22:37:17 +02:00
  • f9dec7cf86 fixed calculated file size in http slot request Daniel Gultsch 2015-08-01 22:23:58 +02:00
  • 6cd9383e53 Let UNTRUSTED/UNDECIDED keys become INACTIVE Andreas Straub 2015-08-01 18:27:52 +02:00
  • 60cd307f73 enable axolotl encryption for jingle supported file transfers Daniel Gultsch 2015-08-01 01:19:16 +02:00
  • 6059b96456 Provide process function for key transport message Andreas Straub 2015-07-31 23:28:09 +02:00
  • 909f761ca1 Refactor axolotl message processing workflow Andreas Straub 2015-07-31 21:12:34 +02:00
  • 50b14434ee Reformat code Andreas Straub 2015-07-31 18:05:32 +02:00
  • 5c421da1e1 Change to new wire protocol version Andreas Straub 2015-07-31 17:59:41 +02:00
  • 26ac7c9030 added missing carbon column message table create statement fixes #1310 Daniel Gultsch 2015-07-31 13:08:35 +02:00