~dnarvaez/sugar-old/dnarvaez - b2f7d50cec1d65cefbe3d0311b613ddb16

	Commit message (Expand)	Author	Age	Files	Lines
...
*	Add a filesize column to the journal list model	Andrés Ambrois	2010-08-24	1	-6/+24

*	Journal: Retrieve filesize from the datastore	Andrés Ambrois	2010-08-24	1	-3/+3

*	GSM: show connection errors #1759 (Daniel Castelo)	Simon Schampijer	2010-08-24	1	-10/+156

*	Remove unneeded journal debug logs #1862	Simon Schampijer	2010-08-24	1	-4/+0

*	Correctly retrieve the OwnerBuddyModel instance	Tomeu Vizoso	2010-08-24	1	-4/+2

*	Delete profile data only when erased #2074	Martin Abente	2010-08-23	2	-3/+3

*	Merge branch 'master' of git.sugarlabs.org:sugar/mainline	Walter Bender	2010-08-23	26	-1700/+2285
\|\
\| *	Address several nitpicks from Marco	Tomeu Vizoso	2010-08-20	4	-4/+5

\| *	Rename ActivityHandle.handle_invite to ActivityHandle.invited	Tomeu Vizoso	2010-08-20	2	-3/+3

\| *	Add copyright statement due to the collaboration refactoring	Tomeu Vizoso	2010-08-20	3	-0/+3

\| *	Misc. pylint fixes	Tomeu Vizoso	2010-08-20	9	-85/+124

\| *	Remove unused sugar.presence imports	Tomeu Vizoso	2010-08-20	3	-3/+0

\| *	Pass the activity_id to activities activated by an invite	Tomeu Vizoso	2010-08-20	3	-43/+31

\| *	activity.props.color is already a XoColor	Tomeu Vizoso	2010-08-20	1	-1/+1

\| *	Check the known shared activities when looking for the color	Tomeu Vizoso	2010-08-20	1	-5/+5

\| *	Set the owner properties before the connections are connected	Tomeu Vizoso	2010-08-20	1	-8/+25

\| *	Display the proper label in the palette depending on whether the activity	Tomeu Vizoso	2010-08-20	3	-115/+12

\| *	Call the old Activity.Invite(key) method if Activity.InviteContact is not imp...	Tomeu Vizoso	2010-08-20	1	-2/+12

\| *	Request again the current activity when we get to know about a new	Tomeu Vizoso	2010-08-20	2	-1/+17

\| *	Don't try to update an activity's properties if we got none.	Tomeu Vizoso	2010-08-20	1	-1/+2

\| *	Only listen for presence updates in the subscribe contact list	Tomeu Vizoso	2010-08-20	1	-20/+19

\| *	Create the palette for BuddyIcon lazily so it can be overridden in OwnerIcon	Tomeu Vizoso	2010-08-20	2	-10/+8

\| *	Properly track an account when it has become connected again	Tomeu Vizoso	2010-08-20	1	-27/+41

\| *	Remove buddies and activities when the connection goes down	Tomeu Vizoso	2010-08-20	1	-0/+22

\| *	Manage connections so that we fall back to Salut if cannot connect with Gabble	Tomeu Vizoso	2010-08-20	1	-60/+139

\| *	Implement tracking of buddies inside an activity for FriendsTray	Tomeu Vizoso	2010-08-20	3	-76/+104

\| *	Announce the local current activity	Tomeu Vizoso	2010-08-20	2	-21/+62

\| *	Turn OwnerBuddyModel a singleton	Tomeu Vizoso	2010-08-20	6	-11/+20

\| *	Track the buddies' current activity	Tomeu Vizoso	2010-08-20	4	-94/+144

\| *	Retrieve activity properties once we know about it	Tomeu Vizoso	2010-08-20	1	-0/+12

\| *	When the user accepts a notification, launch the activity then	Tomeu Vizoso	2010-08-20	4	-39/+111

\| *	Adapt to API changes in ActivityModel	Tomeu Vizoso	2010-08-20	1	-7/+3

\| *	Set the public key from the profile and announce it in the network	Tomeu Vizoso	2010-08-20	1	-1/+5

\| *	Change Activity.Invite API to receive account_id and contact_id instead of th...	Tomeu Vizoso	2010-08-20	3	-2/+30

\| *	Drop one usage instance of s.p.Buddy	Tomeu Vizoso	2010-08-20	1	-2/+1

\| *	Make the key property on BuddyModel writable	Tomeu Vizoso	2010-08-20	1	-1/+4

\| *	Emit owner property changes across the network	Tomeu Vizoso	2010-08-20	1	-0/+45

\| *	Fix typo	Tomeu Vizoso	2010-08-20	1	-2/+2

\| *	Make ConnectionWatcher a singleton	Tomeu Vizoso	2010-08-20	2	-8/+14

\| *	Remove src/jarabe/model/owner.py and org.laptop.ShellOwner	Tomeu Vizoso	2010-08-20	3	-119/+1

\| *	Make sure we completely remove an activity when the last buddy leaves	Tomeu Vizoso	2010-08-20	1	-4/+23

\| *	Fix the case when we receive a buddy's activities before its properties	Tomeu Vizoso	2010-08-20	1	-27/+22

\| *	Split some functionality into _Account out from Neighborhood and	Tomeu Vizoso	2010-08-20	3	-279/+347

\| *	Implement joining a shared activity	Tomeu Vizoso	2010-08-20	2	-12/+58

\| *	The activity id should be a string	Tomeu Vizoso	2010-08-20	1	-2/+2

\| *	Adapt to changes in the telepathy applications spec	Tomeu Vizoso	2010-08-20	1	-14/+57

\| *	Adapt to changes in the ActivityModel API	Tomeu Vizoso	2010-08-20	2	-57/+69

\| *	First implementation of invitations from non-Sugar clients	Tomeu Vizoso	2010-08-20	4	-262/+259

\| *	Split the telepathy client to its own module	Tomeu Vizoso	2010-08-20	2	-90/+20

\| *	Start of channel handling	Tomeu Vizoso	2010-08-20	1	-6/+46