summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump minimum logger versiondebian/2.34.0+git.20110531.338a6e-0ubuntu0+easton1Emilio Pozuelo Monfort2011-05-312-1/+2
* Patches refreshedEmilio Pozuelo Monfort2011-05-315-27/+28
* New upstream snapshotEmilio Pozuelo Monfort2011-05-311-0/+6
* Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-319-25/+332
|\
| * Merge branch 'message-editing-48-more' into empathy-skypeDanielle Madeley2011-05-279-25/+332
| |\
| | * Bump to released TPL version 0.2.10Danielle Madeley2011-05-271-1/+1
| | * Update for new TPL API, we now get timestamp and edit_timestampDanielle Madeley2011-05-271-3/+21
| | * Reset the chat state after receiving an edited messageDanielle Madeley2011-05-261-12/+9
| | * Replace tpl_text_event_dup_supersedes() with synthetic messageDanielle Madeley2011-05-261-18/+24
| | * Add 'original-timestamp' to EmpathyMessageDanielle Madeley2011-05-262-3/+36
| | * Set the edited icon for edited messages in the log viewerDanielle Madeley2011-05-251-0/+7
| | * Get the original message from the logger so we can supersede itDanielle Madeley2011-05-252-2/+23
| | * Set 'token' and 'supersedes' for events from the loggerDanielle Madeley2011-05-252-5/+8
| | * Add an icon to edited messagesDanielle Madeley2011-05-252-0/+30
| | * Add a tooltip saying when the message was editedDanielle Madeley2011-05-251-0/+14
| | * [theme-adium] implement edit_message()Danielle Madeley2011-05-252-2/+64
| | * [theme-adium] wrap the messages in <span id=...> so we can find them againDanielle Madeley2011-05-251-4/+16
| | * Pass edited messages through to the ChatViewDanielle Madeley2011-05-201-12/+25
| | * Add edit_message() method to ChatView ifaceDanielle Madeley2011-05-202-0/+16
| | * Add 'supersedes' property to EmpathyMessageDanielle Madeley2011-05-202-0/+44
| | * Add 'token' property to EmpathyMessageDanielle Madeley2011-05-182-0/+31
* | | New upstream snapshotdebian/2.34.0+git.20110526.adcea1-0ubuntu0+easton1Emilio Pozuelo Monfort2011-05-261-0/+6
* | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-2611-72/+220
|\ \ \ | |/ /
| * | Clear audio_output when the call endsEmilio Pozuelo Monfort2011-05-261-0/+5
| * | Update telepathy-yell submoduleEmilio Pozuelo Monfort2011-05-261-0/+0
| * | Reopen tabs as SMS channels when appropriateEmilio Pozuelo Monfort2011-05-261-0/+6
| * | Set a parent for the error dialogEmilio Pozuelo Monfort2011-05-261-5/+7
| * | NewMessageDialog: show an error if starting the channel failsEmilio Pozuelo Monfort2011-05-261-2/+77
| * | empathy_dispatcher_chat_with_contact_id(): add optional cbEmilio Pozuelo Monfort2011-05-268-23/+40
| * | Remove the balance action when an account is removedDanielle Madeley2011-05-261-38/+48
| * | Merge branch 'gnome-2-34' into empathy-skypeDanielle Madeley2011-05-261-0/+5
| |\ \
| | * | empathy_chat_window_present_chat: always show newly created windowsGuillaume Desmottes2011-05-261-0/+5
| * | | CallWindow: show 'On hold' in the statusbar when appropriateEmilio Pozuelo Monfort2011-05-231-3/+38
| * | | Directly call the callback if we're readyEmilio Pozuelo Monfort2011-05-231-8/+1
* | | | New upstream snapshotdebian/2.34.0+git.20110520.5773ec-0ubuntu0+easton1Emilio Pozuelo Monfort2011-05-201-0/+6
* | | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-2017-131/+242
|\ \ \ \ | |/ / /
| * | | Use the official Skype iconEmilio Pozuelo Monfort2011-05-206-36/+34
| * | | Merge branch 'sms-topup-154-2' into empathy-skypeEmilio Pozuelo Monfort2011-05-204-1/+90
| |\ \ \
| | * | | EmpathyChat: add a 'Top up' link when there's not enough creditEmilio Pozuelo Monfort2011-05-181-1/+59
| | * | | EmpathyThemeAdium: implement append_event_markupEmilio Pozuelo Monfort2011-05-171-0/+9
| | * | | Add empathy_chat_view_append_event_markupEmilio Pozuelo Monfort2011-05-172-0/+22
| * | | | Disable textview themesEmilio Pozuelo Monfort2011-05-191-2/+2
| * | | | log_window_chats_set_selected: only act on normal rowsEmilio Pozuelo Monfort2011-05-181-0/+5
| | |_|/ | |/| |
| * | | Merge branch 'alias-upstream-166' into empathy-skypeDanielle Madeley2011-05-181-5/+65
| |\ \ \ | | |/ / | |/| |
| | * | Update our local fields having Overwritten_By_Nickname when updating our nick...Guillaume Desmottes2011-05-181-0/+43
| | * | Import get_spec_from_list() from masterDanielle Madeley2011-05-181-0/+17
| | * | don't update Alias.Nickname if not neededGuillaume Desmottes2011-05-161-2/+9
| | * | inline set_alias_on_account()Guillaume Desmottes2011-05-161-10/+3
| * | | Merge branch 'redial-169-2' into empathy-skypeEmilio Pozuelo Monfort2011-05-173-86/+35
| |\ \ \
| | * | | Implement empathy_call_handler_start_call() for redialingEmilio Pozuelo Monfort2011-05-161-12/+18
View Lorry Controller Status