[Xerte-dev] Re: is this thing on?

Mon Mar 17 11:15:39 GMT 2014

in develop.

We try to follow this scheme:

http://nvie.com/posts/a-successful-git-branching-model/

So the current release (currently 2.1) is always on master.

Tom

David Goodwin schreef op 17-3-2014 11:19:
> Where is development happening these days and which branch(es)?
>
> David.
>
>
>> Julian Tenney <mailto:Julian.Tenney at nottingham.ac.uk>
>> 17 March 2014 09:48
>>
>> I've pulled them in, thanks,
>>
>> *From:*xerte-dev-bounces at lists.nottingham.ac.uk 
>> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of 
>> *David Goodwin
>> *Sent:* 14 March 2014 16:44
>> *To:* For Xerte technical developers
>> *Subject:* [Xerte-dev] Re: is this thing on?
>>
>> ....
>>
>> I installed XOT 2.1 via the zip file on the website.
>>
>> Pale Purple's XOT repo thing on github which has my random commits in 
>> it - https://github.com/palepurple/xerteonlinetoolkits
>>
>> Thing I cloned from - 
>> https://github.com/thexerteproject/xerteonlinetoolkits
>>
>> Pull request - 
>> https://github.com/thexerteproject/xerteonlinetoolkits/pull/51
>>
>>
>> [ I've probably made my changes in the wrong branch / repository. ]
>>
>> thanks
>> David.
>>
>>
>> *David Goodwin* <mailto:david at palepurple.co.uk>
>>
>> 14 March 2014 16:40
>>
>> Well, to split it up into multiple emails (and not embedding any 
>> URLs, assuming that's what iCritical didn't like).
>>
>>
>> I have installed XOT 2.1 for a customer.
>>
>> There were bugs. I've submitted a push (or pull?) request to the 
>> github repo. Is this the right place to submit to?
>>
>> Fixed -
>>
>>  * Html5 display/rendering - issue with jQuery/jQuery UI.
>>  * Properties window not working / some tabs looking blank; fixed 
>> error handling
>>  * Fixed a few undefined variables
>>  * Fixed some possible sql injections.
>>
>> The pull request thing is on github somewhere. It shouldn't be too 
>> difficult to find I'd hope. I'll see if this email gets through and 
>> follow up with a URL or two.... if it does.
>>
>> David.
>>
>> *Julian Tenney* <mailto:Julian.Tenney at nottingham.ac.uk>
>>
>> 14 March 2014 16:05
>>
>> Ah. Odd.
>>
>> *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 
>> *David Goodwin
>> *Sent:* 14 March 2014 16:02
>> *To:* For Xerte technical developers
>> *Subject:* [Xerte-dev] Re: is this thing on?
>>
>> No. I sent my email about github etc about 30 mins ago. I think 
>> icritical doesn't like the github links in it or something?
>>
>> David.
>>
>> -- 
>> Pale Purple Ltd
>> 0845 0046746 | 07792 380669
>>
>> http://www.palepurple.co.uk
>> @PalePurpleLtd
>>
>> _______________________________________________
>> Xerte-dev mailing list
>> Xerte-dev at lists.nottingham.ac.uk
>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>> David Goodwin <mailto:david at palepurple.co.uk>
>> 14 March 2014 16:44
>> ....
>>
>> I installed XOT 2.1 via the zip file on the website.
>>
>> Pale Purple's XOT repo thing on github which has my random commits in 
>> it - https://github.com/palepurple/xerteonlinetoolkits
>>
>> Thing I cloned from - 
>> https://github.com/thexerteproject/xerteonlinetoolkits
>>
>> Pull request - 
>> https://github.com/thexerteproject/xerteonlinetoolkits/pull/51
>>
>>
>> [ I've probably made my changes in the wrong branch / repository. ]
>>
>> thanks
>> David.
>>
>>
>> _______________________________________________
>> Xerte-dev mailing list
>> Xerte-dev at lists.nottingham.ac.uk
>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>> David Goodwin <mailto:david at palepurple.co.uk>
>> 14 March 2014 16:40
>> Well, to split it up into multiple emails (and not embedding any 
>> URLs, assuming that's what iCritical didn't like).
>>
>>
>> I have installed XOT 2.1 for a customer.
>>
>> There were bugs. I've submitted a push (or pull?) request to the 
>> github repo. Is this the right place to submit to?
>>
>> Fixed -
>>
>>  * Html5 display/rendering - issue with jQuery/jQuery UI.
>>  * Properties window not working / some tabs looking blank; fixed 
>> error handling
>>  * Fixed a few undefined variables
>>  * Fixed some possible sql injections.
>>
>> The pull request thing is on github somewhere. It shouldn't be too 
>> difficult to find I'd hope. I'll see if this email gets through and 
>> follow up with a URL or two.... if it does.
>>
>> David.
>>
>>
>> _______________________________________________
>> Xerte-dev mailing list
>> Xerte-dev at lists.nottingham.ac.uk
>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>> Julian Tenney <mailto:Julian.Tenney at nottingham.ac.uk>
>> 14 March 2014 16:05
>>
>> Ah. Odd.
>>
>> *From:*xerte-dev-bounces at lists.nottingham.ac.uk 
>> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of 
>> *David Goodwin
>> *Sent:* 14 March 2014 16:02
>> *To:* For Xerte technical developers
>> *Subject:* [Xerte-dev] Re: is this thing on?
>>
>> No. I sent my email about github etc about 30 mins ago. I think 
>> icritical doesn't like the github links in it or something?
>>
>> David.
>>
>>
>> *Julian Tenney* <mailto:Julian.Tenney at nottingham.ac.uk>
>>
>> 14 March 2014 15:55
>>
>> Crikey, you still typin'?
>>
>> *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 
>> *David Goodwin
>> *Sent:* 14 March 2014 14:55
>> *To:* For Xerte technical developers
>> *Subject:* [Xerte-dev] Re: is this thing on?
>>
>> Thank you :) Now for a more on topic email....
>>
>> -- 
>> Pale Purple Ltd
>> 0845 0046746 | 07792 380669
>>
>> http://www.palepurple.co.uk
>> @PalePurpleLtd
>>
>> _______________________________________________
>> Xerte-dev mailing list
>> Xerte-dev at lists.nottingham.ac.uk
>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>> David Goodwin <mailto:david at palepurple.co.uk>
>> 14 March 2014 16:02
>> No. I sent my email about github etc about 30 mins ago. I think 
>> icritical doesn't like the github links in it or something?
>>
>> David.
>>
>>
>> _______________________________________________
>> Xerte-dev mailing list
>> Xerte-dev at lists.nottingham.ac.uk
>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
> -- 
> Pale Purple Ltd
> 0845 0046746 | 07792 380669
>
> http://www.palepurple.co.uk
> @PalePurpleLtd
>
>
> _______________________________________________
> 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/20140317/3118997e/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: compose-unknown-contact.jpg
Type: image/jpeg
Size: 770 bytes
Desc: not available
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20140317/3118997e/attachment-0004.jpg>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.jpg
Type: image/jpeg
Size: 1170 bytes
Desc: not available
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20140317/3118997e/attachment-0005.jpg>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.jpg
Type: image/jpeg
Size: 886 bytes
Desc: not available
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20140317/3118997e/attachment-0006.jpg>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: postbox-contact.jpg
Type: image/jpeg
Size: 1169 bytes
Desc: not available
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20140317/3118997e/attachment-0007.jpg>