Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pulled translations from transifex | Daniel Gultsch | 2015-04-26 | 9 | -3/+205 |
| | |||||
* | Merge pull request #1135 from BrianBlade/manage_certificates | Daniel Gultsch | 2015-04-25 | 3 | -5/+33 |
|\ | | | | | Add option to remove manually approved certificates | ||||
| * | Add option to remove manually approved certificates | BrianBlade | 2015-04-19 | 3 | -5/+33 |
| | | | | | | | | | | | | | | - "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" | ||||
* | | added missing translations from transifex | Daniel Gultsch | 2015-04-21 | 11 | -8/+24 |
| | | |||||
* | | pulled latest translations from transifex | Daniel Gultsch | 2015-04-20 | 6 | -3/+727 |
|/ | |||||
* | maintain state when rotating settings activity | iNPUTmice | 2015-04-14 | 1 | -4/+10 |
| | |||||
* | Merge branch 'dont_trust_cas_preference' of ↵ | iNPUTmice | 2015-04-14 | 3 | -1/+10 |
|\ | | | | | | | | | | | | | | | 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 | ||||
| * | Add option to use MTM without default TrustManager | BrianBlade | 2015-04-11 | 3 | -0/+9 |
| | | | | | | | | | | | | 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. | ||||
* | | fixed regression where the selected conversation wasn't highlighted anymore ↵ | iNPUTmice | 2015-04-13 | 1 | -1/+1 |
| | | | | | | | | on tabled layout | ||||
* | | Enable end-conversation by swipe gesture | BrianBlade | 2015-04-08 | 6 | -62/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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() | ||||
* | | do not overlap account title and switch | iNPUTmice | 2015-04-01 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'account_state_switch' of ↵ | iNPUTmice | 2015-04-01 | 1 | -0/+8 |
|\ \ | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-account_state_switch | ||||
| * | | Add toggle account-state switch | BrianBlade | 2015-04-01 | 1 | -0/+8 |
| |/ | | | | | | | | | Add a switch to AccountAdapter that allows self-contained enabling/disabling of accounts without the need to bring up the context-menu | ||||
* | | Merge pull request #1076 from rk4an/patch-1 | Daniel Gultsch | 2015-04-01 | 1 | -0/+4 |
|\ \ | | | | | | | Update french translation | ||||
| * | | Update french translation | Erkan | 2015-03-22 | 1 | -0/+4 |
| |/ | |||||
* / | pulled translations from transifex | iNPUTmice | 2015-04-01 | 7 | -15/+466 |
|/ | |||||
* | pulled translations | iNPUTmice | 2015-03-22 | 5 | -0/+21 |
| | |||||
* | pulled more translations | iNPUTmice | 2015-03-19 | 1 | -0/+5 |
| | |||||
* | Added multiple select to Choose Contact Activity | Andreas Straub | 2015-03-18 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | 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 | ||||
* | pulled new translations from transifex | iNPUTmice | 2015-03-16 | 10 | -11/+348 |
| | |||||
* | open location directly from notification | iNPUTmice | 2015-03-10 | 5 | -0/+0 |
| | |||||
* | show geo uris as 'location' in overview | iNPUTmice | 2015-03-10 | 1 | -0/+2 |
| | |||||
* | display geo uris as location. show 'send loction' in share menu if request ↵ | iNPUTmice | 2015-03-07 | 2 | -5/+15 |
| | | | | location intent can be resolved | ||||
* | pulled new translations from transifex | iNPUTmice | 2015-02-27 | 5 | -23/+191 |
| | |||||
* | pulled new translations from transifex | iNPUTmice | 2015-02-23 | 6 | -35/+84 |
| | |||||
* | added typing notifications through XEP-0085. fixed #210 | iNPUTmice | 2015-02-21 | 2 | -0/+11 |
| | |||||
* | pulled translations from transifex | iNPUTmice | 2015-02-16 | 10 | -28/+647 |
| | |||||
* | added actions to error notification | iNPUTmice | 2015-02-10 | 11 | -0/+1 |
| | |||||
* | Remove another unused resource | Sam Whited | 2015-02-01 | 5 | -0/+0 |
| | |||||
* | Merge pull request #955 from SamWhited/unused_resources | Daniel Gultsch | 2015-02-01 | 24 | -0/+0 |
|\ | | | | | Remove unused resources | ||||
| * | Remove unused resources | Sam Whited | 2015-02-01 | 24 | -0/+0 |
| | | |||||
* | | pulled spanish translations again | iNPUTmice | 2015-02-01 | 1 | -2/+2 |
|/ | |||||
* | pulled translations from transifex | iNPUTmice | 2015-02-01 | 16 | -0/+1513 |
| | |||||
* | Removes some unused strings (the legacy SSL stuff) | Sam Whited | 2015-02-01 | 4 | -7/+0 |
| | |||||
* | Remove title_activity_conversations and use app_name instead | kruks23 | 2015-01-30 | 13 | -13/+0 |
| | |||||
* | Use Material Design Icons on API 21+ | Sam Whited | 2015-01-29 | 142 | -17/+80 |
| | |||||
* | updated translations | iNPUTmice | 2015-01-25 | 4 | -432/+476 |
| | |||||
* | Czech translation | Jaroslav Lichtblau | 2015-01-25 | 1 | -0/+1 |
| | | | | for "hide offline" added | ||||
* | show checkbox to hide offline contacts | iNPUTmice | 2015-01-21 | 2 | -0/+9 |
| | |||||
* | always allow access to contact details. provide add button in contact details | iNPUTmice | 2015-01-21 | 2 | -12/+7 |
| | |||||
* | Add block/unblock to contact details menu | Sam Whited | 2015-01-21 | 1 | -0/+13 |
| | | | | See #889 | ||||
* | Fixed action bar search for Android 5.0 | iNPUTmice | 2015-01-20 | 1 | -4/+4 |
| | |||||
* | Czech translation updated | Jaroslav Lichtblau | 2015-01-19 | 1 | -406/+420 |
| | | | | for Conversations | ||||
* | Remove legacy SSL support | Sam Whited | 2015-01-19 | 10 | -15/+0 |
| | |||||
* | fetched translations from transifex | iNPUTmice | 2015-01-19 | 14 | -4159/+4412 |
| | |||||
* | proper desc for offering and sending images in conversations overview | iNPUTmice | 2015-01-18 | 1 | -0/+2 |
| | |||||
* | explain read marker | iNPUTmice | 2015-01-18 | 1 | -0/+13 |
| | |||||
* | use same helper methods for images and files | iNPUTmice | 2015-01-18 | 1 | -7/+3 |
| | |||||
* | Merge pull request #901 from kriztan/patch-2 | Daniel Gultsch | 2015-01-18 | 1 | -0/+2 |
|\ | | | | | Added new file type names for file transfers | ||||
| * | Added new file type names for file transfers | Christian S | 2015-01-18 | 1 | -0/+2 |
| | | | | | | | | | | - apk - vcard |