[Xerte-dev] Re: 2.1
Tom Reijnders
reijnders at tor.nl
Wed Nov 6 15:28:47 GMT 2013
Done:
1. Created new local branch
git branch hotfix_2.1_import
2. Pushed to github
git push origin hotfix_2.1_import
3. Make sure it gets tracked automatically:
git branch --set-upstream-to hotfix_2.1_import origin/hotfix_2.1_import
4. Checkout new branch
git checkout hotfix_2.1_import
5. Do the fix, test, add and commit fix to hotfix branch hotfix_2.1_import
6. Merge
git checkout develop
git merge hotfix_2.1_import
git checkout master
git merge hotfix_2.1_import
7. Push fix to github
git push
Julian Tenney schreef op 6-11-2013 15:47:
>
> OK!
>
> *From:*xerte-dev-bounces at lists.nottingham.ac.uk
> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of *Tom
> Reijnders
> *Sent:* 06 November 2013 14:42
> *To:* For Xerte technical developers
> *Subject:* [Xerte-dev] Re: 2.1
>
> Hmm...
>
> I think I have another hotfix coming up...
>
> I deployed 2.1 to the same server as where the community website is
> running on, and import isn't working because of the fact that
> ZipArchive isn't supported in php on that machine. I want to get rid
> of that dependency, as we use another class for the actual unzipping
> anyways.
>
> Tom
>
> Tom Reijnders schreef op 4-11-2013 17:31:
>
> The2.1 zip is on the community website, but I haven't had the
> opportunity yet to test it, and to make sure it works as expected.....
>
> Julian Tenney schreef op 4-11-2013 14:45:
>
> Nice one, thanks for your help everybody. Another step forward!
>
> *From:*xerte-dev-bounces at lists.nottingham.ac.uk
> <mailto:xerte-dev-bounces at lists.nottingham.ac.uk>
> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf
> Of *Tom Reijnders
> *Sent:* 04 November 2013 13:37
> *To:* For Xerte technical developers
> *Subject:* [Xerte-dev] Re: 2.1
>
> 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)
>
> You have to specify --tags to the push command, to be able to
> set the tag on github as well.
>
> All seems to be fine now, so I'll try to get 2.1 uploaded to
> the website!
>
> Tom
>
> Julian Tenney schreef op 4-11-2013 14:25:
>
> 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.
>
> So master is now develop is now 2.1 and tagged.
>
> Can you please check it looks as you think it should look?
>
> Many thanks,
>
> J
>
> *From:*xerte-dev-bounces at lists.nottingham.ac.uk
> <mailto:xerte-dev-bounces at lists.nottingham.ac.uk>
> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] *On
> Behalf Of *Tom Reijnders
> *Sent:* 04 November 2013 12:36
> *To:* For Xerte technical developers
> *Subject:* [Xerte-dev] Re: 2.1
>
> Yes!
>
> Give me a heads up when git is ready (i.e. 2.1 is merged
> into development again).
> And it needs to merged into master.
> 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.
>
> Tom
>
>
>
> Julian Tenney schreef op 4-11-2013 13:32:
>
> Shall we go for it then?
>
> *From:*xerte-dev-bounces at lists.nottingham.ac.uk
> <mailto:xerte-dev-bounces at lists.nottingham.ac.uk>
> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] *On
> Behalf Of *Smith, John
> *Sent:* 04 November 2013 10:30
> *To:* For Xerte technical developers
> *Subject:* [Xerte-dev] Re: 2.1
>
> Nor do I...
>
> Regards,
>
> John Smith
>
> Learning Technologist
>
> School of Health & Life Sciences
>
> Glasgow Caledonian University
>
> *From:*xerte-dev-bounces at lists.nottingham.ac.uk
> <mailto:xerte-dev-bounces at lists.nottingham.ac.uk>
> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] *On
> Behalf Of *Ron Mitchell
> *Sent:* Monday, November 04, 2013 10:25 AM
> *To:* For Xerte technical developers
> *Subject:* [Xerte-dev] Re: 2.1
>
> Me neither....
>
> Sent from my iPhone
>
>
> On 4 Nov 2013, at 10:21, Tom Reijnders
> <reijnders at tor.nl <mailto:reijnders at tor.nl>> wrote:
>
> I don't know of any showstoppers.
>
> Tom
>
> Julian Tenney schreef op 4-11-2013 10:57:
>
> How close do you think we are to the 2.1 release?
>
> 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.
>
> 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.
>
>
>
>
>
>
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk <mailto:Xerte-dev at lists.nottingham.ac.uk>
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
> --
>
> --
>
>
>
> Tom Reijnders
>
> TOR Informatica
>
> Chopinlaan 27
>
> 5242HM Rosmalen
>
> Tel: 073 5226191
>
> Fax: 073 5226196
>
>
>
> 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.
>
> 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.
>
> _______________________________________________
> Xerte-dev mailing list
> Xerte-dev at lists.nottingham.ac.uk
> <mailto:Xerte-dev at lists.nottingham.ac.uk>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
> 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.
>
> 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.
>
>
> Glasgow Caledonian University is a registered Scottish
> charity, number SC021474
>
> Winner: Times Higher Education's Widening
> Participation Initiative of the Year 2009 and Herald
> Society's Education Initiative of the Year 2009.
> http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,6219,en.html
>
> Winner: Times Higher Education's Outstanding Support
> for Early Career Researchers of the Year 2010, GCU as
> a lead with Universities Scotland partners.
> http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,15691,en.html
>
>
>
>
>
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk <mailto:Xerte-dev at lists.nottingham.ac.uk>
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
>
>
>
> --
>
> --
>
>
>
> Tom Reijnders
>
> TOR Informatica
>
> Chopinlaan 27
>
> 5242HM Rosmalen
>
> Tel: 073 5226191
>
> Fax: 073 5226196
>
>
>
> 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.
>
> 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.
>
>
>
>
>
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk <mailto:Xerte-dev at lists.nottingham.ac.uk>
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
>
>
> --
>
> --
>
>
>
> Tom Reijnders
>
> TOR Informatica
>
> Chopinlaan 27
>
> 5242HM Rosmalen
>
> Tel: 073 5226191
>
> Fax: 073 5226196
>
>
>
> 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.
>
> 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.
>
>
>
>
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk <mailto:Xerte-dev at lists.nottingham.ac.uk>
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
>
> --
>
> --
>
>
>
> Tom Reijnders
>
> TOR Informatica
>
> Chopinlaan 27
>
> 5242HM Rosmalen
>
> Tel: 073 5226191
>
> Fax: 073 5226196
>
>
>
> 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.
>
> 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.
>
>
>
>
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk <mailto:Xerte-dev at lists.nottingham.ac.uk>
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
>
> --
> --
>
> Tom Reijnders
> TOR Informatica
> Chopinlaan 27
> 5242HM Rosmalen
> Tel: 073 5226191
> Fax: 073 5226196
>
>
> 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.
>
> 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.
>
>
>
>
> _______________________________________________
> Xerte-dev mailing list
> Xerte-dev at lists.nottingham.ac.uk
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
--
--
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/20131106/8d87c1ef/attachment-0001.html>
More information about the Xerte-dev
mailing list