Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | added amazon app store link (us store) | Daniel Gultsch | 2015-04-20 | 1 | -1/+1 | |
| | | | ||||||
* | | | pulled latest translations from transifex | Daniel Gultsch | 2015-04-20 | 6 | -3/+727 | |
|/ / | ||||||
* | | always hide pgp snackbar after decrypting a message. fixes #1075 | Daniel Gultsch | 2015-04-20 | 1 | -0/+1 | |
| | | ||||||
* | | removed some dead code | Daniel Gultsch | 2015-04-20 | 1 | -19/+0 | |
| | | ||||||
* | | fixed weird touch on snackbar switched conversation bug | Daniel Gultsch | 2015-04-20 | 1 | -3/+2 | |
| | | | | | | | | 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. | |||||
* | | some code clean up to fix some rare NPE’s | Daniel Gultsch | 2015-04-19 | 2 | -4/+7 | |
|/ | ||||||
* | increased undo delay | iNPUTmice | 2015-04-17 | 1 | -1/+1 | |
| | ||||||
* | fixed a bug in DNS helper code. fixes #1130 | iNPUTmice | 2015-04-16 | 2 | -2/+2 | |
| | ||||||
* | bumped version to 1.3.0-alpha | iNPUTmice | 2015-04-15 | 1 | -2/+2 | |
| | ||||||
* | some bug fixes concerning 0byte files. fixes #1126 | iNPUTmice | 2015-04-15 | 2 | -1/+2 | |
| | ||||||
* | maintain state when rotating settings activity | iNPUTmice | 2015-04-14 | 2 | -18/+26 | |
| | ||||||
* | Merge branch 'BrianBlade-dont_trust_cas_preference' into development | iNPUTmice | 2015-04-14 | 5 | -5/+28 | |
|\ | ||||||
| * | Merge branch 'dont_trust_cas_preference' of ↵ | iNPUTmice | 2015-04-14 | 5 | -5/+28 | |
|/| | | | | | | | | | | | | | | | 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 | 5 | -4/+27 | |
| | | | | | | | | | | | | 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. | |||||
* | | always show save button when account info was modified. fixes #918 | iNPUTmice | 2015-04-14 | 1 | -5/+9 | |
| | | ||||||
* | | fixed disable account when sliding and not clicking the toggle | iNPUTmice | 2015-04-13 | 2 | -8/+9 | |
| | | ||||||
* | | fixed typos | iNPUTmice | 2015-04-13 | 2 | -2/+2 | |
| | | ||||||
* | | Merge pull request #1123 from lookshe/development | Daniel Gultsch | 2015-04-13 | 1 | -10/+18 | |
|\ \ | | | | | | | Bugfix for issue #1121 | |||||
| * | | Bugfix for issue #1121 | lookshe | 2015-04-13 | 1 | -10/+18 | |
| | | | | | | | | | | | | | | | | | | check with lowercase to also match JPEG, JPeg ... changed image url in comment | |||||
* | | | shut up linter | iNPUTmice | 2015-04-13 | 1 | -0/+1 | |
| | | | ||||||
* | | | Maintain private chat on MUC. fixes #1097 | iNPUTmice | 2015-04-13 | 1 | -1/+0 | |
| | | | ||||||
* | | | fixed regression where the selected conversation wasn't highlighted anymore ↵ | iNPUTmice | 2015-04-13 | 3 | -13/+12 | |
|/ / | | | | | | | on tabled layout | |||||
* | | allow sharing multiple images at once. fixes #1090 | iNPUTmice | 2015-04-11 | 3 | -59/+111 | |
| | | ||||||
* | | don't resume old session when changing resource | iNPUTmice | 2015-04-09 | 5 | -7/+35 | |
| | | ||||||
* | | Merge pull request #1104 from BrianBlade/feature/swipe_out_conversation | Daniel Gultsch | 2015-04-09 | 9 | -71/+185 | |
|\ \ | | | | | | | Enable end-conversation by swipe gesture | |||||
| * | | Enable end-conversation by swipe gesture | BrianBlade | 2015-04-08 | 9 | -71/+185 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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() | |||||
* | | Merge pull request #1099 from BrianBlade/fix_otr_error_msgs | Daniel Gultsch | 2015-04-02 | 2 | -18/+24 | |
|\ \ | | | | | | | Fix OTR-Error messages (#1021) | |||||
| * | | Fix OTR-Error messages | BrianBlade | 2015-04-01 | 2 | -18/+24 | |
| |/ | | | | | | | | | Send out OTR-Errors on unreadableMessageReceived() as well, not only on messageFromAnotherInstanceReceived | |||||
* | | Merge branch 'BrianBlade-account_state_switch' into development | iNPUTmice | 2015-04-01 | 3 | -17/+49 | |
|\ \ | ||||||
| * | | do not overlap account title and switch | iNPUTmice | 2015-04-01 | 1 | -1/+4 | |
| | | | ||||||
| * | | Merge branch 'account_state_switch' of ↵ | iNPUTmice | 2015-04-01 | 3 | -16/+45 | |
|/| | | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-account_state_switch | |||||
| * | | Add toggle account-state switch | BrianBlade | 2015-04-01 | 3 | -16/+45 | |
| |/ | | | | | | | | | 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 | |
|/ | ||||||
* | bump version code | iNPUTmice | 2015-03-22 | 1 | -2/+2 | |
| | ||||||
* | pulled translations | iNPUTmice | 2015-03-22 | 5 | -0/+21 | |
| | ||||||
* | properly set chat states when receiving otr status messages | iNPUTmice | 2015-03-21 | 1 | -1/+1 | |
| | ||||||
* | respond to unreadable OTR messages with error message. fixed #1021 | iNPUTmice | 2015-03-21 | 5 | -3/+42 | |
| | ||||||
* | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2015-03-20 | 1 | -1/+1 | |
|\ | ||||||
| * | Update CHANGELOG.md | Daniel Gultsch | 2015-03-19 | 1 | -1/+1 | |
| | | | | | | fixed plugin link | |||||
* | | wait for session iq to return sucessfully before sending other stanzas. ↵ | iNPUTmice | 2015-03-20 | 1 | -26/+42 | |
|/ | | | | fixed #1017 | |||||
* | version bump to 1.2.0-beta | iNPUTmice | 2015-03-19 | 2 | -3/+5 | |
| | ||||||
* | don't update presence for muc messages | iNPUTmice | 2015-03-19 | 1 | -5/+2 | |
| | ||||||
* | pulled more translations | iNPUTmice | 2015-03-19 | 1 | -0/+5 | |
| | ||||||
* | Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen | Daniel Gultsch | 2015-03-19 | 4 | -8/+24 | |
|\ | | | | | add delivery receipts for private muc msgs & enable update last-seen for muc-msgs | |||||
| * | # add delivery receipts for private muc msgs | BrianBlade | 2015-03-18 | 4 | -8/+24 | |
| | | | | | | | | # enable update last-seen for muc-msgs | |||||
* | | Merge pull request #1043 from strb/choose_contact_multiple_squashed | Daniel Gultsch | 2015-03-18 | 4 | -6/+134 | |
|\ \ | | | | | | | Added multiple select to Choose Contact Activity (squashed) | |||||
| * | | Added multiple select to Choose Contact Activity | Andreas Straub | 2015-03-18 | 4 | -6/+134 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | Merge pull request #1036 from QuentinC/development | Daniel Gultsch | 2015-03-18 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Green led color is better with "full-green" |