<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:Consolas;
panose-1:2 11 6 9 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p
{mso-style-priority:99;
mso-margin-top-alt:auto;
margin-right:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
pre
{mso-style-priority:99;
mso-style-link:"HTML Preformatted Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:10.0pt;
font-family:"Courier New";}
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
{mso-style-priority:99;
mso-style-link:"Balloon Text Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:8.0pt;
font-family:"Tahoma","sans-serif";}
span.HTMLPreformattedChar
{mso-style-name:"HTML Preformatted Char";
mso-style-priority:99;
mso-style-link:"HTML Preformatted";
font-family:Consolas;
mso-fareast-language:EN-GB;}
span.EmailStyle21
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.BalloonTextChar
{mso-style-name:"Balloon Text Char";
mso-style-priority:99;
mso-style-link:"Balloon Text";
font-family:"Tahoma","sans-serif";
mso-fareast-language:EN-GB;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
/* List Definitions */
@list l0
{mso-list-id:299263364;
mso-list-template-ids:-1986127840;}
ol
{margin-bottom:0cm;}
ul
{margin-bottom:0cm;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-GB" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Thanks Tom. I created a new hotfix branch yesterday with the fix in. I’ve tested it a fair bit and it’s on our installation and seems to be ok. I’ll leave it
until next week before merging it just in case.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Fay<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> xerte-dev-bounces@lists.nottingham.ac.uk [mailto:xerte-dev-bounces@lists.nottingham.ac.uk]
<b>On Behalf Of </b>Tom Reijnders<br>
<b>Sent:</b> 09 September 2015 15:40<br>
<b>To:</b> For Xerte technical developers<br>
<b>Subject:</b> [Xerte-dev] Re: Released several fixes to 3.01<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Yes, that's really the best. If you fix it in devlop, and also separately in master, we could end up with conflicts when trying to merge develop into master again.<br>
<br>
If it's really a 1 line fix, you could also consider to fix it in master, and merge into develop.
<br>
<br>
You generally want to do the fix on a hotfix branch (from master), push it to github, ask others to review, cq. test it, and than merge into master and develop.<br>
<br>
Tom<br>
<br>
<br>
On Wed, 9 Sep 2015 14:16:41 +0000 Fay Cross <<a href="mailto:Fay.Cross@nottingham.ac.uk">Fay.Cross@nottingham.ac.uk</a>> wrote
<o:p></o:p></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 8.0pt">
<div>
<p><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">I’m pretty sure there’s a problem in this line breaks hotfix code. From what I can work out toolbox.js goes through every page’s attributes and if the XML is from the old editor
it calls addLineBreaks function to look at whether the attribute text needs to be adjusted so line breaks aren’t lost. This works ok for text stored in an attribute but not where the text is in the CDATA (e.g. text, bullets, advanced image pages). I don’t
think text in here is being looked at.</span><o:p></o:p></p>
<p> <o:p></o:p></p>
<p><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">I can fix this – should I do it in another hotfix then? And then merge into master like below? It will just be a change to 1 file. I just wanted to check as I’ve only made changes
in develop before.</span><o:p></o:p></p>
<p> <o:p></o:p></p>
<p><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Thanks</span><o:p></o:p></p>
<p> <o:p></o:p></p>
<p> <o:p></o:p></p>
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p><strong><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></strong><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">
<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a> [<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">mailto:xerte-dev-bounces@lists.nottingham.ac.uk</a>]
<strong><span style="font-family:"Tahoma","sans-serif"">On Behalf Of </span></strong>Tom Reijnders<br>
<strong><span style="font-family:"Tahoma","sans-serif"">Sent:</span></strong> 24 August 2015 09:32<br>
<strong><span style="font-family:"Tahoma","sans-serif"">To:</span></strong> For Xerte technical developers<br>
<strong><span style="font-family:"Tahoma","sans-serif"">Subject:</span></strong> [Xerte-dev] Released several fixes to 3.01</span><o:p></o:p></p>
</div>
</div>
<p> <o:p></o:p></p>
<p>L.S.,<br>
<br>
Over the weekend, I merged the hotfix branch (linebreaks) and several fixes done on develop into master (3.0) and set a annotated tag v3.01. Effectively this means that vesion.txt now shows 3.0 (v3.01...).<br>
<br>
Everything is also merged into develop.<br>
<br>
As a reminder, if you know a fix has to end up in the current release, you should:<o:p></o:p></p>
<ol start="1" type="1">
<li class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;mso-list:l0 level1 lfo1">
create a hotfix branch of master<o:p></o:p></li><li class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;mso-list:l0 level1 lfo1">
implement the fix<o:p></o:p></li><li class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;mso-list:l0 level1 lfo1">
test test test<o:p></o:p></li><li class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;mso-list:l0 level1 lfo1">
merge the hotfix branch into master and into develop<o:p></o:p></li></ol>
<p>Only do this for fatal bugs.<o:p></o:p></p>
<p style="margin-bottom:12.0pt">Regards,<br>
<br>
Tom<br>
<br>
<o:p></o:p></p>
<pre>-- <o:p></o:p></pre>
<pre>--<o:p></o:p></pre>
<pre> <o:p></o:p></pre>
<p> <o:p></o:p></p>
<pre>Tom Reijnders<o:p></o:p></pre>
<pre>TOR Informatica<o:p></o:p></pre>
<pre>Chopinlaan 27<o:p></o:p></pre>
<pre>5242HM Rosmalen<o:p></o:p></pre>
<pre>Tel: 073 5226191<o:p></o:p></pre>
<pre>Fax: 073 5226196<o:p></o:p></pre>
<pre> <o:p></o:p></pre>
<p> <o:p></o:p></p>
</div>
<pre><o:p> </o:p></pre>
<pre><o:p> </o:p></pre>
<pre>This message and any attachment are intended solely for the addressee<o:p></o:p></pre>
<pre>and may contain confidential information. If you have received this<o:p></o:p></pre>
<pre>message in error, please send it back to me, and immediately delete it. <o:p></o:p></pre>
<pre><o:p> </o:p></pre>
<pre>Please do not use, copy or disclose the information contained in this<o:p></o:p></pre>
<pre>message or in any attachment. Any views or opinions expressed by the<o:p></o:p></pre>
<pre>author of this email do not necessarily reflect the views of the<o:p></o:p></pre>
<pre>University of Nottingham.<o:p></o:p></pre>
<pre><o:p> </o:p></pre>
<pre>This message has been checked for viruses but the contents of an<o:p></o:p></pre>
<pre>attachment may still contain software viruses which could damage your<o:p></o:p></pre>
<pre>computer system, you are advised to perform your own checks. Email<o:p></o:p></pre>
<pre>communications with the University of Nottingham may be monitored as<o:p></o:p></pre>
<pre>permitted by UK legislation.<o:p></o:p></pre>
</div>
</div>
</body>
</html>