| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit 'refs/top-bases/t/bug-1673': (87 commits)
Fix up style issues introduced by commit 3f8a1e1
Don't set default timezone
Restore setting a language with the command line OLPC #10681
battery frame device: replace HAL with UPower
use ConsoleKit instead of HAL for shutdown/reboot
fix recognition of JEBs outside of data store
Adjust the year in the licence visible in the control panel
Handle activities that cycle through windows dlo#10695
Speaker frame device: pop up palette on left-click instead of toggling mute
recognise translations using pgettext
Remove last few pieces of buddy-icon.jpg handling
fix whitespace error introduced by 4b6a534 (revert of 4a3416b)
Commit from Sugar Labs: Translation System by user RafaelOrtiz.: 374 of 374 messages translated (0 fuzzy).
Intro: Fall back to user name if GECOS real name field is empty
Sugar Ad-hoc icons show in search results when connect/disconnect to AP OLPC #10412
Show busy cursor during session shutdown
Show free space for the Journal in the Journal volumes toolbar (SL#2318)
Fix incorrect logging level for warning about missing GSM configuration
simplify extension loading exception error
Revert "Add cpu and memory resource indicator to frame" as agreed on with erikos. Scheduling for inclusion in 0.94 after potential artwork changes based on feedback from the Design Team.
...
Conflicts:
extensions/cpsection/network/model.py
|
| | |
| |
| |
| |
| | |
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
By default, Sugar's gconf schema configures a UTC timezone, and this
means that sugar-session unconditionally adjusts the environment so that
a UTC timezone is used.
This overrides any system-wide timezone specified by /etc/localtime.
Test case: set /etc/localtime to Asia/Taipei, start sugar, open terminal,
run "date", observe that it shows GMT time.
Drop the text value from the default gconf schema. This allows the
systemwide timezone to be used as a default. Sugar users can still make
their own choice (overriding the systemwide default) in the control panel.
Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
HAL is deprecated, UPower is the designated replacement w.r.t. power
supplies. As a bonus the time displayed is now correct (calculated at
run-time by UPower, self-adjusting to changes in power consumption).
Tested on XO-1.5 running Debian Squeeze with stock UPower (0.9.5-5) and a
2.6.35 OLPC kernel.
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
|
| | |/
| |
| |
| |
| |
| |
| |
| | |
Move the code that handles the list given by the view
to a separate function to make it clearer.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
HAL [1] is dead [2], ConsoleKit [3] now handles shutdown / reboot.
Tested on XO-1.5 running Debian Squeeze with consolekit 0.4.1-4.
[1] http://www.freedesktop.org/wiki/Software/hal
[2] http://lists.freedesktop.org/archives/hal/2008-May/011560.html
[3] http://www.freedesktop.org/wiki/Software/ConsoleKit
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Tested-By: Simon Schampijer <simon@laptop.org>
Acked-By: Simon Schampijer <simon@laptop.org>
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Add a MIME type definition for Journal Entry Bundles (JEBs) so they get
detected properly if encountered outside of the data store.
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Now activities have a stack of windows (Activity._windows). The
lowest still-valid window in the stack is considered the main window.
When a window is closed, the shell finds what activity had that window,
tells it to remove it from its stack. If that was the last window
in the activities' stack, the activity is marked as closed.
With this patch, activities can switch from one window to another
safely, without sugar shell losing track of them. Activities based
on AdobeAIR have been seen to switch windows (perhaps when they navigate
from one SWF to another).
This replaces the one-window = one-activity model, where the moment
an activity closed one window (perhaps one of many) it was considered
closed by the shell.
Signed-off-by: Martin Langhoff <martin@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reports from the field indicate that users accidently left-click the Speaker
icon and don't realise it got muted. By popping up the palette we enable them
to explicitly choose the mute action without instead of surprising them by
automatically executing one of the secondary actions (there is no primary
action).
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: James Cameron <quozl@laptop.org>
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Since Python doesn't support pgettext, we need to teach xgettext to recognise
it.
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Most of it was already removed by the sugar-presence-service / Telepathy
rewrite.
Signed-off-by: Bernie Innocenti <bernie@codewiz.org>
[rebased on mainline/master, adjusted description]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: Sascha Silbe <silbe@activitycentral.com>
|
| | |
| |
| |
| |
| | |
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: Aleksey Lim <alsroot@activitycentral.org>
|
