Commit Graph

219 Commits

Author SHA1 Message Date
Daniel Gultsch
a4ff8e3633 increased padding around switches in manage accounts 2015-04-27 12:19:05 +02:00
Daniel Gultsch
7f2a83a684 pulled translations from transifex 2015-04-26 10:48:36 +02:00
Daniel Gultsch
0fda254d48 Merge pull request #1135 from BrianBlade/manage_certificates
Add option to remove manually approved certificates
2015-04-25 19:09:50 +02:00
Daniel Gultsch
e9783b80d1 added missing translations from transifex 2015-04-21 10:13:28 +02:00
Daniel Gultsch
e7972d3d11 pulled latest translations from transifex 2015-04-20 20:32:50 +02:00
BrianBlade
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
iNPUTmice
f99e234b88 maintain state when rotating settings activity 2015-04-14 15:53:50 +02:00
iNPUTmice
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
iNPUTmice
845b39cdcc fixed regression where the selected conversation wasn't highlighted anymore on tabled layout 2015-04-13 15:59:18 +02:00
BrianBlade
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
BrianBlade
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
iNPUTmice
b7b87e1a8d do not overlap account title and switch 2015-04-01 23:45:46 +02:00
iNPUTmice
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
Daniel Gultsch
1a376cacac Merge pull request #1076 from rk4an/patch-1
Update french translation
2015-04-01 20:30:00 +02:00
iNPUTmice
64d6a2970e pulled translations from transifex 2015-04-01 20:26:28 +02:00
BrianBlade
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
Erkan
2a73173176 Update french translation 2015-03-22 20:09:53 +01:00
iNPUTmice
ad8f1902d1 pulled translations 2015-03-22 18:56:28 +01:00
iNPUTmice
0d6475d0d9 pulled more translations 2015-03-19 19:32:24 +01:00
Andreas Straub
f76baa5658 Added multiple select to Choose Contact Activity
When passing the Choose Contact Activity a boolean called "multiple"
set to true, it now allows the user to select multiple contacts. Long
pressing a contact enters multiple selection mode and the selection is
confirmed using a button in the CAB. The Activity returns whether or not
multiple contacts were selected using the same boolean. If multiple
contacts were selected, an array of JID strings called "contacts" is
returned. The Choose Contact Activity now also honors "filter_contacts",
an array of strings containing JIDs that should not be displayed in
the picker.

The invite to conference dialog now uses this feature to enable inviting
multiple contacts at once. Additionally, Invite Contact uses
"filter_contacts" to only display contacts that are not yet
participating in the conversation
2015-03-18 17:11:50 +01:00
iNPUTmice
4aab45533a pulled new translations from transifex 2015-03-16 11:52:42 +01:00
iNPUTmice
db6a63bcf6 open location directly from notification 2015-03-10 21:46:13 +01:00
iNPUTmice
5132cd7234 show geo uris as 'location' in overview 2015-03-10 17:20:50 +01:00
iNPUTmice
87a048fe6f display geo uris as location. show 'send loction' in share menu if request location intent can be resolved 2015-03-07 14:15:38 +01:00
iNPUTmice
0d6907f1e0 pulled new translations from transifex 2015-02-27 17:20:41 +01:00
iNPUTmice
3e8314459c pulled new translations from transifex 2015-02-23 21:56:06 +01:00
iNPUTmice
7ee5e95959 added typing notifications through XEP-0085. fixed #210 2015-02-21 11:06:52 +01:00
iNPUTmice
a6e6959614 pulled translations from transifex 2015-02-16 16:56:40 +01:00
iNPUTmice
44ee746681 added actions to error notification 2015-02-10 17:13:34 +01:00
Sam Whited
1650565bb0 Remove another unused resource 2015-02-01 16:02:59 -05:00
Daniel Gultsch
a4f4fe95ac Merge pull request #955 from SamWhited/unused_resources
Remove unused resources
2015-02-01 17:41:42 +01:00
iNPUTmice
e0af29f0a3 pulled spanish translations again 2015-02-01 17:33:36 +01:00
Sam Whited
735fc655e9 Remove unused resources 2015-02-01 11:32:11 -05:00
iNPUTmice
33530a9e30 pulled translations from transifex 2015-02-01 17:04:29 +01:00
Sam Whited
ce5c6c6257 Removes some unused strings (the legacy SSL stuff) 2015-02-01 08:58:35 -05:00
kruks23
e76a9c06c3 Remove title_activity_conversations and use app_name instead 2015-01-30 17:02:53 +01:00
Sam Whited
48604a6620 Use Material Design Icons on API 21+ 2015-01-29 15:28:26 -05:00
iNPUTmice
14fc520ec0 updated translations 2015-01-25 16:36:57 +01:00
Jaroslav Lichtblau
0f3fb3ab43 Czech translation
for "hide offline" added
2015-01-25 16:18:09 +01:00
iNPUTmice
4e50098e31 show checkbox to hide offline contacts 2015-01-21 17:24:02 +01:00
iNPUTmice
be9af442ef always allow access to contact details. provide add button in contact details 2015-01-21 15:31:40 +01:00
Sam Whited
764ef3c8cd Add block/unblock to contact details menu
See #889
2015-01-21 13:07:36 +01:00
iNPUTmice
32a16137df Fixed action bar search for Android 5.0 2015-01-20 14:53:47 +01:00
Jaroslav Lichtblau
7e4053abff Czech translation updated
for Conversations
2015-01-19 19:07:43 +01:00
Sam Whited
503237087f Remove legacy SSL support 2015-01-19 11:02:13 -05:00
iNPUTmice
c5d087ad55 fetched translations from transifex 2015-01-19 12:14:55 +01:00
iNPUTmice
149a6716b8 proper desc for offering and sending images in conversations overview 2015-01-18 20:26:22 +01:00
iNPUTmice
6756386eee explain read marker 2015-01-18 13:44:18 +01:00
iNPUTmice
d58fadd05f use same helper methods for images and files 2015-01-18 13:00:57 +01:00
Daniel Gultsch
78ac43cfa2 Merge pull request #901 from kriztan/patch-2
Added new file type names for file transfers
2015-01-18 11:57:34 +01:00