Daniel Gultsch
|
b7f596363b
|
Merge pull request #590 from weiss/update-german-translations
Update German translations
|
2014-10-27 10:00:03 +01:00 |
|
Holger Weiß
|
08fc3c7f04
|
Update German translations
|
2014-10-26 23:49:25 +01:00 |
|
iNPUTmice
|
b045dea549
|
set divider for image meta information to '|' to not conflict with URL. breaks images downloaded in between 0.7.3 and now
|
2014-10-26 20:18:57 +01:00 |
|
Daniel Gultsch
|
d86b7f3192
|
Merge pull request #588 from betheg/remove_unused_cast
remove some unused cast
|
2014-10-26 20:17:50 +01:00 |
|
Daniel Gultsch
|
cb21eac501
|
Merge pull request #587 from betheg/fix_possible_fallthrough
fix possible fallthrough.
|
2014-10-26 20:14:09 +01:00 |
|
Michael
|
020dc863b1
|
remove some unused cast
|
2014-10-26 18:54:10 +01:00 |
|
Michael
|
8dae4b1eb9
|
fix possible fallthrough.
|
2014-10-26 18:30:58 +01:00 |
|
Daniel Gultsch
|
284ad1b053
|
Merge pull request #586 from SamWhited/issue585
Use consistent numbering
|
2014-10-26 15:48:18 +01:00 |
|
Sam Whited
|
a5e73850b8
|
Use consistent numbering
Fixes #585
|
2014-10-26 10:37:21 -04:00 |
|
iNPUTmice
|
8171633eb9
|
don't merge downloadable messages
|
2014-10-24 23:18:19 +02:00 |
|
iNPUTmice
|
8fb8985412
|
added message option to download images
|
2014-10-24 19:30:03 +02:00 |
|
Daniel Gultsch
|
1ea8feaf24
|
Merge pull request #582 from kruks23/translation7
Update Spanish Translations
|
2014-10-24 18:55:23 +02:00 |
|
kruks23
|
192e9d3d99
|
Update Spanish Translations
|
2014-10-24 18:52:38 +02:00 |
|
iNPUTmice
|
e1f11a5735
|
also show some text in new image notification
|
2014-10-24 18:27:53 +02:00 |
|
iNPUTmice
|
864f3610b3
|
picture notification and some drive by bug fixes
|
2014-10-24 14:34:46 +02:00 |
|
iNPUTmice
|
1dae59141d
|
Merge branch 'development' of github.com:siacs/Conversations into development
|
2014-10-24 13:29:39 +02:00 |
|
iNPUTmice
|
cbc3d9bd6f
|
notify only after image has been received over http. introduced mini grace for catching up with SM or offline messages
|
2014-10-24 13:29:18 +02:00 |
|
Daniel Gultsch
|
581e96349c
|
Merge pull request #581 from kruks23/translation7
Update Spanish Translations
|
2014-10-23 21:35:41 +02:00 |
|
iNPUTmice
|
d73a77643d
|
context menu for messages. allow to resend single messages
|
2014-10-23 21:27:41 +02:00 |
|
kruks23
|
80c512f197
|
Update Spanish Translations
|
2014-10-23 20:36:17 +02:00 |
|
iNPUTmice
|
de3739970b
|
Merge branch 'development' of github.com:siacs/Conversations into development
|
2014-10-22 19:05:28 +02:00 |
|
iNPUTmice
|
d04afe453a
|
ability to download pgp encrypted files over http as well
|
2014-10-22 19:05:15 +02:00 |
|
Daniel Gultsch
|
f6cf5e9c2f
|
Merge pull request #577 from beriain/development
Update strings.xml for 0.8
|
2014-10-22 17:34:20 +02:00 |
|
iNPUTmice
|
c067bf96b0
|
small bug fixes for the conversation activity
|
2014-10-22 17:32:59 +02:00 |
|
Aitor Beriain
|
451bc8e4eb
|
Update strings.xml
|
2014-10-22 16:04:21 +02:00 |
|
iNPUTmice
|
62b0fc3fda
|
made httpconnection accept aes encrypted files
|
2014-10-22 13:06:46 +02:00 |
|
iNPUTmice
|
45bdadd915
|
better aproach on thread saftey
|
2014-10-22 00:25:28 +02:00 |
|
iNPUTmice
|
9f9c3d3c2f
|
changed version to 0.8 alpha
|
2014-10-22 00:00:19 +02:00 |
|
iNPUTmice
|
df2257aed6
|
added hostname verifier to httpconnection
|
2014-10-22 00:00:01 +02:00 |
|
iNPUTmice
|
40c74b432e
|
made iterating over hashmap in notification service thread safe
|
2014-10-21 23:59:02 +02:00 |
|
iNPUTmice
|
63704b114c
|
throw exception when no servers are left to try
|
2014-10-21 20:13:06 +02:00 |
|
iNPUTmice
|
3821a72644
|
fixed #564
|
2014-10-21 19:43:34 +02:00 |
|
iNPUTmice
|
a56ee63a3e
|
update ui when new avatar was found
|
2014-10-21 15:26:17 +02:00 |
|
iNPUTmice
|
0d767c3971
|
proper avatar caching
|
2014-10-21 14:57:16 +02:00 |
|
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 |