Commit graph

Select branches

Hide pull requests

for-singpolyma

peter-dev

peter-dev-bak

Mono Color

• 3552b96c8a update roundedimageview to v2.2.0 Michael 2015-08-25 10:18:00 +02:00
• 4f87413b16 Merge branch 'betheg-sdk_version' into development Daniel Gultsch 2015-08-24 22:21:24 +02:00
• 120810b9ca Merge branch 'sdk_version' of https://github.com/betheg/Conversations into betheg-sdk_version Daniel Gultsch 2015-08-24 22:21:04 +02:00
• 3da90638c6 version bump to 1.7.0-beta Daniel Gultsch 2015-08-24 21:25:33 +02:00
• f6374f466b increased carbon grace period to 90s Daniel Gultsch 2015-08-24 21:25:04 +02:00
• 98e7d9c74e pulled translations from transifex Daniel Gultsch 2015-08-24 21:24:48 +02:00
• 730a5c644b renamed plain text to unencrypted. fixes #1331 Daniel Gultsch 2015-08-24 21:15:47 +02:00
• 865e08401b fixed regression with mlinks stream managment. fixes #1206 Daniel Gultsch 2015-08-24 20:56:36 +02:00
• fb0b4bb445 added setting to allow for white backgrounds in incoming message bubbles Daniel Gultsch 2015-08-24 20:56:25 +02:00
• d36ae091b6 Merge branch 'master' into development Daniel Gultsch 2015-08-24 18:18:24 +02:00
• d0b8bd0f8a catch invalid base64 in axolotl key parsing Daniel Gultsch 2015-08-24 18:18:01 +02:00
• 97c28b13a6 add the the previously deleted build-tools. Michael 2015-08-24 11:32:21 +02:00
• 4cc48f01df update travis.yml Michael 2015-08-24 11:26:17 +02:00
• 5f0ed62833 update android sdk and support library. Michael 2015-08-24 10:59:52 +02:00
• deb9c20e5e Merge branch 'master' into development Daniel Gultsch 2015-08-23 21:06:58 +02:00
• 5a53ff80fb version bump to 1.6.3 and changelog Daniel Gultsch 2015-08-23 21:01:54 +02:00
• c19adebaf0 open files with capital extensions as well. fixes #1354 Daniel Gultsch 2015-08-23 21:00:51 +02:00
• 91a3cee6d2 Merge branch 'master' into development Daniel Gultsch 2015-08-23 19:44:58 +02:00
• 8043833156 bugfix: next encryption is now being properly detected Daniel Gultsch 2015-08-23 19:40:45 +02:00
• 412efe93c0 Merge branch 'master' into development Daniel Gultsch 2015-08-23 18:06:40 +02:00
• b1f1a99190 version bump to 1.6.2 and changelog Daniel Gultsch 2015-08-23 17:59:10 +02:00
• 7bd0f31244 Merge branch 'master' into development Daniel Gultsch 2015-08-23 17:57:53 +02:00
• 0dfb9bd1a0 introduce special iq type for internal timeouts. always use != result to check for error in callbacks Daniel Gultsch 2015-08-23 17:53:23 +02:00
• 777dd4b51e Merge branch 'master' into development Daniel Gultsch 2015-08-23 17:29:46 +02:00
• bbfd98b726 reformating Daniel Gultsch 2015-08-23 17:29:31 +02:00
• d51c4b9655 deal with another set of stream:features after bind Daniel Gultsch 2015-08-23 17:26:50 +02:00
• 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
• 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
• 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
• 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
• 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
• 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
• 8b9b74ff7e renamed multi-end / axolotl to OMEMO Daniel Gultsch 2015-08-08 13:29:21 +02:00
• efdf3b6c1c removed dead code Daniel Gultsch 2015-08-08 13:13:23 +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
• 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
• 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
• 658919f239 improved 'next encryption' selection Daniel Gultsch 2015-07-31 00:52:46 +02:00
• 5191e4ce95 removed expert setting to 'force encryption'. merged certifcate and encryption settings into same category Daniel Gultsch 2015-07-31 00:51:30 +02:00