<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
I had to set the tag, and mind you, it's really important to have a
tag name that is different from a branch name (so v2.1, i.s.o. 2.1)<br>
<br>
You have to specify --tags to the push command, to be able to set
the tag on github as well.<br>
<br>
All seems to be fine now, so I'll try to get 2.1 uploaded to the
website!<br>
<br>
Tom<br>
<br>
<div class="moz-cite-prefix">Julian Tenney schreef op 4-11-2013
14:25:<br>
</div>
<blockquote
cite="mid:12C67A1EEC419342AF5E59DA31562C3F0C886B7D82@EXCHANGE1.ad.nottingham.ac.uk"
type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1">
<meta name="Generator" content="Microsoft Word 14 (filtered
medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@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;}
@font-face
{font-family:"\@SimSun";
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"Times New Roman \, serif";
panose-1:0 0 0 0 0 0 0 0 0 0;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
color:black;}
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";
color:black;}
pre
{mso-style-priority:99;
mso-style-link:"HTML Preformatted Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:10.0pt;
font-family:"Courier New";
color:black;}
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";
color:black;}
span.HTMLPreformattedChar
{mso-style-name:"HTML Preformatted Char";
mso-style-priority:99;
mso-style-link:"HTML Preformatted";
font-family:Consolas;}
span.BalloonTextChar
{mso-style-name:"Balloon Text Char";
mso-style-priority:99;
mso-style-link:"Balloon Text";
font-family:"Tahoma","sans-serif";}
span.EmailStyle22
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.EmailStyle23
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.EmailStyle24
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.EmailStyle25
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.EmailStyle26
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></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]-->
<div class="WordSection1">
<p class="MsoNormal"><span style="color:#1F497D">OK, as far as I
can tell I’ve just disabled Moscow’s traffic light system
and sent the international space sation into a slightly
wider orbit, and it’s entirely possible that along the way I
also managed to merge the various branches and create a tag.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">So master is
now develop is now 2.1 and tagged.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Can you please
check it looks as you think it should look?<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Many thanks,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">J<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #B5C4DF
1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:windowtext"
lang="EN-US">From:</span></b><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:windowtext"
lang="EN-US"> <a class="moz-txt-link-abbreviated" href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>
[<a class="moz-txt-link-freetext" href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">mailto:xerte-dev-bounces@lists.nottingham.ac.uk</a>] <b>On
Behalf Of </b>Tom Reijnders<br>
<b>Sent:</b> 04 November 2013 12:36<br>
<b>To:</b> For Xerte technical developers<br>
<b>Subject:</b> [Xerte-dev] Re: 2.1<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal" style="margin-bottom:12.0pt">Yes!<br>
<br>
Give me a heads up when git is ready (i.e. 2.1 is merged into
development again).<br>
And it needs to merged into master.<br>
We need (or I need) to set a tag v.2.1 to the merge point on
master, and I'll make sure we get a 2.1 release from master on
the Community Website.<br>
<br>
Tom<br>
<br>
<o:p></o:p></p>
<div>
<p class="MsoNormal">Julian Tenney schreef op 4-11-2013 13:32:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p class="MsoNormal"><span style="color:#1F497D">Shall we go
for it then?</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"> </span><o:p></o:p></p>
<div>
<div style="border:none;border-top:solid #B5C4DF
1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif""
lang="EN-US">From:</span></b><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif""
lang="EN-US"> <a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>
[<a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">mailto:xerte-dev-bounces@lists.nottingham.ac.uk</a>]
<b>On Behalf Of </b>Smith, John<br>
<b>Sent:</b> 04 November 2013 10:30<br>
<b>To:</b> For Xerte technical developers<br>
<b>Subject:</b> [Xerte-dev] Re: 2.1</span><o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D" lang="EN-US">Nor
do I…</span><o:p></o:p></p>
<div>
<p class="MsoNormal"><span style="color:#1F497D"
lang="EN-US"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"
lang="EN-US">Regards,</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"
lang="EN-US"> </span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"
lang="EN-US">John Smith</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"
lang="EN-US">Learning Technologist</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"
lang="EN-US">School of Health & Life Sciences</span><o:p></o:p></p>
<p class="MsoNormal"><span style="color:#1F497D"
lang="EN-US">Glasgow Caledonian University</span><o:p></o:p></p>
</div>
<p class="MsoNormal"><span style="color:#1F497D" lang="EN-US"> </span><o:p></o:p></p>
<div>
<div style="border:none;border-top:solid #B5C4DF
1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif""
lang="EN-US">From:</span></b><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif""
lang="EN-US"> <a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>
[<a moz-do-not-send="true"
href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">mailto:xerte-dev-bounces@lists.nottingham.ac.uk</a>]
<b>On Behalf Of </b>Ron Mitchell<br>
<b>Sent:</b> Monday, November 04, 2013 10:25 AM<br>
<b>To:</b> For Xerte technical developers<br>
<b>Subject:</b> [Xerte-dev] Re: 2.1</span><o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><span lang="EN-US"> </span><o:p></o:p></p>
<div>
<p class="MsoNormal"><span lang="EN-US">Me neither....<br>
<br>
Sent from my iPhone</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span
lang="EN-US"><br>
On 4 Nov 2013, at 10:21, Tom Reijnders <<a
moz-do-not-send="true" href="mailto:reijnders@tor.nl">reijnders@tor.nl</a>>
wrote:</span><o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span
lang="EN-US">I don't know of any showstoppers.<br>
<br>
Tom</span><o:p></o:p></p>
<div>
<p class="MsoNormal"><span lang="EN-US">Julian Tenney
schreef op 4-11-2013 10:57:</span><o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p class="MsoNormal"><span style="color:#1F497D"
lang="EN-US">How close do you think we are to the
2.1 release?</span><o:p></o:p></p>
<p class="MsoNormal"><span
style="font-size:12.0pt;font-family:"Times New
Roman , serif","serif"" lang="EN-US"> </span><o:p></o:p></p>
<p><span lang="EN-US">This message and any attachment
are intended solely for the addressee and may
contain confidential information. If you have
received this message in error, please send it back
to me, and immediately delete it. Please do not
use, copy or disclose the information contained in
this message or in any attachment. Any views or
opinions expressed by the author of this email do
not necessarily reflect the views of the University
of Nottingham.</span><o:p></o:p></p>
<p><span lang="EN-US">This message has been checked for
viruses but the contents of an attachment may still
contain software viruses which could damage your
computer system, you are advised to perform your own
checks. Email communications with the University of
Nottingham may be monitored as permitted by UK
legislation.</span><o:p></o:p></p>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span
style="font-size:12.0pt;font-family:"Times New
Roman , serif","serif"" lang="EN-US"><br>
<br>
<br>
<br>
</span><o:p></o:p></p>
<pre><span lang="EN-US">_______________________________________________</span><o:p></o:p></pre>
<pre><span lang="EN-US">Xerte-dev mailing list</span><o:p></o:p></pre>
<pre><span lang="EN-US"><a moz-do-not-send="true" href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a></span><o:p></o:p></pre>
<pre><span lang="EN-US"><a moz-do-not-send="true" href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a></span><o:p></o:p></pre>
</blockquote>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span
style="font-size:12.0pt;font-family:"Times New
Roman , serif","serif"" lang="EN-US"> </span><o:p></o:p></p>
<pre><span lang="EN-US">-- </span><o:p></o:p></pre>
<pre><span lang="EN-US">--</span><o:p></o:p></pre>
<pre><span lang="EN-US"> </span><o:p></o:p></pre>
<pre><span lang="EN-US">Tom Reijnders</span><o:p></o:p></pre>
<pre><span lang="EN-US">TOR Informatica</span><o:p></o:p></pre>
<pre><span lang="EN-US">Chopinlaan 27</span><o:p></o:p></pre>
<pre><span lang="EN-US">5242HM Rosmalen</span><o:p></o:p></pre>
<pre><span lang="EN-US">Tel: 073 5226191</span><o:p></o:p></pre>
<pre><span lang="EN-US">Fax: 073 5226196</span><o:p></o:p></pre>
<pre><span lang="EN-US"> </span><o:p></o:p></pre>
<p class="MsoNormal"><span
style="font-size:12.0pt;font-family:"Times New
Roman , serif","serif"" lang="EN-US"> </span><o:p></o:p></p>
<p><span lang="EN-US">This message and any attachment are
intended solely for the addressee and may contain
confidential information. If you have received this
message in error, please send it back to me, and
immediately delete it. Please do not use, copy or
disclose the information contained in this message or
in any attachment. Any views or opinions expressed by
the author of this email do not necessarily reflect
the views of the University of Nottingham.</span><o:p></o:p></p>
<p><span lang="EN-US">This message has been checked for
viruses but the contents of an attachment may still
contain software viruses which could damage your
computer system, you are advised to perform your own
checks. Email communications with the University of
Nottingham may be monitored as permitted by UK
legislation.</span><o:p></o:p></p>
<p class="MsoNormal"><span
style="font-size:12.0pt;font-family:"Times New
Roman , serif","serif"" lang="EN-US"> </span><o:p></o:p></p>
</div>
</blockquote>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<div>
<p class="MsoNormal"><span
style="font-size:12.0pt;font-family:"Times New
Roman , serif","serif"" lang="EN-US">_______________________________________________<br>
Xerte-dev mailing list<br>
<a moz-do-not-send="true"
href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><br>
<a moz-do-not-send="true"
href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a></span><o:p></o:p></p>
</div>
</blockquote>
<p class="MsoNormal"><span
style="font-size:12.0pt;font-family:"Times New Roman
, serif","serif"" lang="EN-US"> </span><o:p></o:p></p>
<p><span lang="EN-US">This message and any attachment are
intended solely for the addressee and may contain
confidential information. If you have received this
message in error, please send it back to me, and
immediately delete it. Please do not use, copy or
disclose the information contained in this message or in
any attachment. Any views or opinions expressed by the
author of this email do not necessarily reflect the views
of the University of Nottingham.</span><o:p></o:p></p>
<p><span lang="EN-US">This message has been checked for
viruses but the contents of an attachment may still
contain software viruses which could damage your computer
system, you are advised to perform your own checks. Email
communications with the University of Nottingham may be
monitored as permitted by UK legislation.</span><o:p></o:p></p>
<p class="MsoNormal"><span
style="font-size:12.0pt;font-family:"Times New Roman
, serif","serif"" lang="EN-US"> </span><o:p></o:p></p>
<p class="MsoNormal"><span
style="font-size:12.0pt;font-family:"Times New Roman
, serif","serif"" lang="EN-US"><br>
</span><span
style="font-size:10.0pt;font-family:"Arial","sans-serif";color:gray"
lang="EN-US">Glasgow Caledonian University is a registered
Scottish charity, number SC021474<br>
<br>
Winner: Times Higher Education’s Widening Participation
Initiative of the Year 2009 and Herald Society’s Education
Initiative of the Year 2009.<br>
<a moz-do-not-send="true"
href="http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,6219,en.html">http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,6219,en.html</a><br>
<br>
Winner: Times Higher Education’s Outstanding Support for
Early Career Researchers of the Year 2010, GCU as a lead
with Universities Scotland partners.<br>
<a moz-do-not-send="true"
href="http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,15691,en.html">http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,15691,en.html</a></span><o:p></o:p></p>
<p class="MsoNormal"><span
style="font-size:12.0pt;font-family:"Times New
Roman","serif""><br>
<br>
<br>
<o:p></o:p></span></p>
<pre>_______________________________________________<o:p></o:p></pre>
<pre>Xerte-dev mailing list<o:p></o:p></pre>
<pre><a moz-do-not-send="true" href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><o:p></o:p></pre>
<pre><a moz-do-not-send="true" href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><o:p></o:p></pre>
</blockquote>
<p class="MsoNormal"><span
style="font-size:12.0pt;font-family:"Times New
Roman","serif""><br>
<br>
<o:p></o:p></span></p>
<pre>-- <o:p></o:p></pre>
<pre>--<o:p></o:p></pre>
<pre><o:p> </o:p></pre>
<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>
</div>
<br>
<p>This message and any attachment are intended solely for the
addressee and may contain confidential information. If you have
received this message in error, please send it back to me, and
immediately delete it. Please do not use, copy or disclose the
information contained in this message or in any attachment. Any
views or opinions expressed by the author of this email do not
necessarily reflect the views of the University of Nottingham.</p>
<p>This message has been checked for viruses but the contents of
an attachment may still contain software viruses which could
damage your computer system, you are advised to perform your own
checks. Email communications with the University of Nottingham
may be monitored as permitted by UK legislation.</p>
<br>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Xerte-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a>
<a class="moz-txt-link-freetext" href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
--
Tom Reijnders
TOR Informatica
Chopinlaan 27
5242HM Rosmalen
Tel: 073 5226191
Fax: 073 5226196
</pre>
</body>
</html>