| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge pull request #1146 from BrianBlade/minor_otr_tweaks | Daniel Gultsch | 2015-04-25 | 1 | -5/+15 | |
| |\ | | | | | OTR: Fix onContactStatusChanged & dont archive OTR | |||||
| | * | OTR: Fix onContactStatusChanged & dont archive OTR | BrianBlade | 2015-04-21 | 1 | -5/+15 | |
| | | | | | | | | | | | | | | | | | | | - 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 | |||||
| * | | send invite to other instanzes after creating ad hoc conference. fixes #1136 | Daniel Gultsch | 2015-04-23 | 1 | -0/+8 | |
| |/ | ||||||
| * | Merge branch 'dont_trust_cas_preference' of ↵ | iNPUTmice | 2015-04-14 | 1 | -3/+16 | |
| |\ | | | | | | | | | | | | | | | 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 | 1 | -3/+16 | |
| | | | | | | | | | | | | | 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. | |||||
| * | | don't resume old session when changing resource | iNPUTmice | 2015-04-09 | 1 | -0/+5 | |
| | | | ||||||
| * | | Enable end-conversation by swipe gesture | BrianBlade | 2015-04-08 | 1 | -0/+1 | |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen | Daniel Gultsch | 2015-03-19 | 1 | -1/+1 | |
| |\ | | | | | 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 | 1 | -1/+1 | |
| | | | | | | | | | # enable update last-seen for muc-msgs | |||||
| * | | Merge pull request #1036 from QuentinC/development | Daniel Gultsch | 2015-03-18 | 1 | -1/+1 | |
| |\ \ | | | | | | | Green led color is better with "full-green" | |||||
| | * | | Green led color is better with "full-green" | Quentin | 2015-03-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | open location directly from notification | iNPUTmice | 2015-03-10 | 1 | -0/+25 | |
| | |/ |/| | ||||||
| * | | display geo uris as location. show 'send loction' in share menu if request ↵ | iNPUTmice | 2015-03-07 | 1 | -0/+18 | |
| | | | | | | | | | location intent can be resolved | |||||
| * | | avoid unnecessary thread creation | iNPUTmice | 2015-03-05 | 1 | -16/+21 | |
| |/ | ||||||
| * | added methods to count number of unread messages | Daniel Gultsch | 2015-03-02 | 1 | -0/+8 | |
| | | ||||||
| * | mark all sent messages up to a marker as displayed | Daniel Gultsch | 2015-03-01 | 1 | -9/+10 | |
| | | ||||||
| * | use conversations green in notification led | iNPUTmice | 2015-02-27 | 1 | -1/+1 | |
| | | ||||||
| * | Update NotificationService.java | QuentinC | 2015-02-27 | 1 | -1/+1 | |
| | | | | Revert led light color | |||||
| * | - Update mBuilder in NotificationService.java to ensure that the led is ↵ | Quentin | 2015-02-27 | 1 | -1/+2 | |
| | | | | | | | | displayed at the right color. CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793 - Changed led Color to green to remember the icon color and led times | |||||
| * | reset incoming chat state when going into background | iNPUTmice | 2015-02-23 | 1 | -0/+3 | |
| | | ||||||
| * | get rid of some useless debugging | iNPUTmice | 2015-02-23 | 1 | -3/+0 | |
| | | ||||||
| * | added typing notifications through XEP-0085. fixed #210 | iNPUTmice | 2015-02-21 | 1 | -0/+22 | |
| | | ||||||
| * | always go through reconnect method instead of just starting XmppConnection ↵ | iNPUTmice | 2015-02-18 | 1 | -4/+1 | |
| | | | | | threads | |||||
| * | moved roster loading to async task as well | iNPUTmice | 2015-02-17 | 1 | -10/+22 | |
| | | ||||||
| * | loading avatars in seperate tasks | iNPUTmice | 2015-02-15 | 1 | -14/+26 | |
| | | ||||||
| * | load messages asynchronously | iNPUTmice | 2015-02-12 | 1 | -2/+18 | |
| | | ||||||
| * | added actions to error notification | iNPUTmice | 2015-02-10 | 2 | -1/+47 | |
| | | ||||||
| * | Use Material Design Icons on API 21+ | Sam Whited | 2015-01-29 | 1 | -6/+17 | |
| | | ||||||
| * | adapt caps on whether or not message confirmation is on | iNPUTmice | 2015-01-26 | 1 | -1/+5 | |
| | | ||||||
| * | made connect time out more failsave | iNPUTmice | 2015-01-25 | 1 | -5/+8 | |
| | | ||||||
| * | fixed mam to work with muc | iNPUTmice | 2015-01-24 | 2 | -9/+17 | |
| | | ||||||
| * | deal with user entering full jids in join conference dialog | iNPUTmice | 2015-01-21 | 1 | -1/+3 | |
| | | ||||||
| * | Merge pull request #908 from betheg/otr4j | Daniel Gultsch | 2015-01-21 | 1 | -1/+1 | |
| |\ | | | | | otr4j: update to 0.22 | |||||
| | * | otr4j: update to 0.22 | Michael | 2015-01-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add color / category to foreground notification | Sam Whited | 2015-01-20 | 1 | -7/+14 | |
| |/ | ||||||
| * | fixed legacy translation of image received | iNPUTmice | 2015-01-19 | 1 | -1/+3 | |
| | | ||||||
| * | check for deleted files when loading more messages from history | iNPUTmice | 2015-01-19 | 1 | -1/+3 | |
| | | ||||||
| * | account for rounding errors when rescheduling wake up | iNPUTmice | 2015-01-19 | 1 | -150/+153 | |
| | | ||||||
| * | Add some Android 21 notification features | Sam Whited | 2015-01-17 | 1 | -0/+4 | |
| | | ||||||
| * | Correct the download file string on notifications | Sam Whited | 2015-01-17 | 1 | -5/+2 | |
| | | | | | Fixes #896 | |||||
| * | Add download button on notification if applicable | Sam Whited | 2015-01-16 | 1 | -17/+50 | |
| | | ||||||
| * | added dedicated button to disable foreground service in perma notification | iNPUTmice | 2015-01-15 | 1 | -2/+9 | |
| | | ||||||
| * | fixed #888 | iNPUTmice | 2015-01-15 | 1 | -1/+1 | |
| | | ||||||
| * | handle muc nicks with white spaces. fixed #884 | iNPUTmice | 2015-01-14 | 1 | -1/+2 | |
| | | ||||||
| * | Ensure type safety in Pebble notifications | Sam Whited | 2015-01-13 | 1 | -15/+30 | |
| | | | | | Also use forward-compatible screen-on detection | |||||
| * | reworked message preview / message meta information (ie file offered, ↵ | Daniel Gultsch | 2015-01-12 | 1 | -34/+7 | |
| | | | | | | | received * file) fixed #837 | |||||
| * | make room persistant when changing subject or other muc options | Daniel Gultsch | 2015-01-10 | 1 | -0/+12 | |
| | | ||||||
| * | ensure that everyone is member before making a room private | Daniel Gultsch | 2015-01-09 | 1 | -2/+11 | |
| | | ||||||
| * | allow for very basic muc configuration | Daniel Gultsch | 2015-01-08 | 1 | -1/+2 | |
| | | ||||||
| * | code cleanup | Daniel Gultsch | 2015-01-08 | 1 | -12/+15 | |
| | | ||||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |