Commit graph

4990 commits

Author SHA1 Message Date
Daniel Gultsch bb4952c89e pulled translations from transifex 2016-11-08 21:37:59 +01:00
Daniel Gultsch 698ddadbee brought restart threshold down to 8 times in 8h 2016-11-08 21:37:44 +01:00
Daniel Gultsch 1ef8d0a746 don't mark previous conversation as read when processing pending intent. fixes #2079 2016-11-08 12:42:13 +01:00
Daniel Gultsch bca8f11c9c add frequent restart detection 2016-11-08 12:20:07 +01:00
Ignacio Quezada 297c0a792f Private files using a boolean flag from Config.java. 2016-11-08 11:45:20 +01:00
Daniel Gultsch 1a57599da2 lower case incoming dns records 2016-11-08 10:14:34 +01:00
Daniel Gultsch 00b3d5ee35 Merge branch 'master' of github.com:siacs/Conversations 2016-11-08 10:08:58 +01:00
Daniel Gultsch b3c19f039c Merge pull request #2108 from licaon-kter/patch-2
Fix typo
2016-11-08 10:08:48 +01:00
licaon-kter d341904c4d Fix typo 2016-11-08 01:46:46 +02:00
Daniel Gultsch 7978fd768e fixed regression of showing delivery failed after receipt 2016-11-07 21:57:08 +01:00
Daniel Gultsch b390908610 Merge pull request #2105 from ReadmeCritic/master
Fix typos in README
2016-11-07 17:58:47 +01:00
ReadmeCritic 64ad93dad6 Fix typos in README 2016-11-07 08:46:35 -08:00
Daniel Gultsch 9edbddd7e1 show warning in account details when data saver is enabled 2016-11-07 10:49:43 +01:00
Daniel Gultsch d369ec767f expanded section on adb in readme 2016-11-02 15:21:45 +01:00
Daniel Gultsch 2c004857f6 handle file attachment when missing connection 2016-11-02 15:21:26 +01:00
Daniel Gultsch 544c5b4a21 removed unnecessary push_mode 2016-11-02 11:04:33 +01:00
Daniel Gultsch e582b9fc10 leaving low ping timeout mode after coming online 2016-11-02 09:36:14 +01:00
Daniel Gultsch e538272417 version bump to 1.14.8 + changelog 2016-11-01 10:27:19 +01:00
Daniel Gultsch 20ddba2aa9 fixed npe when jingle partner is using unknown candidate 2016-11-01 10:27:01 +01:00
Daniel Gultsch 07a71d312a extracting stanza-id where by=account 2016-10-31 12:07:08 +01:00
Daniel Gultsch a5181b22e0 always use ipv4 localhost when using orbot http proxy 2016-10-31 09:53:14 +01:00
Daniel Gultsch ffebb4677a Revert "use file provider on android M as well"
This reverts commit a4020e85f6.
2016-10-30 20:27:39 +01:00
Daniel Gultsch a44f35ed69 schedule correct wakeup call when in low ping timeout mode 2016-10-29 21:45:01 +02:00
Daniel Gultsch 1e4b1a3346 version bump to 1.14.7 + changelog 2016-10-26 12:28:18 +02:00
Daniel Gultsch 8557120ef8 add error message to failed messages. accessible via context menu 2016-10-26 12:26:04 +02:00
Daniel Gultsch a4020e85f6 use file provider on android M as well 2016-10-23 09:03:36 +02:00
Daniel Gultsch 8c1bb058da connect instantly in low ping mode after going offline 2016-10-23 09:03:17 +02:00
Daniel Gultsch 10398cab51 don't leave low timeout mode prematurely 2016-10-20 20:04:16 +02:00
Daniel Gultsch f2696b66ba Merge branch 'feature-remove-merge-separator' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-merge-separator 2016-10-20 18:18:25 +02:00
Daniel Gultsch 52d4be4249 Merge branch 'feature-remove-spans' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-spans 2016-10-20 18:10:52 +02:00
Daniel Gultsch 0f62ff6736 introduced low ping timeout mode after gcm push 2016-10-20 18:02:11 +02:00
Daniel Gultsch 44ce5df359 write prepped string to db. use display version everywhere else 2016-10-20 17:31:46 +02:00
Mishiranu fd4e15ba97 Remove MERGE_SEPARATOR 2016-10-20 01:03:51 +03:00
Mishiranu 8835f08cf7 Remove spans on copying or pasting a text 2016-10-19 20:47:41 +03:00
Daniel Gultsch c3423d6ffe include pgp signature only in non anonymous mucs 2016-10-19 12:31:11 +02:00
Daniel Gultsch dce8149aae retrigger key selection if openpgp key was deleted 2016-10-19 11:53:55 +02:00
Daniel Gultsch 7226fc0010 update conversation in database background thread 2016-10-18 13:06:24 +02:00
Daniel Gultsch 50780debf7 don't trigger context menu in message adapter manually. fixes #2077 2016-10-18 11:16:43 +02:00
Daniel Gultsch f8c21caec9 Merge branch 'feature-selection' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-selection 2016-10-17 09:53:32 +02:00
Daniel Gultsch 22d13a3dcd add exception handling when loading default resource 2016-10-17 09:53:08 +02:00
Daniel Gultsch dc02e2b498 small code reformation in pgp decryption service 2016-10-17 09:52:43 +02:00
Daniel Gultsch 6371d2b7a9 Merge pull request #2063 from thacoon/patch-1
Fix OpenPGP link
2016-10-13 12:21:54 +02:00
Daniel Gultsch 2a73b8d76e clarified fineprint a little bit 2016-10-13 12:17:20 +02:00
Daniel Gultsch f6cfa27741 synchronize access to json key storage in account model 2016-10-13 11:27:26 +02:00
Daniel Gultsch 501152bcfd version bump to 1.14.6 + changelog 2016-10-10 17:54:34 +02:00
Daniel Gultsch 9e54fd5c92 don't use sending state on muc pms without smacks 2016-10-09 19:40:30 +02:00
Daniel Gultsch cd1c05a7c3 add password to direct muc invite 2016-10-09 19:40:03 +02:00
Daniel Gultsch f7d51b8890 pulled more translations from transifex 2016-10-09 18:06:19 +02:00
Daniel Gultsch c5bdb04490 pulled translations from transifex 2016-10-09 11:13:45 +02:00
Daniel Gultsch 74087b873f added disclaimer that conversations.im account is 8 euro / year 2016-10-08 18:24:20 +02:00