Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/top-bases/t/versions' into t/versionsrefs/top-bases/t/xdg-favorites-viewt/versionsSascha Silbe2011-03-122-15/+0
|\
| * Merge branch 't/bug-1673' into refs/top-bases/t/versionsrefs/top-bases/t/versionsSascha Silbe2011-03-122-15/+0
| |\
| | * fix merge left-oversrefs/top-bases/t/bug-1608t/bug-1673Sascha Silbe2011-03-122-16/+0
* | | Merge commit 'refs/top-bases/t/versions' into t/versionsSascha Silbe2011-03-12138-2876/+5073
|\ \ \ | |/ /
| * | Merge branch 't/frame-show-legacy-icons' into refs/top-bases/t/versionsSascha Silbe2011-03-120-0/+0
| |\ \
| | * \ Merge commit 'refs/top-bases/t/frame-show-legacy-icons' into t/frame-show-leg...t/frame-show-legacy-iconsSascha Silbe2011-03-12138-2965/+5197
| | |\ \
| * | \ \ Merge branch 't/fix-no-nm-user-settings' into refs/top-bases/t/versionsSascha Silbe2011-03-120-0/+0
| |\ \ \ \
| | * \ \ \ Merge commit 'refs/top-bases/t/fix-no-nm-user-settings' into t/fix-no-nm-user...t/fix-no-nm-user-settingsSascha Silbe2011-03-12138-2965/+5197
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | Merge branch 't/bug-2022' into refs/top-bases/t/versionsSascha Silbe2011-03-120-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge commit 'refs/top-bases/t/bug-2022' into t/bug-2022t/bug-2022Sascha Silbe2011-03-12138-2965/+5197
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| * | | | | | Merge branch 't/ck-shutdown' into refs/top-bases/t/versionsSascha Silbe2011-03-120-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge commit 'refs/top-bases/t/ck-shutdown' into t/ck-shutdownt/ck-shutdownSascha Silbe2011-03-12138-2960/+5192
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| * | | | | | | Merge branch 't/upower' into refs/top-bases/t/versionsSascha Silbe2011-03-120-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit 'refs/top-bases/t/upower' into t/upowert/upowerSascha Silbe2011-03-12138-2882/+5110
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| * | | | | | | | Merge branch 't/bug-1673' into refs/top-bases/t/versionsSascha Silbe2011-03-120-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge commit 'refs/top-bases/t/bug-1673' into t/bug-1673Sascha Silbe2011-03-12138-2965/+5197
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| * | | | | | | | Merge branch 't/dbus-session.conf' into refs/top-bases/t/versionsSascha Silbe2011-03-120-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge commit 'refs/top-bases/t/dbus-session.conf' into t/dbus-session.conft/dbus-session.confSascha Silbe2011-03-12138-2965/+5197
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| * | | | | | | | | Merge branch 't/journal-cache-simplify' into refs/top-bases/t/versionsSascha Silbe2011-03-120-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/t/journal-cache-simplify' into t/journal-cache-s...t/journal-cache-simplifySascha Silbe2011-03-12138-2965/+5197
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge branch 't/vnc+sugar-i18n-shell' into refs/top-bases/t/versionsSascha Silbe2011-03-12138-2873/+5071
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/t/vnc+sugar-i18n-shell' into t/vnc+sugar-i18n-shellt/vnc+sugar-i18n-shellSascha Silbe2011-03-12138-2954/+5185
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 't/sugar-i18n-shell' into refs/top-bases/t/vnc+sugar-i18n-shellrefs/top-bases/t/vnc+sugar-i18n-shellSascha Silbe2011-03-120-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/t/sugar-i18n-shell' into t/sugar-i18n-shellt/sugar-i18n-shellSascha Silbe2011-03-12138-2965/+5197
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | * | | | | | | | | | | Merge branch 't/vnc' into refs/top-bases/t/vnc+sugar-i18n-shellSascha Silbe2011-03-12138-2954/+5185
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/t/vnc' into t/vnct/vncSascha Silbe2011-03-12138-2954/+5185
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 't/keymap-wait' into refs/top-bases/t/vncrefs/top-bases/t/vncSascha Silbe2011-03-120-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/t/keymap-wait' into t/keymap-waitt/keymap-waitSascha Silbe2011-03-12138-2965/+5197
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / | | | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | | | Merge remote branch 'upstream/master' into refs/top-bases/t/vncSascha Silbe2011-03-12138-2965/+5197
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / | | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | | Fix up style issues introduced by commit 3f8a1e1refs/top-bases/t/upowerrefs/top-bases/t/sugar-i18n-shellrefs/top-bases/t/keymap-waitrefs/top-bases/t/journal-cache-simplifyrefs/top-bases/t/jeb-mime-fixrefs/top-bases/t/frame-show-legacy-iconsrefs/top-bases/t/fix-no-nm-user-settingsrefs/top-bases/t/dbus-session.confrefs/top-bases/t/ck-shutdownrefs/top-bases/t/bug-2022refs/top-bases/t/bug-1755refs/top-bases/t/bug-1673Sascha Silbe2011-02-231-5/+5
| | | | | | * | | | | | | | | | | Don't set default timezoneDaniel Drake2011-02-231-1/+1
| | | | | | * | | | | | | | | | | Merge branch 'master' of git.sugarlabs.org:sugar/mainlineSimon Schampijer2011-02-221-98/+102
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | battery frame device: replace HAL with UPowerSascha Silbe2011-02-181-98/+102
| | | | | | * | | | | | | | | | | | Restore setting a language with the command line OLPC #10681Simon Schampijer2011-02-222-22/+24
| | | | | | |/ / / / / / / / / / /
| | | | | | * | | | | | | | | | | use ConsoleKit instead of HAL for shutdown/rebootSascha Silbe2011-02-171-5/+5
| | | | | | * | | | | | | | | | | fix recognition of JEBs outside of data storeSascha Silbe2011-02-171-1/+5
| | | | | | * | | | | | | | | | | Adjust the year in the licence visible in the control panelSimon Schampijer2011-02-171-1/+1
| | | | | | * | | | | | | | | | | Handle activities that cycle through windows dlo#10695Martin Langhoff2011-02-171-36/+71
| | | | | | * | | | | | | | | | | Speaker frame device: pop up palette on left-click instead of toggling muteSascha Silbe2011-02-151-4/+4
| | | | | | * | | | | | | | | | | recognise translations using pgettextSascha Silbe2011-02-151-0/+1
| | | | | | * | | | | | | | | | | Remove last few pieces of buddy-icon.jpg handlingbernie2011-02-123-12/+1
| | | | | | * | | | | | | | | | | fix whitespace error introduced by 4b6a534 (revert of 4a3416b)Sascha Silbe2011-02-121-1/+1
| | | | | | * | | | | | | | | | | Commit from Sugar Labs: Translation System by user RafaelOrtiz.: 374 of 374 m...Pootle daemon2011-02-121-308/+766
| | | | | | * | | | | | | | | | | Intro: Fall back to user name if GECOS real name field is emptySascha Silbe2011-02-121-7/+3
| | | | | | * | | | | | | | | | | Sugar Ad-hoc icons show in search results when connect/disconnect to AP OLPC ...Simon Schampijer2011-02-121-5/+3
| | | | | | * | | | | | | | | | | Show busy cursor during session shutdownSascha Silbe2011-02-122-6/+22
| | | | | | * | | | | | | | | | | Show free space for the Journal in the Journal volumes toolbar (SL#2318)Ishan Bansal2011-02-121-1/+36
| | | | | | * | | | | | | | | | | Fix incorrect logging level for warning about missing GSM configurationDipankar Patro2011-02-111-1/+1
| | | | | | * | | | | | | | | | | simplify extension loading exception errorJames Cameron2011-02-111-2/+1
| | | | | | * | | | | | | | | | | Revert "Add cpu and memory resource indicator to frame" as agreed on withSascha Silbe2011-02-113-217/+0