| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Bump minimum logger versiondebian/2.34.0+git.20110531.338a6e-0ubuntu0+easton1 | Emilio Pozuelo Monfort | 2011-05-31 | 2 | -1/+2 |
| | | |||||
| * | Patches refreshed | Emilio Pozuelo Monfort | 2011-05-31 | 5 | -27/+28 |
| | | |||||
| * | New upstream snapshot | Emilio Pozuelo Monfort | 2011-05-31 | 1 | -0/+6 |
| | | |||||
| * | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-31 | 9 | -25/+332 |
| |\ | |||||
| | * | Merge branch 'message-editing-48-more' into empathy-skype | Danielle Madeley | 2011-05-27 | 9 | -25/+332 |
| | |\ | |||||
| | | * | Bump to released TPL version 0.2.10 | Danielle Madeley | 2011-05-27 | 1 | -1/+1 |
| | | | | |||||
| | | * | Update for new TPL API, we now get timestamp and edit_timestamp | Danielle Madeley | 2011-05-27 | 1 | -3/+21 |
| | | | | | | | | | | | | | | | | This makes it backwards to what we get in Telepathy, but we can manage by translating it into the Telepathy form. | ||||
| | | * | Reset the chat state after receiving an edited message | Danielle Madeley | 2011-05-26 | 1 | -12/+9 |
| | | | | |||||
| | | * | Replace tpl_text_event_dup_supersedes() with synthetic message | Danielle Madeley | 2011-05-26 | 1 | -18/+24 |
| | | | | | | | | | | | | | | | | This allows us to handle the case where we get b-supersedes-a, but we've lost the original message a. | ||||
| | | * | Add 'original-timestamp' to EmpathyMessage | Danielle Madeley | 2011-05-26 | 2 | -3/+36 |
| | | | | |||||
| | | * | Set the edited icon for edited messages in the log viewer | Danielle Madeley | 2011-05-25 | 1 | -0/+7 |
| | | | | |||||
| | | * | Get the original message from the logger so we can supersede it | Danielle Madeley | 2011-05-25 | 2 | -2/+23 |
| | | | | | | | | | | | | | | | | | | | | | | Strictly, we don't need to do this, we could just use the supersedes-token as the message-token and we'd still be able to edit the messages in the future, but this way we get the nice pretty annotation saying that we edited it and when. | ||||
| | | * | Set 'token' and 'supersedes' for events from the logger | Danielle Madeley | 2011-05-25 | 2 | -5/+8 |
| | | | | |||||
| | | * | Add an icon to edited messages | Danielle Madeley | 2011-05-25 | 2 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | | Currently this is using "format-text-direction-ltr" which is a crappy choice. We should ask for a better icon. Also, this should really be implemented as a class, so that the icon can change with the theme. Or be made part of the Adium theme, or something. Basically this is kludgey. | ||||
| | | * | Add a tooltip saying when the message was edited | Danielle Madeley | 2011-05-25 | 1 | -0/+14 |
| | | | | |||||
| | | * | [theme-adium] implement edit_message() | Danielle Madeley | 2011-05-25 | 2 | -2/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done via DOM manipulation, we find the id for the <span> tag we wrapped the message in in the previous commit. We then replace the innerHTML with the new message. This requires a version of WebKitGtk 1.3.x, but I'm not precisely sure what. I used WebKitGtk 1.4.0, but natty only has 1.3.13, so we'll try setting that as the dep. Need to somehow mark a message as edited. Could set a class on it, but that requires support in the theme. Need inspiration here. | ||||
| | | * | [theme-adium] wrap the messages in <span id=...> so we can find them again | Danielle Madeley | 2011-05-25 | 1 | -4/+16 |
| | | | | | | | | | | | | | This will enable our DOM manipulation | ||||
| | | * | Pass edited messages through to the ChatView | Danielle Madeley | 2011-05-20 | 1 | -12/+25 |
| | | | | |||||
| | | * | Add edit_message() method to ChatView iface | Danielle Madeley | 2011-05-20 | 2 | -0/+16 |
| | | | | |||||
| | | * | Add 'supersedes' property to EmpathyMessage | Danielle Madeley | 2011-05-20 | 2 | -0/+44 |
| | | | | | | | | | | | | | | | | | | | It would be nice to remove EmpathyMessage, because now that TpMessages are a GObject, EmpathyMessage is just an empty abstraction layer that we have to keep punching through. | ||||
| | | * | Add 'token' property to EmpathyMessage | Danielle Madeley | 2011-05-18 | 2 | -0/+31 |
| | | | | | | | | | | | | | | | | This allows us to pass the 'message-token' from the TpMessage through to the chat-view. | ||||
| * | | | New upstream snapshotdebian/2.34.0+git.20110526.adcea1-0ubuntu0+easton1 | Emilio Pozuelo Monfort | 2011-05-26 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-26 | 11 | -72/+220 |
| |\ \ \ | |/ / | |||||
| | * | | Clear audio_output when the call ends | Emilio Pozuelo Monfort | 2011-05-26 | 1 | -0/+5 |
| | | | | | | | | | | | | | So we create a new one when redialing instead of reusing it. | ||||
| | * | | Update telepathy-yell submodule | Emilio Pozuelo Monfort | 2011-05-26 | 1 | -0/+0 |
| | | | | |||||
| | * | | Reopen tabs as SMS channels when appropriate | Emilio Pozuelo Monfort | 2011-05-26 | 1 | -0/+6 |
| | | | | |||||
| | * | | Set a parent for the error dialog | Emilio Pozuelo Monfort | 2011-05-26 | 1 | -5/+7 |
| | | | | |||||
| | * | | NewMessageDialog: show an error if starting the channel fails | Emilio Pozuelo Monfort | 2011-05-26 | 1 | -2/+77 |
| | | | | |||||
| | * | | empathy_dispatcher_chat_with_contact_id(): add optional cb | Emilio Pozuelo Monfort | 2011-05-26 | 8 | -23/+40 |
| | | | | |||||
| | * | | Remove the balance action when an account is removed | Danielle Madeley | 2011-05-26 | 1 | -38/+48 |
| | | | | |||||
| | * | | Merge branch 'gnome-2-34' into empathy-skype | Danielle Madeley | 2011-05-26 | 1 | -0/+5 |
| | |\ \ | |||||
| | | * | | empathy_chat_window_present_chat: always show newly created windows | Guillaume Desmottes | 2011-05-26 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | We just create so we should at least show it. | ||||
| | * | | | CallWindow: show 'On hold' in the statusbar when appropriate | Emilio Pozuelo Monfort | 2011-05-23 | 1 | -3/+38 |
| | | | | | |||||
| | * | | | Directly call the callback if we're ready | Emilio Pozuelo Monfort | 2011-05-23 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | | Instead of duplicating the code in two places. | ||||
| * | | | | New upstream snapshotdebian/2.34.0+git.20110520.5773ec-0ubuntu0+easton1 | Emilio Pozuelo Monfort | 2011-05-20 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-20 | 17 | -131/+242 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Use the official Skype icon | Emilio Pozuelo Monfort | 2011-05-20 | 6 | -36/+34 |
| | | | | | |||||
| | * | | | Merge branch 'sms-topup-154-2' into empathy-skype | Emilio Pozuelo Monfort | 2011-05-20 | 4 | -1/+90 |
| | |\ \ \ | |||||
| | | * | | | EmpathyChat: add a 'Top up' link when there's not enough credit | Emilio Pozuelo Monfort | 2011-05-18 | 1 | -1/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is only added for Adium themes since ChatTextView ones don't support markup. | ||||
| | | * | | | EmpathyThemeAdium: implement append_event_markup | Emilio Pozuelo Monfort | 2011-05-17 | 1 | -0/+9 |
| | | | | | | |||||
| | | * | | | Add empathy_chat_view_append_event_markup | Emilio Pozuelo Monfort | 2011-05-17 | 2 | -0/+22 |
| | | | | | | |||||
| | * | | | | Disable textview themes | Emilio Pozuelo Monfort | 2011-05-19 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | log_window_chats_set_selected: only act on normal rows | Emilio Pozuelo Monfort | 2011-05-18 | 1 | -0/+5 |
| | | |_|/ | |/| | | |||||
| | * | | | Merge branch 'alias-upstream-166' into empathy-skype | Danielle Madeley | 2011-05-18 | 1 | -5/+65 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Update our local fields having Overwritten_By_Nickname when updating our ↵ | Guillaume Desmottes | 2011-05-18 | 1 | -0/+43 |
| | | | | | | | | | | | | | | | | | nickname (#644298) | ||||
| | | * | | Import get_spec_from_list() from master | Danielle Madeley | 2011-05-18 | 1 | -0/+17 |
| | | | | | |||||
| | | * | | don't update Alias.Nickname if not needed | Guillaume Desmottes | 2011-05-16 | 1 | -2/+9 |
| | | | | | |||||
| | | * | | inline set_alias_on_account() | Guillaume Desmottes | 2011-05-16 | 1 | -10/+3 |
| | | | | | |||||
| | * | | | Merge branch 'redial-169-2' into empathy-skype | Emilio Pozuelo Monfort | 2011-05-17 | 3 | -86/+35 |
| | |\ \ \ | |||||
| | | * | | | Implement empathy_call_handler_start_call() for redialing | Emilio Pozuelo Monfort | 2011-05-16 | 1 | -12/+18 |
| | | | | | | |||||
 |
index : delta/gnome/empathy.git | |
| gitlab.gnome.org: GNOME/empathy.git |
| summaryrefslogtreecommitdiff |