aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* When the remote side hangs up, clean up the call channelSjoerd Simons2011-06-091-2/+9
* Cope with unexpected call channel invalidationSjoerd Simons2011-06-091-0/+20
* Use modern private structure handlingSjoerd Simons2011-06-092-3/+4
* Correct Call channel refcountingSjoerd Simons2011-06-091-4/+1
* Don't start the Call when the streams startEmilio Pozuelo Monfort2011-06-092-13/+24
* client file channel file should be Call.DRAFTSjoerd Simons2011-06-091-3/+3
* Add depend on new GStreamer for gst_element_request_padSjoerd Simons2011-06-091-1/+2
* Reject approval if call was hung up during approvalSjoerd Simons2011-06-091-2/+27
* Only distroy the video output if it existsSjoerd Simons2011-06-091-1/+2
* Monitor the call state and close the channel when it endsSjoerd Simons2011-06-091-0/+17
* Lock the hash table contents when using themSjoerd Simons2011-06-091-1/+23
* Ensure our bin doesn't change state before being in the hash tableSjoerd Simons2011-06-091-2/+10
* Remove live-adderSjoerd Simons2011-06-092-205/+30
* Implement request pads for multiple sinksSjoerd Simons2011-06-092-46/+230
* Keep a ref to our handler instanceSjoerd Simons2011-06-091-1/+1
* More consistent naming of the call handler optionSjoerd Simons2011-06-091-2/+3
* make the dots consistentSjoerd Simons2011-06-091-1/+1
* auto-detect the presence of farsightSjoerd Simons2011-06-091-3/+14
* No need to borrow the connection, it gets passed to usSjoerd Simons2011-06-091-1/+0
* Trivial coding style fix (>80 chars)Sjoerd Simons2011-06-091-1/+2
* Retrieve the contact for incoming calls so we can display itSjoerd Simons2011-06-091-3/+24
* Stop ringing after approving a Channel.Type.Call channelSjoerd Simons2011-06-091-1/+2
* event-manager Remove HAVE_CALL ifdefs, even if we didn't build the handler we...Sjoerd Simons2011-06-091-15/+1
* Close call channels after hanging upSjoerd Simons2011-06-091-0/+1
* Explicitely use the libtelepathy-yell .la file for dependency trackingSjoerd Simons2011-06-091-1/+1
* Remove stray debugSjoerd Simons2011-06-091-9/+1
* Only change the UI in the main threadSjoerd Simons2011-06-091-2/+11
* Use target-contact instead of membersSjoerd Simons2011-06-091-56/+18
* Move to using ->priv pointer in the object instanceSjoerd Simons2011-06-092-7/+7
* coding style triviaSjoerd Simons2011-06-091-3/+6
* Add TargetContact property that's guaranteed to exist on CallHandlerSjoerd Simons2011-06-093-8/+51
* Recognize Call channel capabilitiesSjoerd Simons2011-06-091-0/+24
* Don't use wildcards for just one marshal fileSjoerd Simons2011-06-091-4/+4
* Add a .client and a .service file for empathy-callEmilio Pozuelo Monfort2011-06-093-2/+31
* Check for TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED when a call failsEmilio Pozuelo Monfort2011-06-091-0/+2
* Add missing files to POTFILES.inEmilio Pozuelo Monfort2011-06-091-0/+3
* Return meaningful errors when starting a call failsEmilio Pozuelo Monfort2011-06-091-1/+22
* empathy_call_new_with_streams: prefer StreamedMedia over CallEmilio Pozuelo Monfort2011-06-091-15/+15
* Always build telepathy-yell and handle Call channelsEmilio Pozuelo Monfort2011-06-095-42/+6
* Show an error dialog if starting a call failsEmilio Pozuelo Monfort2011-06-091-1/+25
* Don't require EmpathyContacts to start a callEmilio Pozuelo Monfort2011-06-097-64/+30
* Move empathy_call_* util functions to libempathy-gtkEmilio Pozuelo Monfort2011-06-0910-145/+229
* Initialize GObjectEmilio Pozuelo Monfort2011-06-091-1/+1
* Temporarily disable some codeEmilio Pozuelo Monfort2011-06-091-2/+5
* Call: check for priv->members to enable the video buttonEmilio Pozuelo Monfort2011-06-091-1/+1
* Use the new empathy_call_create_call_request thoroughlyEmilio Pozuelo Monfort2011-06-093-25/+2
* Don't use tpy_call_channel_is_receiving_videoEmilio Pozuelo Monfort2011-06-091-34/+2
* Don't use tpy_call_channel_is_sending_videoEmilio Pozuelo Monfort2011-06-091-2/+2
* Use EMPATHY_CALL_BUS_NAME_SUFFIX instead of the literalEmilio Pozuelo Monfort2011-06-091-1/+2
* empathy_call_new_with_streams: start Calls when we support themEmilio Pozuelo Monfort2011-06-092-15/+92
* Define EMPATHY_CALL_BUS_NAME{,_SUFFIX}Emilio Pozuelo Monfort2011-06-091-0/+3
* Initialize telepathy-yellEmilio Pozuelo Monfort2011-06-081-0/+6
* Show notifications for CallsEmilio Pozuelo Monfort2011-06-081-0/+3
* Build an empathy-call binary when we have Call supportEmilio Pozuelo Monfort2011-06-083-1/+41
* EmpathyEventManager: handle Call channelsEmilio Pozuelo Monfort2011-06-082-4/+87
* Teach EmpathyChannelFactory how to create Call channelsEmilio Pozuelo Monfort2011-06-082-0/+15
* NewCallDialog: support CallsEmilio Pozuelo Monfort2011-06-082-36/+43
* Add empathy-callEmilio Pozuelo Monfort2011-06-081-0/+195
* Add an EmpathyCallWindowFullscreen classEmilio Pozuelo Monfort2011-06-082-0/+386
* Add an EmpathyCallWindow classEmilio Pozuelo Monfort2011-06-082-0/+3375
* Add an EmpathyCallHandler classEmilio Pozuelo Monfort2011-06-082-0/+1119
* Add an EmpathyCallFactory classEmilio Pozuelo Monfort2011-06-082-0/+411
* Check for telepathy-yell if requestedEmilio Pozuelo Monfort2011-06-082-1/+30
* Add telepathy-yell as a submoduleEmilio Pozuelo Monfort2011-06-082-0/+3
* Add ax_config_dir from audacityEmilio Pozuelo Monfort2011-06-081-0/+109
* Updated Hebrew translation.Yaron Shahrabani2011-06-081-208/+218
* Updated Esperanto translationKristjan SCHMIDT2011-06-081-442/+510
* Adium: Let user select theme variant in preferencesXavier Claessens2011-06-077-185/+482
* main_window_flash_foreach: fix FolksIndividual leakGuillaume Desmottes2011-06-071-4/+3
* coding style tweakGuillaume Desmottes2011-06-071-2/+1
* Updated Norwegian bokmål translationKjartan Maraas2011-06-071-441/+552
* account-widget: use tp_g_signal_connect_object to connect on the password-ret...Guillaume Desmottes2011-06-071-2/+2
* Require Folks 0.5.1 for the API updates.Travis Reitter2011-06-071-1/+1
* Only retrieve server-stored groups for Individuals with TpContacts.Travis Reitter2011-06-071-12/+13
* Adapt to API change in FolksIndividual::personas-changed.Travis Reitter2011-06-072-15/+52
* Adapt to API change in FolksIndividualAggregator::individuals-changed.Travis Reitter2011-06-071-9/+22
* Adapt to API change in folks_group_details_get_groups().Travis Reitter2011-06-072-10/+18
* Change the type of EmpathyContact.priv.groups to GeeHashSet.Travis Reitter2011-06-071-9/+7
* Adapt to API change in folks_backend_get_persona_stores().Travis Reitter2011-06-072-10/+11
* Adapt to API change in FolksIndividual constructor.Travis Reitter2011-06-071-3/+10
* Adapt to API break in folks_individual_get_personas.Travis Reitter2011-06-0717-332/+573
* Don't conflate TpfPersona and FolksPersona.Travis Reitter2011-06-072-9/+9
* Don't shadow the global definition of 'log'.Travis Reitter2011-06-071-3/+3
* Updated Galician translationsFran Diéguez2011-06-061-224/+270
* Updated Hebrew translation.Yaron Shahrabani2011-06-041-214/+259
* invite-participant-dialog: add temporary individuals when searchingGuillaume Desmottes2011-06-011-0/+141
* export individual_store_add_individual_and_connect and individual_store_remov...Guillaume Desmottes2011-06-012-2/+9
* empathy_avatar_new: stop stealing strings (#650939)Guillaume Desmottes2011-06-013-29/+34
* remove useless callbackGuillaume Desmottes2011-06-011-11/+0
* avatar-chooser: replace finalize by disposeGuillaume Desmottes2011-06-011-6/+4
* avatar-chooser: port to TP coding styleGuillaume Desmottes2011-06-012-837/+899
* re-order functions so we can get rid of their declarationsGuillaume Desmottes2011-06-011-276/+240
* avatar-chooser: use tp_clear_*Guillaume Desmottes2011-06-011-15/+5
* avatar-chooser: use the self->priv patternGuillaume Desmottes2011-06-012-126/+110
* Use tp-glib Balance high level API (#651238)Guillaume Desmottes2011-06-011-54/+26
* allow user to search for contacts using their full identifierGuillaume Desmottes2011-06-014-7/+27
* empathy_individual_view_get_individual_menu: don't create a menu if we don't ...Guillaume Desmottes2011-06-011-0/+4
* Merge branch 'speedup-protocol-chooser'Sjoerd Simons2011-06-012-8/+9
|\
| * Use pixbuf for PixbufCellRenderer in protocol chooserSjoerd Simons2011-05-301-4/+9
| * Don't set priv when it's not usedSjoerd Simons2011-05-291-4/+0
* | invite-participant-dialog: add an entry searching the contact listGuillaume Desmottes2011-05-311-1/+39
* | view_selection_changed_cb: don't unref NULL individualGuillaume Desmottes2011-05-311-1/+1
* | factor out empathy_individual_match_words()Guillaume Desmottes2011-05-314-33/+48
* | live-search: export few more functionsGuillaume Desmottes2011-05-312-8/+22
* | add empathy_individual_view_refilter()Guillaume Desmottes2011-05-312-0/+10
* | Chatrooms: Make text input view sensitive on successful password entryChandni Verma2011-05-301-0/+1
* | use tp_channel_dispatch_operation_claim_async() (#650386)Guillaume Desmottes2011-05-303-11/+16
* | bump tp-glib dep to 0.15.1Guillaume Desmottes2011-05-301-1/+1
* | [l10n]Updated Catalan (Valencian) translationCarles Ferrando2011-05-291-993/+1384
|/
* Updated Spanish translationDaniel Mustieles2011-05-271-98/+106
* don't build avatar_chooser_set_avatar_from_pixbuf if building without cheeseGuillaume Desmottes2011-05-271-1/+2
* Adium: Convert NSDateFormatter to strftimeXavier Claessens2011-05-271-6/+149
* Stop live search when main window gets hiddenXavier Claessens2011-05-261-3/+8
* Stop dealing with iconification of main window, just hide/present itXavier Claessens2011-05-263-60/+4
* Do not show the main window when creating it, it will be presented if not sta...Xavier Claessens2011-05-261-1/+0
* Do not present chat window from empathy_chat_window_get_default()Xavier Claessens2011-05-261-18/+0
* libempathy-gtk: avatar chooser from cheese (#521747)Raluca Elena Podiuc2011-05-261-7/+98
* libempathy-gtk: add dependency on libcheeseRaluca Elena Podiuc2011-05-262-0/+22
* main_window_connection_changed_cb: still need the priv pointerGuillaume Desmottes2011-05-261-0/+2
* Remove the balance action when an account is removedDanielle Madeley2011-05-261-38/+48
* Reopen tabs as SMS channels when appropriateEmilio Pozuelo Monfort2011-05-251-0/+4
* Merge remote-tracking branch 'glassrose/make-favorite-room-names-more-detaile...Guillaume Desmottes2011-05-251-2/+8
|\
| * Attach account name information along with the chatroom names in main window ...Chandni Verma2011-05-081-2/+8
* | use tp_text_channel_set_chat_state_async() directlyGuillaume Desmottes2011-05-253-27/+31
* | tp_chat_dispose: use tp_clear_object()Guillaume Desmottes2011-05-251-14/+2
* | clear_chatrooms: prevent destroying the list twiceGuillaume Desmottes2011-05-251-4/+11
* | EmpathyTpChat: get rid of the destroy signalGuillaume Desmottes2011-05-253-50/+15
* | event-manager: look for existing messages when approvingGuillaume Desmottes2011-05-251-0/+9
* | EmpathyTpChat: Use a READY property instead of our own ready codeGuillaume Desmottes2011-05-254-213/+205
* | remove empathy_tp_chat_get_connection and priv->connectionGuillaume Desmottes2011-05-255-30/+27
* | EmpathyTpChat: inherit from TpTextChannel (#650554)Guillaume Desmottes2011-05-259-151/+125
* | tp-chat: use the self->priv patternGuillaume Desmottes2011-05-252-387/+317
* | Use the EmpathyChannelFactory with all components creating EmpathyTpChatGuillaume Desmottes2011-05-253-0/+25
* | rename message-received signal to message-received-empathyGuillaume Desmottes2011-05-253-3/+3
* | tp-chat: rename chat-state-changed to chat-state-changed-empathyGuillaume Desmottes2011-05-252-2/+2
* | Updated Spanish translationDaniel Mustieles2011-05-241-128/+127
* | cell-renderer-expander: fix rendering with GTK+3Cosimo Cecchi2011-05-231-2/+8
* | account-widget-yahoo: fix expand/fill settings (#650854)Guillaume Desmottes2011-05-231-2/+6
* | account-widget-sip: fix expand/fill settings (#650854)Guillaume Desmottes2011-05-231-0/+6
* | account-widget-icq: fix expand/fill settings (#650854)Guillaume Desmottes2011-05-231-0/+4
* | account-widget-groupwise: fix expand/fill settings (#650854)Guillaume Desmottes2011-05-231-0/+6
* | account-widget-aim: fix expand/fill settings (#650854)Guillaume Desmottes2011-05-231-0/+4
* | account-widget-msn: fix expand/fill settings (#650854)Guillaume Desmottes2011-05-231-2/+8
* | empathy_account_widget_setup_widget: unsensitive unsupported param (#650846)Guillaume Desmottes2011-05-231-0/+3
* | add empathy_account_settings_param_is_supported()Guillaume Desmottes2011-05-232-0/+13
* | account-widget-sip: add ignore-tls-errors param (#650844)Guillaume Desmottes2011-05-232-0/+21
* | live-search: fix keyboard navigation using Space (#632787)Guillaume Desmottes2011-05-201-5/+7
* | live-search:fix keyboard navigation using PageUp/PageDown (#632787)Guillaume Desmottes2011-05-201-4/+7
* | live-search: fix keyboard navigation using Home/End (#632787)Guillaume Desmottes2011-05-201-0/+18
* | factor out fire_key_navigation_sig()Guillaume Desmottes2011-05-201-3/+11
* | Always forward to the view keynav events, since we get them only if they are ...Xavier Claessens2011-05-202-22/+12
* | LiveSearch: we don't want to emit keynav signal on left/right since those are...Xavier Claessens2011-05-201-2/+1
* | Squash some set-but-unused variablesColin Walters2011-05-191-4/+0
* | Merge branch 'LOLOOOLOLOLOLLLOLLLOLOLLL'Jonny Lamb2011-05-184-9/+20
|\ \
| * | chat-manager: pass user action time of DBus to show the closed tabJonny Lamb2011-05-184-9/+20
* | | use g_list_free_full()Guillaume Desmottes2011-05-181-2/+1
* | | filter_func: don't leak individualGuillaume Desmottes2011-05-181-3/+6
* | | coding style fixesGuillaume Desmottes2011-05-181-9/+8
* | | invite-participant-dialog: set a default height so a few contacts are displayedGuillaume Desmottes2011-05-181-0/+3
* | | invite-participant-dialog: add a scrolled windowGuillaume Desmottes2011-05-181-2/+7
* | | add some paddingGuillaume Desmottes2011-05-181-2/+2
* | | invite-participant-dialog: filter out contacts already in the chatGuillaume Desmottes2011-05-181-1/+32
* | | invite-participant-dialog: display only contacts on the right ConnectionGuillaume Desmottes2011-05-181-23/+68
* | | individual-view: add API to define our own filter functionGuillaume Desmottes2011-05-182-0/+21
* | | invite-dialog: display a individual view rather than forcing user to type the...Guillaume Desmottes2011-05-183-45/+204
|/ /
* | Merge branch 'undo-close-tab'Jonny Lamb2011-05-185-6/+107
|\ \
| * | chat-manager: use EMPATHY_CHAT_BUS_NAMEJonny Lamb2011-05-181-1/+1
| * | chat-manager: don't leak proxyJonny Lamb2011-05-181-0/+1
| * | main-window: call the remote UndoClosedTabJonny Lamb2011-05-161-5/+1
| * | chat-manager: expose UndoClosedChat over DBusJonny Lamb2011-05-162-1/+73
| * | extensions: add ChatManager extensionJonny Lamb2011-05-162-0/+32
* | | Merge branch 'remember-my-message-yo'Jonny Lamb2011-05-183-0/+89
|\ \ \
| * | | chat-manager: clarify ownership of messages hash tableJonny Lamb2011-05-181-1/+3
| * | | chat-manager: s/null/NULL/Jonny Lamb2011-05-181-1/+1
| * | | chat-manager: add missing freeJonny Lamb2011-05-181-0/+1
| * | | chat: rename get to dupJonny Lamb2011-05-183-3/+3
| * | | chat-manager: keep a hash table with messages left when the chat closedJonny Lamb2011-05-161-0/+59
| * | | chat: add {get,set}_text methodsJonny Lamb2011-05-162-0/+27
* | | | Merge branch 'ack'Jonny Lamb2011-05-178-106/+296
|\ \ \ \
| * | | | adium: set has_unread_message to FALSE when we think we've cleared them allJonny Lamb2011-05-171-0/+2
| * | | | tp-chat: don't assert on not finding messageJonny Lamb2011-05-161-1/+3
| * | | | adium: add comment explaining why we add x-empathy-mesage-id-*Jonny Lamb2011-05-131-1/+5
| * | | | tp-chat: call acknowledge_message(s) directlyJonny Lamb2011-05-131-17/+6
| * | | | tp-chat: rename signal to message-acknowledgedJonny Lamb2011-05-132-10/+10
| * | | | chat: ::notify for all changes to unread messagesJonny Lamb2011-05-131-0/+1
| * | | | chat: call acknowledge_message on the chat view when it happensJonny Lamb2011-05-131-0/+3
| * | | | adium: implement acknowledge_message to remove unread markerJonny Lamb2011-05-131-2/+86
| * | | | chat: don't toggle visibility of the chat view on marking messages readJonny Lamb2011-05-131-3/+1
| * | | | chat-view: add message_acknowledged vfuncJonny Lamb2011-05-132-0/+15
| * | | | tp-chat: give ::pending-message-removed the messageJonny Lamb2011-05-132-4/+5
| * | | | adium: split removing unread markers into two functionsJonny Lamb2011-05-131-26/+34
| * | | | adium: set x-empathy-message-id class in messageStylesJonny Lamb2011-05-131-0/+11
| * | | | chat-window: also update chat window title when the chat updatesJonny Lamb2011-05-131-0/+6
| * | | | chat-window: update tab when nb-unread-messages changesJonny Lamb2011-05-131-0/+3
| * | | | chat: make nb_unread_messages incoming onlyJonny Lamb2011-05-131-2/+32
| * | | | tp-chat: add pending-message-removed signalJonny Lamb2011-05-121-0/+13
| * | | | tp-chat: use ::pending-message-removed to update our pending queueJonny Lamb2011-05-121-20/+34
| * | | | message: stop storing pending-message-idJonny Lamb2011-05-122-23/+0
| * | | | tp-chat: acknowledge messages using TpTextChannel APIJonny Lamb2011-05-121-25/+18
| * | | | message: store the TpMessage when created with oneJonny Lamb2011-05-122-0/+36
* | | | | Updated Spanish translationDaniel Mustieles2011-05-171-141/+179
| |_|/ / |/| | |
* | | | Merge branch 'more-contact-info'Will Thompson2011-05-164-39/+267
|\ \ \ \
| * | | | Add a /whois command.Will Thompson2011-05-161-0/+82
| * | | | ContactWidget: expose IRC presence informationWill Thompson2011-05-161-0/+14
| * | | | ContactWidget: support IRC server and host infoWill Thompson2011-05-161-0/+14
| * | | | ContactWidget: support Idle's x-idle-time field.Will Thompson2011-05-161-0/+19
| * | | | ContactWidget: generalize linkifying valuesWill Thompson2011-05-161-11/+29
| * | | | ContactWidget: show IRC channel list.Will Thompson2011-05-161-0/+74
| * | | | Add empathy_duration_to_string()Will Thompson2011-05-122-29/+36
* | | | | Fix call to empathy_chat_window_find_chat in /part commandWill Thompson2011-05-161-1/+1
| |_|/ / |/| | |
* | | | Updated Slovenian translationMatej Urbančič2011-05-161-6/+6
* | | | Updated Esperanto translationKristjan SCHMIDT2011-05-151-708/+1031
* | | | Updated Slovenian translationMatej Urbančič2011-05-151-5/+5
* | | | Updated Slovenian translationMatej Urbančič2011-05-151-315/+460
* | | | Merge remote-tracking branch 'glassrose/moving-part-functionality-to-empathy-...Guillaume Desmottes2011-05-134-30/+79
|\ \ \ \
| * | | | Password infobar amendmentsChandni Verma2011-05-111-0/+19
| * | | | Leave chatroom only if tp_chat existsChandni Verma2011-05-111-4/+12
| * | | | Send full message for the default chat parted on part commandChandni Verma2011-05-092-1/+17
| * | | | Fire a "part-command-entered" signal from libempathy-gtk/empathy-chat.c to be...Chandni Verma2011-05-073-30/+36
| | |_|/ | |/| |
* | | | Updated Hebrew translation.Yaron Shahrabani2011-05-131-87/+89
| |/ / |/| |
* | | Properly convert timestamps received from X11 (#650015)Guillaume Desmottes2011-05-1211-21/+22
* | | add empathy_get_current_action_time()Guillaume Desmottes2011-05-122-0/+8
* | | empathy_chat_window_present_chat: always show newly created windowsGuillaume Desmottes2011-05-121-0/+5
| |/ |/|
* | theme_adium_remove_focus_marks: early return if there is no unread messageGuillaume Desmottes2011-05-111-4/+7
* | theme-adium: remove unread marks when sending a messageGuillaume Desmottes2011-05-111-0/+3
* | theme-adium: remove focus marks as soon as the chat is not focused (#649890)Guillaume Desmottes2011-05-111-4/+4
* | contact: fix typo when creating new contact from logger entityJonny Lamb2011-05-111-2/+2
* | create_text_channel: pass Empathy.Chat as preferred handlerGuillaume Desmottes2011-05-111-2/+2
* | Uploaded UkranianDaniel Korostil2011-05-101-421/+564
* | Updated Spanish translationJorge González2011-05-101-45/+47
* | remove released flagGuillaume Desmottes2011-05-091-1/+1
* | prepare 3.1.1EMPATHY_3_1_1Guillaume Desmottes2011-05-092-3/+91
* | Merge remote-tracking branch 'glassrose/save-chatrooms.xml-only-when-needed'Guillaume Desmottes2011-05-091-1/+10
|\ \
| * | Save changes to chatrooms.xml configuration file only when needed.Chandni Verma2011-05-091-1/+10
| |/
* | Updated Galician translationsFran Diéguez2011-05-091-290/+408
* | add translators comment explaining the insufficient balance error (#649735)Guillaume Desmottes2011-05-091-0/+2
* | org.gnome.Empathy.gschema.xml: update summary and description of show-balance...Guillaume Desmottes2011-05-091-2/+2
* | add a translation comment explaining the 'Provide' string (#649492)Guillaume Desmottes2011-05-091-0/+3
* | Updated Hebrew translation.Yaron Shahrabani2011-05-091-373/+500
* | Updated Spanish translationJorge González2011-05-081-265/+304
* | Updated Spanish translationDaniel Mustieles2011-05-061-75/+92
* | Include gi18n-lib.h in library sources, not gi18n.h.Gabor Kelemen2011-05-055-5/+7
* | ignore return value of main_window_setup_balance_create_widget()Guillaume Desmottes2011-05-051-2/+1
* | Adium: Fix wrong html fallbacksXavier Claessens2011-05-051-208/+131
* | Depends on tp-glib 0.14.3Guillaume Desmottes2011-05-051-1/+1
* | Merge branch 'balance-rebase'Danielle Madeley2011-05-055-3/+452
|\ \
| * | Change the menu to say "Credit Balance"Danielle Madeley2011-05-051-1/+1
| * | Update balance view in roster per feedbackDanielle Madeley2011-05-051-14/+25
| * | Change menu string to "Top up My Account ($1.23)..."Danielle Madeley2011-05-051-8/+14
| * | Update formatting for NOKDanielle Madeley2011-05-051-1/+1