Commit Graph

2393 Commits

Author SHA1 Message Date
iNPUTmice
21961673cb refactored avatar generation. first step 2014-10-20 21:08:33 +02:00
iNPUTmice
0bb2c3c4d5 keep reference to previous and next message in message 2014-10-20 17:01:37 +02:00
Daniel Gultsch
a8a37ec08d Merge pull request #569 from kriztan/patch-1
Set default preference ...
2014-10-20 09:24:39 +02:00
Daniel Gultsch
b9288ed050 Merge pull request #570 from SamWhited/typo-fixes
Minor typo fixes, and big changes to README
2014-10-20 09:24:20 +02:00
Sam Whited
843a978ca1 Went a bit wild on the README... 2014-10-19 22:16:41 -04:00
Sam Whited
268f790b4c A few typo fixes in the README 2014-10-19 19:03:13 -04:00
Sam Whited
47485fe0c6 Fixed some strange wording in a string
Still doesn't sound right to me though...
2014-10-19 18:22:06 -04:00
Daniel Gultsch
0b61fb0129 Merge pull request #554 from SamWhited/tls
Enable TLSv1.1 and 1.2 and add option to enable/disable SSLv3
2014-10-20 00:03:32 +02:00
iNPUTmice
8263e07336 mtm support for image downloader 2014-10-19 23:42:53 +02:00
iNPUTmice
44f9022d95 use new 'api' to add messages to a conversation 2014-10-19 23:15:24 +02:00
iNPUTmice
c9238ef5ae force tls for registrations as well 2014-10-19 23:14:17 +02:00
iNPUTmice
a201f9e53f got rid of copyonwrite array list for messages 2014-10-19 23:13:55 +02:00
Sam Whited
99ee049115 Make legacy SSL option default to false 2014-10-19 16:11:35 -04:00
Sam Whited
6c7c3ddf15 Add "Enable legacy SSL" preference 2014-10-19 15:53:03 -04:00
iNPUTmice
e8bf75d79b force tls 2014-10-19 20:48:01 +02:00
iNPUTmice
9372a98c0c Merge branch 'lactide-srv_fix' into development 2014-10-19 20:19:35 +02:00
iNPUTmice
f824193c56 Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lactide-srv_fix 2014-10-19 20:17:12 +02:00
iNPUTmice
713cd6ef89 fixed typo in french translation 2014-10-19 18:15:02 +02:00
Daniel Gultsch
30648a835d Merge pull request #555 from SamWhited/build-fixes
Fix problem when merging manifests during a Gradle build
2014-10-19 18:01:45 +02:00
Daniel Gultsch
7539261491 Merge pull request #566 from BenoitBouvarel/patch-1
Update french strings.xml
2014-10-19 18:00:55 +02:00
Daniel Gultsch
3f280134bb Merge pull request #565 from the-solipsist/patch-2
Update README.md
2014-10-19 18:00:32 +02:00
kriztan
f20c43d1a2 Set default preference ...
... for MUC notifications to true
2014-10-19 09:32:49 +02:00
Sam Whited
113b7d1736 Remove support for legacy SSL 2014-10-18 20:22:26 -04:00
the-solipsist
ac3c96b0db Update README.md 2014-10-18 18:01:19 +05:30
Benoit Bouvarel
09abf7b9f8 Update strings.xml
French translation update
2014-10-18 19:20:41 +07:00
the-solipsist
1d9bd64e1d Update README.md
Changed "little" to the grammatically correct "few", and corrected the spelling of "permissions".
2014-10-17 23:55:41 +05:30
iNPUTmice
0605390144 do not attempt to download images when not connected 2014-10-17 13:09:02 +02:00
iNPUTmice
3372e50155 made grace period on a per account basis 2014-10-17 11:01:38 +02:00
Frank Zschockelt
c725da954c try all srv responses if necessary 2014-10-16 23:31:48 +02:00
iNPUTmice
5e3caf9626 additonal safty net for disabling notifications 2014-10-16 19:10:37 +02:00
Sam Whited
5c2a79361a Fix problem when merging manifests 2014-10-16 10:54:05 -04:00
iNPUTmice
0fd634ae52 simplified determination whether otr needs starting in a session 2014-10-16 16:09:54 +02:00
Sam Whited
c4b9d42861 Enable all supported protocols including TLSv1.1 and 1.2 2014-10-16 10:02:47 -04:00
iNPUTmice
c1a55608df log ending otr sessions on disconnect 2014-10-16 15:53:44 +02:00
iNPUTmice
6cfb14a2e4 forground/background logging without csi 2014-10-16 15:39:09 +02:00
iNPUTmice
45e0f99b88 make image download message to type=image only after completion 2014-10-16 15:29:39 +02:00
iNPUTmice
88d88ffb7b added file observer to get notified when files are deleted: fixes #396 2014-10-16 02:39:02 +02:00
iNPUTmice
f5019ba966 detect deleted files on start up. got rid of lagecy image provider for performance reasons. NOTE: this will prevent you to access images older than version 0.6 2014-10-15 22:08:13 +02:00
iNPUTmice
89cc4d1247 Merge branch 'development' of github.com:siacs/Conversations into development 2014-10-15 19:32:23 +02:00
iNPUTmice
cb4069f0f2 refactored file download status. make image http download available for carbon copied (sent) messages as well 2014-10-15 19:32:12 +02:00
Daniel Gultsch
4c9ac61349 Merge pull request #551 from emdete/p4
beautify render script to be easier to diff/patch
2014-10-15 16:20:45 +02:00
M. Dietrich
e08b49f671 beautify render script to be easier to diff/patch 2014-10-15 15:53:02 +02:00
Daniel Gultsch
1927a3d99c Merge pull request #547 from emdete/p0
remove warning about <> cast
2014-10-15 15:38:33 +02:00
M. Dietrich
f021ee8562 remove warning about <> cast 2014-10-15 15:25:36 +02:00
iNPUTmice
299a5074ae Merge branch 'development' of github.com:siacs/Conversations into development 2014-10-15 14:41:44 +02:00
iNPUTmice
9d960f2741 synchronization for listeners 2014-10-15 14:41:27 +02:00
iNPUTmice
f063b1c063 synchronization for notification 2014-10-15 14:33:13 +02:00
iNPUTmice
1428628a5d removed unecessary update 2014-10-15 14:32:37 +02:00
Daniel Gultsch
fefce2a72b Merge pull request #506 from SamWhited/string_fixes
Summary string typo fix
2014-10-15 13:26:02 +02:00
iNPUTmice
d09739d166 changed pgp decoding mechanism 2014-10-15 02:09:20 +02:00