~erikos/sugar-old/sugar-gtk3 - cd756d783c936640afa955cb636bfde924

	Commit message (Expand)	Author	Age	Files	Lines
*	Time out on registration process to prevent indefinite UI hang (SL#2289)	Dipankar Patro	2010-10-26	1	-3/+24

*	Reduce a bit the verbosity of collaboration logging messages	Tomeu Vizoso	2010-09-17	1	-1/+0

*	Remove unused reference to presenceservice	Tomeu Vizoso	2010-09-16	1	-3/+0

*	Protected Activities Support #2087	Martin Abente	2010-09-09	1	-7/+11

*	AP: signal strength update not seperate from state change #2246	Simon Schampijer	2010-08-30	1	-21/+20

*	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	1	-1/+1

*	Merge branch 'master' of git.sugarlabs.org:sugar/mainline	Walter Bender	2010-08-23	9	-827/+812
\|\
\| *	Address several nitpicks from Marco	Tomeu Vizoso	2010-08-20	2	-3/+3

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

\| *	Misc. pylint fixes	Tomeu Vizoso	2010-08-20	1	-7/+5

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

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

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

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

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

\| *	Turn OwnerBuddyModel a singleton	Tomeu Vizoso	2010-08-20	3	-7/+7

\| *	Track the buddies' current activity	Tomeu Vizoso	2010-08-20	1	-38/+32

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

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

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

\| *	Move WirelessNetworkView and OlpcMeshView to src/jarabe/desktop/networkviews.py	Tomeu Vizoso	2010-08-20	3	-673/+720

\| *	Remove myicon.py and move to BuddyIcon(OwnerBuddyModel())	Tomeu Vizoso	2010-08-20	4	-40/+12

\| *	Add OwnerBuddyModel class so it is dealt with locally	Tomeu Vizoso	2010-08-20	3	-28/+25

\| *	#1725: Resize home window on screen size change	Andrés Ambrois	2010-08-16	1	-2/+7

\| *	Error when going into sleep with removing Sugar-Ad-hoc networks	Simon Schampijer	2010-08-16	1	-1/+0

* \|	adding spiral extension to Ring View	Walter Bender	2010-08-18	1	-21/+78

* \|	Revert "adding spiral extension to Ring View"	Walter Bender	2010-08-16	1	-79/+19

* \|	adding spiral extension to Ring View	Walter Bender	2010-08-16	1	-19/+79
\|/
*	Revert "more spacing fine-tuning"	Tomeu Vizoso	2010-08-16	1	-98/+19

*	more spacing fine-tuning	Walter Bender	2010-08-15	1	-19/+98

*	Add default Ad-hoc networks #1610	Simon Schampijer	2010-08-13	1	-40/+260

*	Merge branch 'master' of git://git.sugarlabs.org/sugar/frans-clone	Tomeu Vizoso	2010-08-13	1	-2/+5
\|\
\| *	Escape Pango markup in network names	Fran Rogers	2010-07-12	1	-2/+5

* \|	Catch network errors when trying to register to the school server #2062	Tim McNamara	2010-07-14	1	-1/+1

* \|	Use only one entry point for activity launch #1814	Aleksey Lim	2010-07-12	3	-30/+6
\|/
*	Fix duplication of OLPC mesh icons	Martin Abente	2010-07-07	1	-8/+9

*	Fix bug sl#1837: "Register" menu item does not disappear	Kenny Meyer	2010-04-19	1	-1/+1

*	Minor pylint cleanups	Simon Schampijer	2010-03-10	2	-5/+5

*	Correct order of resumable entries in Activity palette #1734	Simon Schampijer	2010-02-22	1	-2/+3

*	Implement support for 3G modems (tch) #1622	Tomeu Vizoso	2010-01-29	1	-5/+5

*	Use-sugar.datastore. instead of direct DBus access #1198 (silbe)	Simon Schampijer	2010-01-24	1	-66/+17

*	Implement mesh support again for NM 0.7 (dsd) #230	Tomeu Vizoso	2010-01-17	1	-10/+212

*	fail gracefully if system DBus unreachable (#1403)	Sascha Silbe	2010-01-11	1	-1/+2

*	Only parse colors from ad-hoc network names that contain them (#1604)	Daniel Drake	2010-01-03	1	-2/+8

*	Send all network settings to NetworkManager in secrets response (#1602)	Daniel Drake	2009-12-07	2	-13/+20

*	Small fixes to new meshbox code	Daniel Drake	2009-11-20	1	-2/+2

*	Group access points by network (#330)	Daniel Drake	2009-11-19	1	-117/+165

*	Use link-local IPv4 address setup for ad-hoc connections	Daniel Drake	2009-11-06	1	-1/+1

*	_Typo in a2976122a1	Aleksey Lim	2009-10-01	1	-1/+1