https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&feed=atom&action=history
Dextrose/2/Merge Plan - Revision history
2024-03-29T14:46:26Z
Revision history for this page on the wiki
MediaWiki 1.35.2
https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&diff=98674&oldid=prev
Davelab6 at 04:36, 17 May 2016
2016-05-17T04:36:01Z
<p></p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 04:36, 17 May 2016</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>
<td colspan="2" class="diff-lineno">Line 1:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div><noinclude>{{TeamHeader|Dextrose|home=Dextrose|xbgColor=ffe792|join_label=Get Involved}}</noinclude></div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div><noinclude>{{TeamHeader|Dextrose|home=Dextrose|xbgColor=ffe792|join_label=Get Involved}}</noinclude></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>{{Obsolete | <del class="diffchange diffchange-inline">This Dextrose version is no longer under development, please find up-to-date information about dextrose </del>at http://sugardextrose.org}}</div></td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>{{Obsolete|<ins class="diffchange diffchange-inline">Moved and died </ins>at http://sugardextrose.org}}</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
</table>
Davelab6
https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&diff=80932&oldid=prev
Daroal: Tagging as obsolete
2012-07-11T10:56:47Z
<p>Tagging as obsolete</p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 10:56, 11 July 2012</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>
<td colspan="2" class="diff-lineno">Line 1:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div><noinclude>{{TeamHeader|Dextrose|home=Dextrose|xbgColor=ffe792|join_label=Get Involved}}</noinclude></div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div><noinclude>{{TeamHeader|Dextrose|home=Dextrose|xbgColor=ffe792|join_label=Get Involved}}</noinclude></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;"></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">{{Obsolete | This Dextrose version is no longer under development, please find up-to-date information about dextrose at http://sugardextrose.org}}</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;"></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>This is a summary of all Sugar patches in Dextrose as of 2010-09-27. Most of these patches</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>This is a summary of all Sugar patches in Dextrose as of 2010-09-27. Most of these patches</div></td></tr>
</table>
Daroal
https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&diff=72300&oldid=prev
Sascha silbe: make it clear that this list hasn't been updated since it was created
2011-12-05T21:23:51Z
<p>make it clear that this list hasn't been updated since it was created</p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 21:23, 5 December 2011</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>
<td colspan="2" class="diff-lineno">Line 1:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div><noinclude>{{TeamHeader|Dextrose|home=Dextrose|xbgColor=ffe792|join_label=Get Involved}}</noinclude></div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div><noinclude>{{TeamHeader|Dextrose|home=Dextrose|xbgColor=ffe792|join_label=Get Involved}}</noinclude></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>This is a summary of all Sugar patches in Dextrose as of <del class="diffchange diffchange-inline">today</del>. Most of these patches</div></td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>This is a summary of all Sugar patches in Dextrose as of <ins class="diffchange diffchange-inline">2010-09-27</ins>. Most of these patches</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>have been submitted to sugar-devel@ or attached to tickets. Some have already</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>have been submitted to sugar-devel@ or attached to tickets. Some have already</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>found their way upstream, others still have quality issues. All of them have been</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>found their way upstream, others still have quality issues. All of them have been</div></td></tr>
</table>
Sascha silbe
https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&diff=60671&oldid=prev
Alsroot: Add project toolbar
2011-01-09T10:55:31Z
<p>Add project toolbar</p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 10:55, 9 January 2011</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>
<td colspan="2" class="diff-lineno">Line 1:</td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;"><noinclude>{{TeamHeader|Dextrose|home=Dextrose|xbgColor=ffe792|join_label=Get Involved}}</noinclude></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;"></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>This is a summary of all Sugar patches in Dextrose as of today. Most of these patches</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>This is a summary of all Sugar patches in Dextrose as of today. Most of these patches</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>have been submitted to sugar-devel@ or attached to tickets. Some have already</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>have been submitted to sugar-devel@ or attached to tickets. Some have already</div></td></tr>
</table>
Alsroot
https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&diff=60640&oldid=prev
Bernie: moved Dextrose/TODO/Merge Plan to Dextrose/2/Merge Plan
2011-01-09T03:29:20Z
<p>moved <a href="/index.php?title=Dextrose/TODO/Merge_Plan&action=edit&redlink=1" class="new" title="Dextrose/TODO/Merge Plan (page does not exist)">Dextrose/TODO/Merge Plan</a> to <a href="/go/Dextrose/2/Merge_Plan" title="Dextrose/2/Merge Plan">Dextrose/2/Merge Plan</a></p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<tr class="diff-title" lang="en">
<td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 03:29, 9 January 2011</td>
</tr><tr><td colspan="2" class="diff-notice" lang="en"><div class="mw-diff-empty">(No difference)</div>
</td></tr></table>
Bernie
https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&diff=57903&oldid=prev
Quozl: /* Unreviewed bugfixes */
2010-10-04T08:53:52Z
<p><span dir="auto"><span class="autocomment">Unreviewed bugfixes</span></span></p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 08:53, 4 October 2010</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l130" >Line 130:</td>
<td colspan="2" class="diff-lineno">Line 130:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div> sugar/sl1673-fix-network-disconnect-and-discard-history-v2.patch</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div> sugar/sl1673-fix-network-disconnect-and-discard-history-v2.patch</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del class="diffchange diffchange-inline">Upstream </del>maintainer wants this split in 4 patches and submitter <del class="diffchange diffchange-inline">won't do it</del>,</div></td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">An upstream </ins>maintainer wants this split in 4 patches and submitter <ins class="diffchange diffchange-inline">is waiting for consensus</ins>,</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>so this useful patch remains stuck in review. There's a newer patch attached</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>so this useful patch remains stuck in review. There's a newer patch attached</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>to sl#1673, someone should check it out.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>to sl#1673, someone should check it out.</div></td></tr>
<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l153" >Line 153:</td>
<td colspan="2" class="diff-lineno">Line 153:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Works, but Quozl posted a better counter-patch. Merge that one.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Works, but Quozl posted a better counter-patch. Merge that one.</div></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del style="font-weight: bold; text-decoration: none;"></del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>== Unsubmitted bugfixes ==</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>== Unsubmitted bugfixes ==</div></td></tr>
</table>
Quozl
https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&diff=57581&oldid=prev
Bernie at 22:12, 27 September 2010
2010-09-27T22:12:57Z
<p></p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 22:12, 27 September 2010</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l7" >Line 7:</td>
<td colspan="2" class="diff-lineno">Line 7:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>for the actual patches.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>for the actual patches.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">See also [[Dextrose/TODO/Patches]].</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>== Upstreamed bug fixes ==</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>== Upstreamed bug fixes ==</div></td></tr>
</table>
Bernie
https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&diff=57580&oldid=prev
Bernie at 22:10, 27 September 2010
2010-09-27T22:10:45Z
<p></p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 22:10, 27 September 2010</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l4" >Line 4:</td>
<td colspan="2" class="diff-lineno">Line 4:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>integrated and tested in Dextrose to produce a better overall Sugar environment.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>integrated and tested in Dextrose to produce a better overall Sugar environment.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del class="diffchange diffchange-inline">Please refer </del>to the [http://git.sugarlabs.org/projects/dextrose/repos/mainline/trees/master/rpms rpms directory] in git</div></td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">Refer </ins>to the [http://git.sugarlabs.org/projects/dextrose/repos/mainline/trees/master/rpms rpms directory] in git</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>for the actual patches.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>for the actual patches.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
</table>
Bernie
https://wiki.sugarlabs.org/index.php?title=Dextrose/2/Merge_Plan&diff=57579&oldid=prev
Bernie: Created page with "This is a summary of all Sugar patches in Dextrose as of today. Most of these patches have been submitted to sugar-devel@ or attached to tickets. Some have already found their wa..."
2010-09-27T22:07:10Z
<p>Created page with "This is a summary of all Sugar patches in Dextrose as of today. Most of these patches have been submitted to sugar-devel@ or attached to tickets. Some have already found their wa..."</p>
<p><b>New page</b></p><div>This is a summary of all Sugar patches in Dextrose as of today. Most of these patches<br />
have been submitted to sugar-devel@ or attached to tickets. Some have already<br />
found their way upstream, others still have quality issues. All of them have been<br />
integrated and tested in Dextrose to produce a better overall Sugar environment.<br />
<br />
Please refer to the [http://git.sugarlabs.org/projects/dextrose/repos/mainline/trees/master/rpms rpms directory] in git<br />
for the actual patches.<br />
<br />
<br />
== Upstreamed bug fixes ==<br />
<br />
sugar-datastore/sl2132-reduce-_FLUSH_TIMEOUT-to-5sec.patch<br />
sugar-datastore/sl2132-set-index_updated-flag-on-ds-shutting-down.patch<br />
sugar-datastore/sl2095-invert-datastore-clean-logic.patch<br />
<br />
These plug a serious journal data loss condition that was observed<br />
repeatedly in the field.<br />
<br />
<br />
sugar/sl2064-always-listen-for-NameOwnerChanged-DBus-message.patch<br />
<br />
It turns out that this patch does not really fix #2064, but it<br />
doesn't hurt either.<br />
<br />
<br />
sugar/fix-duplication-of-OLPC-mesh-icons.patch<br />
<br />
Three or more mesh icons were being added after every suspend/resume.<br />
<br />
<br />
sugar/journal-xobundle-removal-wont-remove-installed-one.patch<br />
<br />
Quite surprising behavior: removing a bundle from the journal would uninstall<br />
activity too.<br />
<br />
<br />
sugar/sl2062-catch-network-errors-when-trying-to-register-to-the-xs.patch<br />
sugar/sl1940-register-session-failed-fix.patch<br />
<br />
These two help make registration to schoolserver less painful.<br />
<br />
<br />
sugar/add-button-frame.patch<br />
<br />
Add frame and journal keybindings to F5/F6 (for XO1.5-HS)<br />
<br />
<br />
sugar/indicate-inactive-state-in-mesh-device-icon.patch<br />
<br />
Not sure how this interacts with the switch from mesh to ad-hoc, but<br />
we applied it long ago.<br />
<br />
<br />
sugar/restore-sugar-launch-by-bundle-id-substring-fixes-89.patch<br />
sugar/improve-activity-updater-icon.patch<br />
sugar/disconnect-icon-in-wifi-palette-1736.patch<br />
sugar-toolkit/use-set_toolbar_box-in-example-code.patch<br />
sugar-toolkit/set-default-accelerators-for-Copy-and-Paste-buttons.patch<br />
sugar-toolkit/sl1861-remove-unneeded-debug-logs.patch<br />
<br />
These are not really important, but safe and nice to have.<br />
<br />
<br />
sugar/sl1842-journal-show-error-on-write-failure.patch<br />
sugar-toolkit/sl1842-notify-red-alert.patch<br />
sugar-toolkit/add-ErrorAlert.patch<br />
<br />
The version that went upstream lacks the fancy red alert part. For the sake<br />
of staying closer to upstream, we could rebase Dextrose on this version.<br />
I don't particularly care.<br />
<br />
sugar-artwork/sugar-artwork-gtkdep.patch<br />
sugar-artwork/revert-to-GTK_WIDGET_IS_SENSITIVE.patch<br />
<br />
Small build fixes.<br />
<br />
<br />
<br />
<br />
== Upstreamed new features ==<br />
<br />
sugar/sizelist-0000-cover-letter.patch<br />
sugar/sizelist-0001-Journal-Retrieve-filesize-from-the-datastore.patch<br />
sugar/sizelist-0002-Add-a-filesize-column-to-the-journal-list-model.patch<br />
sugar/sizelist-0003-Journaltoolbox-Add-add_separator-method-for-convenie.patch<br />
sugar/sizelist-0004-Add-a-ListViewButton-to-the-journal-search-toolbar.patch<br />
sugar/sizelist-0006-Display-the-sorting-property-in-the-last-column.patch<br />
sugar/sizelist-0005-Rename-the-date-column-to-sort_column.patch<br />
sugar/sizelist-0007-Expandedentry-Try-to-use-the-filesize-property.patch<br />
sugar/sizelist-0008-Implement-sorting-for-removable-devices.patch<br />
sugar/sizelist-0009-Add-sort-by-creation-time-option-to-the-ListViewButt.patch<br />
sugar/sizelist-0010-Add-ctime-property-to-the-journal-model.patch<br />
sugar-artwork/sizelist-0001-add-icons-for-the-sorting-options-in-the-Journal.patch<br />
sugar-datastore/sizelist-0002-Add-migration-code-from-DS-v0-for-the-filesize-prope.patch<br />
sugar-datastore/sizelist-0006-Implement-migration-from-DS-v0-for-ctime-property.patch<br />
sugar-datastore/sizelist-0000-cover-letter.patch<br />
sugar-datastore/sizelist-0005-Check-ctime-on-index-rebuild.patch<br />
sugar-datastore/sizelist-0004-Add-ctime-property-to-the-index-and-datastore.patch<br />
sugar-datastore/sizelist-0003-Check-filesize-property-on-index-rebuild.patch<br />
sugar-datastore/sizelist-0001-Add-filesize-property-to-the-index.patch<br />
sugar-datastore/sizelist-0007-Increment-CURRENT_LAYOUT_VERSION-to-trigger-an-index.patch<br />
<br />
Andres' series for sorting the journal by file size:<br />
http://wiki.sugarlabs.org/go/Features/Journal_Sort<br />
THIS IS NOT A GEEK TOY! If the filesize is not exposed, users are<br />
unable to figure out how to free up space when the journal becomes<br />
full.<br />
<br />
<br />
sugar/sl1610-default-ad-hoc-networks.patch<br />
sugar-artwork/ad_hoc_artwork.patch<br />
<br />
http://wiki.sugarlabs.org/go/Features/Sugar_Adhoc_Networks<br />
<br />
<br />
sugar/bundle-Delete-profile-data-only-when-erased.patch<br />
sugar-toolkit/bundle-Delete-activities-profile-data-when-uninstall.patch<br />
<br />
This is sl#2074. Merged after a very long struggle.<br />
<br />
<br />
sugar/caacupe-Protected-activities-list.patch<br />
<br />
A variation of this went upstream. Formadores like this feature very much.<br />
<br />
<br />
== Unreviewed bugfixes ==<br />
<br />
sugar/sl1673-fix-network-disconnect-and-discard-history-v2.patch<br />
<br />
Upstream maintainer wants this split in 4 patches and submitter won't do it,<br />
so this useful patch remains stuck in review. There's a newer patch attached<br />
to sl#1673, someone should check it out.<br />
<br />
<br />
sugar/fix-for-file-list-sorting-for-FAT32-formatted-flash-drives-in-journal.patch<br />
<br />
This one seems to have fallen through the cracks. Need to resubmit.<br />
<br />
<br />
sugar-toolkit/sl1876.patch<br />
<br />
Review stuck in sl#1876.<br />
<br />
<br />
sugar-toolkit/fix-two-trivial-shell-log-warnings.patch<br />
<br />
Reviewed on sugar-devel, should be merged. Someone should ping Quozl.<br />
<br />
<br />
sugar/avoid-popping-an-empty-list-in-the-software-updater.patch<br />
<br />
Works, but Quozl posted a better counter-patch. Merge that one.<br />
<br />
<br />
== Unsubmitted bugfixes ==<br />
<br />
sugar/jasg-register-rename.patch<br />
sugar/prevent-multiple-XS-icons-when-re-register.patch<br />
<br />
After first registeration with the schoolserver, the "Register"<br />
menu item disappears. If the schoolserver gets replaced or the<br />
user changes school, there's no way to repeat the registrarion<br />
process. This patch provides a crude solution to this problem.<br />
<br />
<br />
sugar-artwork/journal-reindex-icon.patch<br />
sugar/journal-0002-reindex.patch<br />
sugar/journal-0003-reindex-translations.patch<br />
<br />
The journal index sometimes gets corrupted or out of sync with data.<br />
This can happen at the hardware, filesystem or datastore level and<br />
there's not much we can do about it. This patches provide a workaround for<br />
users. No, it's not a geek toy.<br />
<br />
<br />
sugar/reverse-sort-order-of-activities-list.patch<br />
<br />
Jorge or someone should post this to sugar-devel@.<br />
<br />
<br />
== Rejected new features ==<br />
<br />
sugar/backup-translations.patch<br />
sugar/backup-0001-Volumes-Backup-and-Restore.patch<br />
sugar/backup-0002-Journal-XS-backup-and-restore.patch<br />
sugar/backup-0005-save-lease.patch<br />
sugar/journal-0001-Processdialog-prerequisite-check-support.patch<br />
sugar-artwork/gmartin-School-Server-Icon.patch<br />
<br />
This series implements easy backup and restore of the journal to<br />
removable media and schoolservers. It has been submitted for review,<br />
but upstream found it unacceptable for various reasons. Uruguay and<br />
Paraguay like this feature the way it is, so these patches remain<br />
off-tree.<br />
<br />
<br />
sugar/use-the-spanish-verb-quitar-for-unmounting-devices.patch<br />
<br />
Better-than-nothing patch, but the real fix would require a gettext<br />
kludge in the code (see http://bugs.python.org/issue2504 )<br />
<br />
<br />
sugar/cpu-and-memory-resource-indicator.patch<br />
sugar-artwork/cpu-and-memory-indicator-icons.patch<br />
<br />
See sl#2141. This is seen as another geek's toy, but geeks could simply<br />
cat /proc/meminfo... users really need a simple way to see why the XO<br />
isn't performing well with too many open activities.<br />
<br />
<br />
sugar/dynamically-set-number-of-control-panel-columns.patch<br />
<br />
The approach to compute the column width is wrong, but it produces better<br />
results than the current fixed number of columns. So, for now, I'm keeping<br />
this better-than-nothing fix.<br />
<br />
== Unreviewed new features ==<br />
<br />
sugar/restart-option.patch<br />
<br />
We're doing good progress in sl#1206.<br />
<br />
<br />
== Unsubmitted new features ==<br />
<br />
sugar/accessibility_0001_cp_accessibility_keyboard.patch<br />
sugar/accessibility_0002_magnifier_extension.patch<br />
sugar/accessibility_0003_cp_accessibility_contrast.patch<br />
sugar/accessibility_0004_cp_accessibility_mouse.patch<br />
sugar/accessibility_0005_cp_accessibility_capital_letters.patch<br />
sugar/accessibility_0006_virtualkeyboard.patch<br />
sugar/accessibility_0007_cp_translations.patch<br />
sugar/accessibility_0008_cp_show-virtualkeyboard-for-accessibility.patch<br />
sugar/accessibility_0009_cp_show-virtualkeyboard-for-accessibility-traslate.patch<br />
sugar-artwork/accessibility_0001_contrast.patch<br />
sugar-artwork/accessibility_0002_virtualkeyboard_icon.patch<br />
sugar-toolkit/accessibility_0001_style-contrast.patch<br />
<br />
Accessibility features developed in Uruguay. These have not been submitted<br />
for review yet. http://wiki.sugarlabs.org/go/File:Dextrose_teclado_virtual.png<br />
<br />
sugar/microformat-updater.patch<br />
<br />
This is a backend for the new Sugar activity updater, implementing the<br />
olpc microformat protocol which is used by several deployments.<br />
<br />
<br />
sugar/gsm-errors-palette.patch<br />
<br />
Improves diagnostic messages for GSM dongles.<br />
<br />
<br />
sugar/sl2006-touchpad-device-on-frame.patch<br />
sugar-artwork/sl2006-icons-for-touchpad-panel.patch<br />
<br />
Walter's XO-1 touchpad control panel. It would be nice to add a global<br />
shortcut such as alt-shift-T.<br />
<br />
<br />
== Unreviewed cleanups ==<br />
<br />
sugar/simplify-the-definition-of-UpdateModel._bundles_to_check..patch<br />
<br />
Should be merged.<br />
<br />
<br />
sugar-toolkit/remove-incomplete-MANIFEST-support.patch<br />
<br />
The incomplete design and implementation of MANIFEST files has been laying<br />
around for 3 years. We can choose to clean it up now, or let it bitrot for<br />
another 3 years. Posted some time ago to sugar-devel, nobody reviewed it.<br />
<br />
<br />
== Experimental Patches ==<br />
<br />
sugar-toolkit/change-keep-string-to-keep-a-copy.patch<br />
sugar-toolkit/keep_a_copy_translation_missing.patch<br />
<br />
Several alternatives have been suggested on the list, but nobody implemented<br />
them, so this one still stands.<br />
<br />
<br />
sugar-toolkit/kill-the-delayed-menus-for-good.patch<br />
<br />
This change has been at the center of a huge design / UX / testing flame war a<br />
while ago. I've merged it to observe user reactions, so<br />
hopefully we can have a polite discussion based on some real data.<br />
<br />
<br />
sugar-toolkit/sugar-toolkit-dont-configure-fonts.patch<br />
sugar/sugar-enable-settings-manager.patch<br />
<br />
We had to temporarily exclude these because sugar-settings-manager does<br />
not play well with xulrunner in F11.<br />
<br />
sugar/add-font-dpi-schema.patch<br />
<br />
This is a companion patch of a fix sugar-settings-manager which has<br />
already landed in git. It's needed by xulrunner (Browse).<br />
<br />
<br />
sugar/set-default-scaling-to-100.patch<br />
<br />
This is only required on the XO. We should really autodetect this.<br />
<br />
<br />
== Disabled and obsolete patches ==<br />
<br />
sugar-toolkit/sl1948-Race-condition-with-name-widget-in-the-activ.patch<br />
<br />
Erikos came up with a better fix in sl#1948. Should test it.<br />
<br />
<br />
sugar/sl1814-consolidate-activity-launch-entry-point.patch<br />
<br />
This also fixes sl#1719, which I've definitely seen happen in Dextrose.<br />
I don't know why this patch is disabled in our spec file, it should probably<br />
be retested.<br />
<br />
sugar/click-on-journal-icons-with-a-exclusive-time-frame.patch<br />
<br />
Requested by the Waveplace folks. This should be dropped once we get the<br />
proper fix for sl#1719 (see above).<br />
<br />
<br />
sugar/backup-0003-Journal-documents-volume-button.patch<br />
<br />
We no longer need this feature since we decided to disable Gnome, other<br />
deployments may find it useful. (but journal crashes when you drop files on<br />
the icon)<br />
<br />
<br />
sugar/pe558-modify-volumnestoolbar-to-mount-a-directory.patch<br />
<br />
This makes it possible to easily exchange documents with Gnome.<br />
Since we don't ship Gnome any more, we dropped this feature.h<br />
<br />
sugar/pe558-backup-restore-front-end-for-control-panel.patch<br />
sugar/pe558-add-option-to-mount-any-user-directory-to-journal.patch<br />
sugar/pe558-journal-management-control-panel-feature.patch<br />
<br />
This patch series has been replaced by Tincho's Journal-based backup/restore<br />
functionality. Keeping them around in case someone else prefers the control<br />
panel UI.<br />
<br />
sugar/fix-name-clash-set_state.patch<br />
<br />
This isn't strictly needed on 0.88, but it's confusing</div>
Bernie