77caf73103
Merge pull request #1146 from BrianBlade/minor_otr_tweaks
...
OTR: Fix onContactStatusChanged & dont archive OTR
2015-04-25 14:09:38 +02:00
d07baccf97
cleaned up file handling
2015-04-25 14:08:24 +02:00
5e1492fbff
send invite to other instanzes after creating ad hoc conference. fixes #1136
2015-04-23 17:37:47 +02:00
d6443d9b2f
OTR: Fix onContactStatusChanged & dont archive OTR
...
- Fix session handling on contact status change: Do not reset
potentially active sessions; check peer's OTR-resource on disconnect
- use no-permanent-store hint instead of no-store to ensure
finished messages are delivered to offline/disconnected clients
- add no-permanent-store to ask compliant servers not to archive
OTR messages
2015-04-21 22:35:35 +02:00
3a627f72fb
fixed direct invites
2015-04-21 18:36:11 +02:00
e9783b80d1
added missing translations from transifex
2015-04-21 10:13:28 +02:00
cfc4fbaa10
Merge branch 'development' of github.com:siacs/Conversations into development
2015-04-20 20:33:04 +02:00
e7972d3d11
pulled latest translations from transifex
2015-04-20 20:32:50 +02:00
69b4355652
added reference to the location plugin to README
2015-04-20 16:41:24 +02:00
895a28ab9d
added amazon app store link (us store)
2015-04-20 16:13:43 +02:00
5d7e1159f5
always hide pgp snackbar after decrypting a message. fixes #1075
2015-04-20 12:13:47 +02:00
127b7866f0
removed some dead code
2015-04-20 11:49:44 +02:00
d2c9bf31cd
fixed weird touch on snackbar switched conversation bug
...
when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons.
2015-04-20 11:39:38 +02:00
9e20a4936e
some code clean up to fix some rare NPE’s
2015-04-19 19:11:32 +02:00
da367dd752
Add option to remove manually approved certificates
...
- "Remove certificates" option brings up a dialog that allows
to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options"
2015-04-19 18:08:13 +02:00
570a22206d
increased undo delay
2015-04-17 20:01:09 +02:00
dbe170bd35
fixed a bug in DNS helper code. fixes #1130
2015-04-16 22:06:41 +02:00
c4daa08170
fixed a bug in DNS helper code. fixes #1130
2015-04-16 21:56:03 +02:00
584ffbd000
bumped version to 1.3.0-alpha
2015-04-15 16:28:44 +02:00
65e760aefd
some bug fixes concerning 0byte files. fixes #1126
2015-04-15 15:36:16 +02:00
f99e234b88
maintain state when rotating settings activity
2015-04-14 15:53:50 +02:00
b6cc8c90a0
Merge branch 'BrianBlade-dont_trust_cas_preference' into development
2015-04-14 15:17:26 +02:00
defb127d6e
Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference
...
Conflicts:
src/main/res/values-de/strings.xml
src/main/res/values/strings.xml
2015-04-14 15:17:06 +02:00
261b505f06
always show save button when account info was modified. fixes #918
2015-04-14 15:00:49 +02:00
2f24b09309
fixed disable account when sliding and not clicking the toggle
2015-04-13 18:19:40 +02:00
62faa163f0
fixed typos
2015-04-13 18:18:25 +02:00
8486f47dd9
Merge pull request #1123 from lookshe/development
...
Bugfix for issue #1121
2015-04-13 17:57:33 +02:00
4bf09bc10b
shut up linter
2015-04-13 17:35:20 +02:00
6da77bdf3b
Bugfix for issue #1121
...
check with lowercase to also match JPEG, JPeg ...
changed image url in comment
2015-04-13 16:21:00 +02:00
85cb1e4a37
Maintain private chat on MUC. fixes #1097
2015-04-13 16:00:04 +02:00
845b39cdcc
fixed regression where the selected conversation wasn't highlighted anymore on tabled layout
2015-04-13 15:59:18 +02:00
878066ca99
Add option to use MTM without default TrustManager
...
Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked.
2015-04-11 15:13:42 +02:00
37d08276a8
allow sharing multiple images at once. fixes #1090
2015-04-11 14:53:10 +02:00
332fe0fd19
don't resume old session when changing resource
2015-04-09 12:46:54 +02:00
f880473435
Merge pull request #1104 from BrianBlade/feature/swipe_out_conversation
...
Enable end-conversation by swipe gesture
2015-04-09 10:46:26 +02:00
dace8ba3d3
Enable end-conversation by swipe gesture
...
Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews
Re-enable selectableItemBackground
Dont end selectedConversation on swipe
Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.
Add blacklistedConversation for undo swipe
Update title_undo_swipe_* strings
Fix undo(), rename blacklistedConversation
Fix discardUndo(); re-init selectedConversation
maintain scroll position after undo
clear notification when dismissing a conversation
modified / simplified maintain scroll position code
simplify handling of selectedConversation
change undo_muc string, remove notifyDataSetChanged()
2015-04-08 23:29:52 +02:00
59ea143147
Merge pull request #1099 from BrianBlade/fix_otr_error_msgs
...
Fix OTR-Error messages (#1021 )
2015-04-02 11:11:22 +02:00
ef68084098
Merge branch 'BrianBlade-account_state_switch' into development
2015-04-01 23:46:54 +02:00
b7b87e1a8d
do not overlap account title and switch
2015-04-01 23:45:46 +02:00
cb29c5bb15
Merge branch 'account_state_switch' of https://github.com/BrianBlade/Conversations into BrianBlade-account_state_switch
2015-04-01 23:24:35 +02:00
1a376cacac
Merge pull request #1076 from rk4an/patch-1
...
Update french translation
2015-04-01 20:30:00 +02:00
64d6a2970e
pulled translations from transifex
2015-04-01 20:26:28 +02:00
db74cb52c4
Fix OTR-Error messages
...
Send out OTR-Errors on unreadableMessageReceived() as well, not only on
messageFromAnotherInstanceReceived
2015-04-01 20:03:09 +02:00
e64049c4fc
Add toggle account-state switch
...
Add a switch to AccountAdapter that allows self-contained enabling/disabling of
accounts without the need to bring up the context-menu
2015-04-01 12:47:59 +02:00
2a73173176
Update french translation
2015-03-22 20:09:53 +01:00
7eabdfd80f
bump version code
2015-03-22 19:42:40 +01:00
ad8f1902d1
pulled translations
2015-03-22 18:56:28 +01:00
c47d1e83c1
properly set chat states when receiving otr status messages
2015-03-21 16:43:03 +01:00
99b2ef7e9d
respond to unreadable OTR messages with error message. fixed #1021
2015-03-21 16:07:17 +01:00
825278971e
Merge branch 'development' of github.com:siacs/Conversations into development
2015-03-20 22:40:06 +01:00
Daniel Gultsch