[Xerte-dev] Re: Released several fixes to 3.01

[Fay Cross]

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.

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.

Thanks


From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Tom Reijnders
Sent: 24 August 2015 09:32
To: For Xerte technical developers
Subject: [Xerte-dev] Released several fixes to 3.01

L.S.,

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...).

Everything is also merged into develop.

As a reminder, if you know a fix has to end up in the current release, you should:

  1.  create a hotfix branch of master
  2.  implement the fix
  3.  test test test
  4.  merge the hotfix branch into master and into develop

Only do this for fatal bugs.
Regards,

Tom



--

--



Tom Reijnders

TOR Informatica

Chopinlaan 27

5242HM Rosmalen

Tel: 073 5226191

Fax: 073 5226196


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20150909/9fb4c999/attachment.html>