Daniel Gultsch
d2cfac222e
show load more messages when auto loading is disabled and messages are still left on server
2016-02-21 17:32:46 +01:00
Daniel Gultsch
b00c561f81
check for uuid change when decrypting pgp messages
2016-02-21 11:43:03 +01:00
Daniel Gultsch
ed740b4868
some mucs may grant voice to visitors in unmoderated rooms
2016-02-21 11:42:41 +01:00
Daniel Gultsch
43b466704a
pulled translations from transifex
2016-02-20 10:25:23 +01:00
Daniel Gultsch
3bde4dbedb
change uuid when replacing messages
2016-02-20 00:01:39 +01:00
Daniel Gultsch
e6f8b7d9fa
decrypt pgp message corrections
2016-02-19 21:02:33 +01:00
Daniel Gultsch
a2cb009f4c
skip avatar ui when pep is not available. fixes #1706
2016-02-19 20:54:53 +01:00
Daniel Gultsch
df992d2566
don't reset whisper on reInit. fixes #1637
2016-02-19 20:54:43 +01:00
Daniel Gultsch
ad60bc002c
pulled translations from transifex
2016-02-19 11:14:16 +01:00
Daniel Gultsch
49a3f6f281
never parse show in presences as offline
2016-02-19 11:09:28 +01:00
Daniel Gultsch
ac687d6bbd
don't log start reason
2016-02-17 16:52:57 +01:00
Daniel Gultsch
59978e157c
only offer message correction for the very last message
2016-02-17 16:51:36 +01:00
Daniel Gultsch
3626e4b3a0
fixed regression that caused messages in muc not being send
2016-02-17 16:50:48 +01:00
Daniel Gultsch
c2fbdbde83
log reason why otr message won't be parsed
2016-02-16 14:22:47 +01:00
Daniel Gultsch
86b1865eec
fixed regression that caused ui to redraw a lot
2016-02-16 14:22:21 +01:00
Daniel Gultsch
349dd8291d
made clear that archiving preferences are server side
2016-02-16 12:52:31 +01:00
Daniel Gultsch
a9b957e8a2
added setting to opt-out of message correction. renamed preferences and options to settings
2016-02-16 09:57:59 +01:00
Daniel Gultsch
0ca4a33bfb
added some OTR logging
2016-02-16 09:15:41 +01:00
Daniel Gultsch
c0b3a3ff0c
basic support for XEP-0308: Last Message Correction. fixes #864
2016-02-15 23:15:04 +01:00
Daniel Gultsch
335058b78b
removed unnecessary conditions when sending read marker
2016-02-15 23:09:42 +01:00
Daniel Gultsch
c4b1df1bf3
add missing type='submit' attribute to enable push form
2016-02-15 22:12:39 +01:00
Daniel Gultsch
c3f0503a91
pulled translations from transifex
2016-02-15 12:35:35 +01:00
Daniel Gultsch
8ccb2005b3
only show load more messages button when mam is available
...
also update ui after that button has been pressed. fixes #1695
2016-02-14 23:53:17 +01:00
Daniel Gultsch
356199978e
fixed server info push not showing up when unavailable
2016-02-14 18:19:11 +01:00
Daniel Gultsch
251f2479c2
optional mode to close tcp connection when going into background
...
acts only when push is available. disable all non-push accounts to test properly
2016-02-14 13:20:23 +01:00
Daniel Gultsch
6f9f871928
send push enable to server. simplified logging
2016-02-13 14:20:07 +01:00
Daniel Gultsch
c7a14092a8
fixed compile bug in free version
2016-02-13 00:03:57 +01:00
Daniel Gultsch
c430848ade
push gcm token on bind instead of every connect
2016-02-12 23:37:42 +01:00
Daniel Gultsch
32da65f910
client side support for XEP-0357: Push Notifications
2016-02-12 11:39:27 +01:00
Daniel Gultsch
93dad9b737
pulled translations from transifex
2016-02-11 22:45:40 +01:00
Daniel Gultsch
f37098a54f
catch all axolotl parse exception at once. fixes #1692
2016-02-11 12:26:43 +01:00
Daniel Gultsch
1bb38e25f2
send muc messages after join
2016-02-10 09:53:48 +01:00
Daniel Gultsch
f16690ae1f
allow user to set MAM preferences
2016-02-09 13:01:17 +01:00
Daniel Gultsch
91ec4839ac
prepend instead off append mam messages to conversations when going in reverse
2016-02-04 16:40:18 +01:00
Daniel Gultsch
28733e052f
fixed performance regression in on scroll listener
2016-02-04 16:29:17 +01:00
Daniel Gultsch
4fdb0d92fe
prevent previoulsly cleared messages from reloading. fixes #1110
2016-02-04 14:39:16 +01:00
Daniel Gultsch
f88b8c703e
add more fault tolerant checks for messages left on server
2016-02-04 11:55:42 +01:00
Daniel Gultsch
17791a703e
removed unecessary logging when muc tiles update
2016-02-04 10:27:38 +01:00
Daniel Gultsch
7dd9545ea3
use TLSv1.2 as SSL context on supported plattforms
2016-02-03 18:17:16 +01:00
Daniel Gultsch
1d572c61d0
cache server caps
2016-02-03 17:19:05 +01:00
Daniel Gultsch
0911669b07
count all messages in a query
2016-02-03 16:04:21 +01:00
Daniel Gultsch
1274b0ef39
Revert "get rid of broken totalMessageCount for mam queries"
...
This reverts commit 58c6f9bfb2
.
2016-02-03 10:40:44 +01:00
Daniel Gultsch
f0798216d5
refactored disco cache. avoid making duplicate call. check hash
2016-02-03 10:40:02 +01:00
Daniel Gultsch
4a1a59f0c8
Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps
2016-02-02 18:19:26 +01:00
Daniel Gultsch
01bad12708
fixed 'unencrypted' not showing up for conferences when encryption is forced
2016-02-02 18:15:57 +01:00
Daniel Gultsch
58c6f9bfb2
get rid of broken totalMessageCount for mam queries
2016-02-02 15:39:46 +01:00
Daniel Gultsch
fab0a45955
re-read common name from certificates on startup
2016-02-02 13:43:20 +01:00
Daniel Gultsch
ba9ba8ffe2
avoid npe when accessing the pgp connection service
2016-02-02 11:21:29 +01:00
Daniel Gultsch
f30df7a535
catch a few NPE when parsing invalid pep nodes
2016-02-02 11:21:07 +01:00
Daniel Gultsch
3978c04782
respect autojoin setting on newly created bookmarks as well
2016-02-01 14:22:52 +01:00
Daniel Gultsch
1e7647e385
opt out handling of the autojoin flag. fixes #1666
2016-02-01 13:54:08 +01:00
Daniel Gultsch
336daea875
made create context menu call in StartConversationsActivity more failsafe
2016-02-01 12:31:46 +01:00
Daniel Gultsch
a3e11415ec
refactored user handling in conferences. show try again button when conference has errors
2016-02-01 12:11:40 +01:00
Daniel Gultsch
2eef37174e
fixed false set of subject in conference with empty body tag
2016-01-31 14:42:35 +01:00
Daniel Gultsch
82870b27ed
prefer dns servers from networsk with the default route
2016-01-29 12:12:23 +01:00
Daniel Gultsch
c416948f8b
be more careful with resetting the stream id
2016-01-29 12:09:55 +01:00
Daniel Gultsch
28ebf927fb
try to make in-valid-session detection work for pgp
2016-01-29 12:09:31 +01:00
Daniel Gultsch
d2c5a939ed
show values in formfieldwrappers and allow form to be set to read only
2016-01-26 17:23:24 +01:00
Daniel Gultsch
edc6ce4ff2
hide jid row in list item list when jid is null
2016-01-26 14:47:34 +01:00
Daniel Gultsch
7c0eae8059
expert setting to trigger extended connection options
2016-01-25 21:17:53 +01:00
Stephen Paul Weber
ae84ff2f0c
Do disco for caps hashes we have never seen
...
Then cache it
2016-01-24 17:46:08 -05:00
Stephen Paul Weber
000f59d614
Fetch cached caps result on new presence
2016-01-24 17:46:08 -05:00
Stephen Paul Weber
bf5b2f73f5
Use a Presence class for presence information
...
Only has status for now, but doing it so I can add disco to it
2016-01-24 17:46:08 -05:00
Daniel Gultsch
31fd425c9a
changed FileBackend API to allow files instead of messages to be copied and resized
2016-01-24 12:17:00 +01:00
Daniel Gultsch
8850a1fbe3
added FormWrapper and form field validation
2016-01-23 20:32:00 +01:00
Stephen Paul Weber
ad36a4ba89
Persisitence and loading for ServiceDiscoveryResult
2016-01-23 10:53:56 -05:00
Stephen Paul Weber
56f8fff935
Implement toJSON on ServiceDiscoveryResult
2016-01-23 10:52:45 -05:00
Stephen Paul Weber
1e335d527b
Generate capHash from any discovery result
2016-01-23 10:52:44 -05:00
Stephen Paul Weber
fccce229c6
Factor out a representation of XEP-0030 results
...
And the parser from Element to this representation.
2016-01-23 10:52:40 -05:00
Daniel Gultsch
0569a1e769
introduced boolean form field wrapper
2016-01-23 16:23:23 +01:00
Daniel Gultsch
39fdf4a333
added support for field types jid-single and text-private
2016-01-23 12:44:08 +01:00
Daniel Gultsch
6140861143
reset stanza queue when resetting xmppconnection
2016-01-23 11:40:32 +01:00
Daniel Gultsch
43521891f0
show fetch errors in trust keys activity
2016-01-23 11:39:02 +01:00
Daniel Gultsch
ba98fe4f86
use extract account from intent method and final EXTRA_ACCOUNT variable
2016-01-22 20:46:24 +01:00
Daniel Gultsch
a6c5430cdd
added UI wrapper for (some) form fields
2016-01-22 20:22:47 +01:00
Daniel Gultsch
a47430c2f7
added convenience method to extract account from intent
2016-01-22 20:21:45 +01:00
Daniel Gultsch
40005cec1b
added config variable to allow non-tls connections
2016-01-22 11:20:31 +01:00
Daniel Gultsch
77c0fb0b2a
changed spacing in create dialogs and notify user when no accounts are activated
2016-01-22 11:14:56 +01:00
Daniel Gultsch
3ff40a9733
increased padding in create contact/conference dialog
2016-01-21 18:10:19 +01:00
Daniel Gultsch
eacc7ed1e6
add convenience to get an account object from a spinner
2016-01-21 17:57:24 +01:00
Daniel Gultsch
20f6a4704c
pulled translations from transifex
2016-01-20 17:18:53 +01:00
Daniel Gultsch
e71acdef29
catch security exception when user prevents access to address book
2016-01-20 16:18:15 +01:00
Daniel Gultsch
0619685e55
add intent!=null check in onActivityResultin PublishProfilePicture
2016-01-20 16:11:17 +01:00
Daniel Gultsch
ba143a2730
Merge branch 'master' of github.com:siacs/Conversations
2016-01-16 22:48:27 +01:00
Daniel Gultsch
0b239243d9
Merge pull request #1655 from adithyaphilip/pgp-fix
...
Fixes having to choose PGP twice, upgrades openpgp-api to 10
2016-01-16 21:35:38 +01:00
Daniel Gultsch
3acaec7bcd
pulled translations from transifex
2016-01-16 21:21:14 +01:00
Daniel Gultsch
a83365ee95
make ConversationsActivity more resistent against being restarted
2016-01-16 21:18:59 +01:00
Daniel Gultsch
7b1efe15cd
reuse same xmppconnection for reconnects
2016-01-16 19:21:11 +01:00
Daniel Gultsch
41ae4af1b8
made constructor private in Account entity
2016-01-16 18:57:47 +01:00
Daniel Gultsch
ad5bcb7d43
removed some unused methods from db backend
2016-01-16 18:57:19 +01:00
Adithya Abraham Philip
a9a3ef0f67
fixed PGP having to be selected twice
2016-01-16 04:26:01 +05:30
Daniel Gultsch
494a04ffb1
hide prepare image toasts when attaching multiple images
2016-01-15 23:47:55 +01:00
Daniel Gultsch
d85854b686
show toast when image cropper get oom
2016-01-15 23:47:16 +01:00
Daniel Gultsch
943d0391d4
catch exception when reading message id from database
2016-01-15 23:46:52 +01:00
Daniel Gultsch
c5743067ad
nimbuzz.com: don't wait for disco replies to set account to online
2016-01-15 14:26:23 +01:00
Daniel Gultsch
635210d278
pulled translations for 1.9.0 release from transifex
2016-01-14 21:52:17 +01:00
Daniel Gultsch
aa6955a0d6
fixed typo when reading battery_op setting
2016-01-14 20:38:16 +01:00
Daniel Gultsch
12fd5c46ef
show /me messages in conference notifications without the name of the sender
2016-01-13 17:36:04 +01:00
Daniel Gultsch
14428da108
show key fetch error in activity when there are no keys to be used
2016-01-13 12:19:56 +01:00
Daniel Gultsch
571eb2f7f9
check for file storage permission before selecting avatar
2016-01-13 12:05:59 +01:00
Dheeraj CVR
ffb49c7217
use batch transactions when writing roster
...
Fixes https://github.com/siacs/Conversations/issues/1648
2016-01-13 11:56:35 +04:00
Daniel Gultsch
3e9fd0185a
throw security exception instead of going to next srv entry
2016-01-12 23:42:47 +01:00
Daniel Gultsch
da298cfe59
Merge branch 'master' of github.com:siacs/Conversations
2016-01-12 23:41:35 +01:00
Sam Whited
a6b729df43
s/TOR/Tor/g
2016-01-12 15:41:39 -06:00
Daniel Gultsch
d122d224bb
pulled translations from transifex
2016-01-12 16:43:38 +01:00
Daniel Gultsch
893751a1d2
move some ssl socket modifiers into a seperate helper class
2016-01-12 16:33:15 +01:00
Daniel Gultsch
5f1e30288a
Merge branch 'master' of https://github.com/moparisthebest/Conversations into moparisthebest-master
2016-01-12 15:35:50 +01:00
Daniel Gultsch
921d567dcb
use match_parent as height in conversations overview
2016-01-12 15:35:23 +01:00
Daniel Gultsch
da6076028f
Revert "Add additional warnings to OMEMO purge key function"
...
This reverts commit 3bea5b25cd
.
2016-01-12 09:48:49 +01:00
Andreas Straub
3bea5b25cd
Add additional warnings to OMEMO purge key function
...
People continue to press the "don't press this" button. Maybe adding
some warnings indicating that this button will not fix their problems
will help...
2016-01-12 09:33:54 +01:00
moparisthebest
217f6603c0
Implement XEP-0368: SRV records for XMPP over TLS
2016-01-11 17:25:16 -05:00
Daniel Gultsch
20ec9ff2c6
reworked that loop that iterates over various servers
2016-01-11 19:05:25 +01:00
Daniel Gultsch
a85bba0010
new art renders
2016-01-11 18:29:02 +01:00
Daniel Gultsch
7f1de73784
don't use the word phone in strings
2016-01-11 15:34:26 +01:00
Daniel Gultsch
4d38ba906f
pulled translations from transifex
2016-01-11 11:19:41 +01:00
Daniel Gultsch
c296d6f446
ask to be excluded from battery optimization
2016-01-11 11:17:45 +01:00
Daniel Gultsch
4ab8fe13de
let the user decide on whether or not to compress pictures
2016-01-09 16:17:39 +01:00
Daniel Gultsch
708d7c5b98
automatically adjust image compression to keep files under 512MiB
2016-01-09 16:16:18 +01:00
Daniel Gultsch
6acb80a83a
added Config.java variable to change the default notification behaviour to always
2016-01-08 22:07:23 +01:00
Daniel Gultsch
9dce42ac7f
don't show snackbar when notifications are disabled or paused
2016-01-08 21:35:20 +01:00
Daniel Gultsch
a3e136b550
show per conference notification settings in details activity
2016-01-08 21:30:46 +01:00
Daniel Gultsch
0bb3ae37f0
show icon in conversations overview when notifications are disabled
2016-01-08 14:41:55 +01:00
Daniel Gultsch
5dd5685885
Merge pull request #1641 from fiaxh/uuid-fix
...
Correct uuid check according to RFC 4122
2016-01-08 00:17:21 +01:00
Daniel Gultsch
c59eb75a59
avoid duplicate messages when sending files to mucs. fixes #1635
2016-01-06 12:59:13 +01:00
fiaxh
62d0eebe5c
Correct uuid check according to RFC 4122
2016-01-05 20:07:29 +01:00
Daniel Gultsch
c3e2d2cfba
added missing synchronize when pushing messages from mam backlog
2016-01-04 20:14:29 +01:00
Daniel Gultsch
fb97f9d18f
null check in getOriginalPath
2016-01-04 20:14:08 +01:00
Daniel Gultsch
501034fe0e
Allow entering a JID from 'choose contact'. thanks @singpolyma
...
fixes #1611
fixes #1602
2016-01-04 17:27:54 +01:00
Daniel Gultsch
fdb6b0e30d
only report error after third unsuccesful attempt to connect
2016-01-04 15:33:11 +01:00
Daniel Gultsch
f815a7cd26
properly rotate avatars
2016-01-04 15:17:02 +01:00
Daniel Gultsch
95bf0630f0
show trust keys activties if own keys are undecided
2016-01-04 12:11:58 +01:00
Daniel Gultsch
c116f735dc
add obb url to unencrypted messages
2016-01-03 19:39:06 +01:00
Daniel Gultsch
a319446d41
edit account activity was still showing the omemo key with leading 0x05. fixes #1631
2016-01-03 19:38:48 +01:00
Daniel Gultsch
d875061407
removed xhtml body. fixes #1594
2016-01-01 16:52:32 +01:00
Daniel Gultsch
73e2389eee
use actual message timestamp instead of delay when updating last seen. fixes #1618
2015-12-31 18:06:11 +01:00
Andreas Straub
58d213f291
Fix OMEMO session creating loggin
...
Now prints the correct JID to the log when finding devices without
sessions.
2015-12-31 15:48:43 +01:00
Daniel Gultsch
cfccf5e90d
handle null names in getColorForName
2015-12-29 10:32:54 +01:00
Daniel Gultsch
7bb67ee660
strip leading 0x05 off omemo fingerprints
2015-12-27 18:37:31 +01:00
Daniel Gultsch
703d95fcf8
lower case all fingerprints. fixes #1521
2015-12-27 18:37:12 +01:00
Daniel Gultsch
c3bdec1ce9
dedublicate bookmarks
2015-12-27 17:29:32 +01:00
Daniel Gultsch
bcf99db3df
fixed stuck at omemo encryption when x509 verification is being used
2015-12-27 17:29:19 +01:00
Daniel Gultsch
f49158a44b
register context menu long click listener on message text. fixes #1614
2015-12-27 17:28:42 +01:00
Daniel Gultsch
be91c0741f
made text selectable again unless text contains more than 1 link
...
fixes #1615
2015-12-26 19:18:37 +01:00
Daniel Gultsch
c40372fc0d
code cleanup
2015-12-23 22:30:14 +01:00
Daniel Gultsch
f46cbb38a9
show certificate information
2015-12-23 19:18:53 +01:00
Daniel Gultsch
d0bad09f13
save certificate when verifying with x509
2015-12-23 17:41:26 +01:00
Daniel Gultsch
ae491764f2
pulled translations from transifex
2015-12-20 19:37:27 +01:00
Daniel Gultsch
534013fd0c
store identity key in XmppAxolotlSession instead of the fingerprint
2015-12-19 15:44:11 +01:00
Daniel Gultsch
ade89beb96
use presence name not server name when verification is being used
2015-12-19 13:07:38 +01:00
Daniel Gultsch
15c8cb8ac6
add more debugging to certificate checks after new omemo session was established
2015-12-19 12:44:55 +01:00
Daniel Gultsch
e8bf5cada4
only offer plain and omemo encryption when x509 verification is enabled
2015-12-19 12:44:12 +01:00
Daniel Gultsch
f05f97251c
prefer server name over address book name when x509 verification is being used
2015-12-19 12:43:09 +01:00
Daniel Gultsch
20b4e756fe
add 'store' message hint to displayed chat markers
2015-12-17 15:32:03 +01:00
Daniel Gultsch
f510b2ba2d
pulled translations from transifex
2015-12-17 15:20:28 +01:00
Daniel Gultsch
0f9058ffef
throw exception at the end of the stream
2015-12-17 15:20:06 +01:00
Daniel Gultsch
e10a0b0c4c
let message parser not artifically fail on messages with no to attribute
2015-12-17 14:30:00 +01:00
Daniel Gultsch
43dd681239
timeout service discovery after 20s
2015-12-15 19:24:05 +01:00
Daniel Gultsch
85f36e9dbc
default force encryption to false
2015-12-14 10:58:55 +01:00
Daniel Gultsch
f6b22dad20
splite PARANOIA_MODE into three different options
2015-12-14 10:54:55 +01:00
Daniel Gultsch
042939e44d
make message text non-selectable. fixes #1606
2015-12-14 10:44:43 +01:00
Daniel Gultsch
aa472a0098
pulled translations from transifex
2015-12-13 11:09:42 +01:00
Daniel Gultsch
50817956c2
changed order of send presence and execute mam queries
2015-12-12 16:01:33 +01:00
Daniel Gultsch
88523bbb50
more detailed logging
2015-12-12 15:58:22 +01:00
Daniel Gultsch
5e4b55a0ff
notfiy after mam catchup only if message count > 0
2015-12-11 20:43:50 +01:00
Daniel Gultsch
a1ac4fd665
fix cancelation of http downloads and enable resume
2015-12-11 20:33:41 +01:00
Daniel Gultsch
b2c278c91b
set bookmark name to room subject if no subject has been set before
2015-12-11 19:28:44 +01:00
Daniel Gultsch
293e820a58
get rid of lastMessageTransmitted in favor of db query
2015-12-11 13:52:04 +01:00
Daniel Gultsch
61b0681109
pulled translations from transifex
2015-12-11 13:27:33 +01:00
Daniel Gultsch
5ffb87059c
renamed pretty-please-store message hint to store
2015-12-10 23:37:38 +01:00
Daniel Gultsch
15f220747f
some more NPE checks
2015-12-10 23:16:39 +01:00
Daniel Gultsch
55c1129a65
notify on mam catchup messages
2015-12-10 23:05:11 +01:00
Daniel Gultsch
2262921ff4
properly clean up timed out mam queries
2015-12-10 18:28:47 +01:00
Daniel Gultsch
ede92235d7
disable sm logging
2015-12-10 18:26:31 +01:00
Daniel Gultsch
5bd70cfee8
always show conversations with pending subscription requests
2015-12-09 12:18:06 +01:00
Daniel Gultsch
5e151c7311
wait with status change to online after all disco queries have been made
2015-12-09 11:16:03 +01:00
Daniel Gultsch
11e58607c9
when no avatar found show avatar of contact and not the muc user in conferences
2015-12-09 10:30:26 +01:00
Daniel Gultsch
aea664a0ec
show sender name for notications in conferences. fixes #1581
2015-12-09 10:26:30 +01:00
Daniel Gultsch
1de74c2337
also verify sessions in CBE mode that got created by key transport messages
2015-12-08 17:15:08 +01:00
Daniel Gultsch
b9fc7ebe24
pulled translations from transifex
2015-12-07 13:54:59 +01:00
Daniel Gultsch
ac06cb2e4f
modified contact permission dialog
2015-12-07 13:24:41 +01:00
Daniel Gultsch
739648e909
ask for contact permissions when first opening StartConversationActivity
2015-12-07 13:24:41 +01:00
Daniel Gultsch
c3e8fb3446
request storage permission when needed on Android 6.0
2015-12-07 13:24:41 +01:00
Daniel Gultsch
739a2d609d
implement direct sharing in android 6.0. fixes #1321
2015-12-07 13:24:41 +01:00
Daniel Gultsch
904edf5d59
hide prepare file toast after preparing the file
2015-12-06 11:57:11 +01:00
Daniel Gultsch
bd765c59ce
check availabiltiy of pgp before sharing files
2015-12-05 19:03:17 +01:00
Daniel Gultsch
b7f326372d
be more carefull with pending uris
2015-12-05 19:02:57 +01:00
Daniel Gultsch
6358f641e7
check for query object as condition to trigger deduplication instead of serverId
2015-12-05 18:41:38 +01:00
Daniel Gultsch
41dcd8005b
parse stanza-id from messages
2015-12-04 22:03:46 +01:00
Daniel Gultsch
cd9a29718b
properly clear muc user avatar caches
2015-12-04 21:36:48 +01:00
Daniel Gultsch
9d1e8a34b2
fixed showing avatars for contacts in muc
2015-12-04 18:39:09 +01:00
Daniel Gultsch
196c8e593f
Merge pull request #1595 from fiaxh/pgp_database_signature
...
Regenerate PGP signatures once
2015-12-04 15:35:51 +01:00
Daniel Gultsch
0664d6ac7b
avoid some NPEs
2015-12-04 15:35:22 +01:00
Daniel Gultsch
3e3cb047be
rely on message id if message id is uuid and pgp encryption was used to deduplicate messages. fixes #1357
2015-12-04 15:34:45 +01:00
Daniel Gultsch
242887447c
use proposed nick as default nick in mucoptions
2015-12-04 14:07:16 +01:00
Daniel Gultsch
6b592435cd
parse vcard avatars from muc presences
2015-12-03 18:18:34 +01:00
Daniel Gultsch
f1c0b7372f
enabled previously disabled http upload
2015-12-03 12:45:12 +01:00
fiaxh
e5f154316c
Unset all PGP signatures once
...
... so they will be redone to match the changed status.
2015-12-02 18:06:48 +00:00
Daniel Gultsch
b60c902810
pulled new translations from transifex
2015-12-02 17:27:56 +01:00
Daniel Gultsch
3553b15c9f
renamed x509 verified omemo to v\OMEMO
2015-12-02 17:24:56 +01:00
Daniel Gultsch
aa21797f43
Merge branch 'master' of github.com:siacs/Conversations
2015-12-02 16:38:33 +01:00