~andresambrois/sugar-old/aa

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch '3g-db'HEAD master	Andrés Ambrois	2010-08-30	5	-34/+293
\|\
\| *	Add config.py.in and update AC_CONFIG_FILES.	Andrés Ambrois	2010-08-30	3	-0/+23

\| *	Show Country/Provider/Plan comboboxes if DB exists.	Andrés Ambrois	2010-08-30	1	-34/+133

\| *	Add models for detecting and parsing the providers DB.	Andrés Ambrois	2010-08-30	1	-0/+137

* \|	Merge branch 'mainline-master'	Andrés Ambrois	2010-08-30	4	-45/+80
\|\ \
\| * \|	Release 0.89.6	Tomeu Vizoso	2010-08-30	1	-1/+1

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

\| * \|	Listen to changes to the nick and jabber server settings and update MC approp...	Tomeu Vizoso	2010-08-30	2	-23/+59
\| \|/
* \|	Merge branch 'master' of git.sugarlabs.org:sugar/aa	Andrés Ambrois	2010-08-29	0	-0/+0
\|\ \ \| \|/ \|/\|
\| *	Pylint cleanup	Simon Schampijer	2010-08-24	1	-2/+2

\| *	Use Toolbutton instead of instead of Radiotoolbutton	Simon Schampijer	2010-08-24	1	-32/+25

\| *	Add creation_time property to the journal model.	Andrés Ambrois	2010-08-24	2	-11/+14

\| *	Add sort by creation time option to the ListViewButton	Andrés Ambrois	2010-08-24	1	-0/+1

\| *	Implement sorting for removable devices.	Andrés Ambrois	2010-08-24	1	-3/+13

\| *	Expandedentry: Try to use the filesize property.	Andrés Ambrois	2010-08-24	1	-2/+3

\| *	Display the sorting property in the last column.	Andrés Ambrois	2010-08-24	1	-3/+8

\| *	Rename the date column to 'sort_column'	Andrés Ambrois	2010-08-24	1	-11/+11

\| *	Add a ListViewButton to the journal search toolbar.	Andrés Ambrois	2010-08-24	1	-0/+74

\| *	Journaltoolbox: Add add_separator method for convenience.	Andrés Ambrois	2010-08-24	1	-0/+11

\| *	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

* \|	Release 0.89.5	Tomeu Vizoso	2010-08-27	1	-1/+1

* \|	Run gnome-keyring-daemon from sugar-emulator	Tomeu Vizoso	2010-08-27	1	-0/+11

* \|	Release 0.89.4	Tomeu Vizoso	2010-08-25	1	-1/+1

* \|	Add one more file to POTFILES.in	Tomeu Vizoso	2010-08-25	1	-0/+1

* \|	Add some files to POTFILES.in	Tomeu Vizoso	2010-08-25	1	-0/+2

* \|	Pylint cleanup	Simon Schampijer	2010-08-24	1	-2/+2

* \|	Use Toolbutton instead of instead of Radiotoolbutton	Simon Schampijer	2010-08-24	1	-32/+25

* \|	Add creation_time property to the journal model.	Andrés Ambrois	2010-08-24	2	-11/+14

* \|	Add sort by creation time option to the ListViewButton	Andrés Ambrois	2010-08-24	1	-0/+1

* \|	Implement sorting for removable devices.	Andrés Ambrois	2010-08-24	1	-3/+13

* \|	Expandedentry: Try to use the filesize property.	Andrés Ambrois	2010-08-24	1	-2/+3

* \|	Display the sorting property in the last column.	Andrés Ambrois	2010-08-24	1	-3/+8

* \|	Rename the date column to 'sort_column'	Andrés Ambrois	2010-08-24	1	-11/+11

* \|	Add a ListViewButton to the journal search toolbar.	Andrés Ambrois	2010-08-24	1	-0/+74

* \|	Journaltoolbox: Add add_separator method for convenience.	Andrés Ambrois	2010-08-24	1	-0/+11

* \|	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	2	-64/+281

* \|	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	32	-1705/+2297
\|\
\| *	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