Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/top-bases/t/xdg-favorites-view' into t/xdg-favorites-viewt/xdg-favorites-view | Sascha Silbe | 2011-03-12 | 2 | -15/+0 |
|\ | |||||
| * | Merge commit 'refs/top-bases/t/versions' into t/versionsrefs/top-bases/t/xdg-favorites-viewt/versions | Sascha Silbe | 2011-03-12 | 2 | -15/+0 |
| |\ | |||||
| | * | Merge branch 't/bug-1673' into refs/top-bases/t/versionsrefs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 2 | -15/+0 |
| | |\ | |||||
| | | * | fix merge left-oversrefs/top-bases/t/bug-1608t/bug-1673 | Sascha Silbe | 2011-03-12 | 2 | -16/+0 |
* | | | | Merge commit 'refs/top-bases/t/xdg-favorites-view' into t/xdg-favorites-view | Sascha Silbe | 2011-03-12 | 138 | -2863/+5391 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge commit 'refs/top-bases/t/versions' into t/versions | Sascha Silbe | 2011-03-12 | 138 | -2876/+5073 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 't/frame-show-legacy-icons' into refs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * \ | Merge commit 'refs/top-bases/t/frame-show-legacy-icons' into t/frame-show-leg...t/frame-show-legacy-icons | Sascha Silbe | 2011-03-12 | 138 | -2965/+5197 |
| | | |\ \ | |||||
| | * | \ \ | Merge branch 't/fix-no-nm-user-settings' into refs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge commit 'refs/top-bases/t/fix-no-nm-user-settings' into t/fix-no-nm-user...t/fix-no-nm-user-settings | Sascha Silbe | 2011-03-12 | 138 | -2965/+5197 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | * | | | | | Merge branch 't/bug-2022' into refs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge commit 'refs/top-bases/t/bug-2022' into t/bug-2022t/bug-2022 | Sascha Silbe | 2011-03-12 | 138 | -2965/+5197 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | * | | | | | | Merge branch 't/ck-shutdown' into refs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge commit 'refs/top-bases/t/ck-shutdown' into t/ck-shutdownt/ck-shutdown | Sascha Silbe | 2011-03-12 | 138 | -2960/+5192 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||||
| | * | | | | | | | Merge branch 't/upower' into refs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge commit 'refs/top-bases/t/upower' into t/upowert/upower | Sascha Silbe | 2011-03-12 | 138 | -2882/+5110 |
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | |||||
| | * | | | | | | | | Merge branch 't/bug-1673' into refs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | Merge commit 'refs/top-bases/t/bug-1673' into t/bug-1673 | Sascha Silbe | 2011-03-12 | 138 | -2965/+5197 |
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | |||||
| | * | | | | | | | | Merge branch 't/dbus-session.conf' into refs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/t/dbus-session.conf' into t/dbus-session.conft/dbus-session.conf | Sascha Silbe | 2011-03-12 | 138 | -2965/+5197 |
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | |||||
| | * | | | | | | | | | Merge branch 't/journal-cache-simplify' into refs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/t/journal-cache-simplify' into t/journal-cache-s...t/journal-cache-simplify | Sascha Silbe | 2011-03-12 | 138 | -2965/+5197 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 't/vnc+sugar-i18n-shell' into refs/top-bases/t/versions | Sascha Silbe | 2011-03-12 | 138 | -2873/+5071 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/t/vnc+sugar-i18n-shell' into t/vnc+sugar-i18n-shellt/vnc+sugar-i18n-shell | Sascha Silbe | 2011-03-12 | 138 | -2954/+5185 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 't/sugar-i18n-shell' into refs/top-bases/t/vnc+sugar-i18n-shellrefs/top-bases/t/vnc+sugar-i18n-shell | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/t/sugar-i18n-shell' into t/sugar-i18n-shellt/sugar-i18n-shell | Sascha Silbe | 2011-03-12 | 138 | -2965/+5197 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / | | | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | | | Merge branch 't/vnc' into refs/top-bases/t/vnc+sugar-i18n-shell | Sascha Silbe | 2011-03-12 | 138 | -2954/+5185 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/t/vnc' into t/vnct/vnc | Sascha Silbe | 2011-03-12 | 138 | -2954/+5185 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 't/keymap-wait' into refs/top-bases/t/vncrefs/top-bases/t/vnc | Sascha Silbe | 2011-03-12 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/t/keymap-wait' into t/keymap-waitt/keymap-wait | Sascha Silbe | 2011-03-12 | 138 | -2965/+5197 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / | | | | | | | | |/| | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | | | Merge remote branch 'upstream/master' into refs/top-bases/t/vnc | Sascha Silbe | 2011-03-12 | 138 | -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-1673 | Sascha Silbe | 2011-02-23 | 1 | -5/+5 |
| | | | | | | * | | | | | | | | | | | Don't set default timezone | Daniel Drake | 2011-02-23 | 1 | -1/+1 |
| | | | | | | * | | | | | | | | | | | Merge branch 'master' of git.sugarlabs.org:sugar/mainline | Simon Schampijer | 2011-02-22 | 1 | -98/+102 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | * | | | | | | | | | | | battery frame device: replace HAL with UPower | Sascha Silbe | 2011-02-18 | 1 | -98/+102 |
| | | | | | | * | | | | | | | | | | | | Restore setting a language with the command line OLPC #10681 | Simon Schampijer | 2011-02-22 | 2 | -22/+24 |
| | | | | | | |/ / / / / / / / / / / | |||||
| | | | | | | * | | | | | | | | | | | use ConsoleKit instead of HAL for shutdown/reboot | Sascha Silbe | 2011-02-17 | 1 | -5/+5 |
| | | | | | | * | | | | | | | | | | | fix recognition of JEBs outside of data store | Sascha Silbe | 2011-02-17 | 1 | -1/+5 |
| | | | | | | * | | | | | | | | | | | Adjust the year in the licence visible in the control panel | Simon Schampijer | 2011-02-17 | 1 | -1/+1 |
| | | | | | | * | | | | | | | | | | | Handle activities that cycle through windows dlo#10695 | Martin Langhoff | 2011-02-17 | 1 | -36/+71 |
| | | | | | | * | | | | | | | | | | | Speaker frame device: pop up palette on left-click instead of toggling mute | Sascha Silbe | 2011-02-15 | 1 | -4/+4 |
| | | | | | | * | | | | | | | | | | | recognise translations using pgettext | Sascha Silbe | 2011-02-15 | 1 | -0/+1 |
| | | | | | | * | | | | | | | | | | | Remove last few pieces of buddy-icon.jpg handling | bernie | 2011-02-12 | 3 | -12/+1 |
| | | | | | | * | | | | | | | | | | | fix whitespace error introduced by 4b6a534 (revert of 4a3416b) | Sascha Silbe | 2011-02-12 | 1 | -1/+1 |
| | | | | | | * | | | | | | | | | | | Commit from Sugar Labs: Translation System by user RafaelOrtiz.: 374 of 374 m... | Pootle daemon | 2011-02-12 | 1 | -308/+766 |
| | | | | | | * | | | | | | | | | | | Intro: Fall back to user name if GECOS real name field is empty | Sascha Silbe | 2011-02-12 | 1 | -7/+3 |
| | | | | | | * | | | | | | | | | | | Sugar Ad-hoc icons show in search results when connect/disconnect to AP OLPC ... | Simon Schampijer | 2011-02-12 | 1 | -5/+3 |
| | | | | | | * | | | | | | | | | | | Show busy cursor during session shutdown | Sascha Silbe | 2011-02-12 | 2 | -6/+22 |
| | | | | | | * | | | | | | | | | | | Show free space for the Journal in the Journal volumes toolbar (SL#2318) | Ishan Bansal | 2011-02-12 | 1 | -1/+36 |
| | | | | | | * | | | | | | | | | | | Fix incorrect logging level for warning about missing GSM configuration | Dipankar Patro | 2011-02-11 | 1 | -1/+1 |