OK. I have managed to find all your changes (5-6 commits scattered throughout the code) and apply them to my current master. Git question: How do apply all of my commits on my master back to my fork of your fork so I can make the pull request?
-walter On Wed, Mar 22, 2017 at 5:48 PM, Lionel Laské <[email protected]> wrote: > > I don't remember that I've done change in TurtleJS recently. > In my mind the last thing changed was the integration done by Michaël two > years ago (specifically the Stop button). > If you've got it and if TurtleJS works on Chrome, Firefox, Safari and > EDGE, I'm confident that it will work on Sugarizer. > > Lionel. > > > 2017-03-22 22:35 GMT+01:00 Walter Bender <[email protected]>: > >> >> >> On Wed, Mar 22, 2017 at 4:56 PM, Lionel Laské <[email protected]> >> wrote: >> >>> >>> You're right Sugarizer include a set of activities because my top >>> priority is to simplify deployment and testing. So put activities outside >>> of the Sugarizer repository would be too complex. >>> >>> BTW each activity author should maintain its own repository for this >>> activity. For example, the Abacus activity is maintain be Eon here [1]. >>> In Sugarizer, each activity is store in its own subdirectory under the >>> Sugarizer "activities" directory. This subdirectory is just a copy of the >>> activity repository content. If an activity change, the author has just to >>> recopy all files in its own Sugarizer subdirectory then send to me a pull >>> request (to the dev branch). >>> Conversely, if for compatibility reason I need to change something in an >>> activity, I sent myself a PR to the author repository. For example, I've >>> slightly adapted Abacus for Android/iOS so I sent a PR to Eon here >>> >> >> Good in theory, but it appears that there are commits to Turtle that you >> never pushed back to me, so I am stuck. That is what triggered my question >> about process. >> >> -walter >> >> >>> [2]. So at end both repositories are synced. >>> >>> I will write this rules in the README so it will be clear. >>> >>> Lionel. >>> >>> >>> [1] https://github.com/eohomegrownapps/abacus-activity >>> [2] https://github.com/eohomegrownapps/abacus-activity/pull/ >>> 1#event-1008961890 >>> >>> >>> 2017-03-21 23:23 GMT+01:00 <[email protected]>: >>>> >>>> Date: Tue, 21 Mar 2017 18:16:13 -0400 >>>> From: Walter Bender <[email protected]> >>>> To: Lionel Laské <[email protected]> >>>> Cc: Sugar-dev Devel <[email protected]>, "Community >>>> Support Volunteers -- who help respond to help AT laptop.org" >>>> <[email protected]>, iaep <[email protected] >>>> > >>>> Subject: Re: [Sugar-devel] Sugarizer dev platform is now open >>>> Message-ID: >>>> <[email protected] >>>> ail.com> >>>> Content-Type: text/plain; charset="utf-8" >>>> >>>> >>>> I don't understand what is your model for maintaining activities. It >>>> seems >>>> everything is on one big repo and that you have scattershot changes in >>>> various activities, which are not sent to the upstream masters. How can >>>> make a PR to give you the latest Turtle Blocks bits without having to >>>> sort >>>> through your commit history to find all of your changes? Seems to put an >>>> extra burden on activity authors. What am I not understanding? Is there >>>> any >>>> documentation as to how you want activity authors to keep in sync with >>>> Sugarizer changes? >>>> >>>> -walter >>>> >>>> On Mon, Mar 20, 2017 at 5:48 PM, Lionel Laské <[email protected]> >>>> wrote: >>>> >>>> > >>>> > Hi all, >>>> > >>>> > >>>> > >>>> > Currently, Sugarizer is released about one time by year. >>>> > >>>> > I know that it's slow but it take us lot of time to test and package >>>> new >>>> > features and activities on all supported platforms. >>>> > >>>> > >>>> > >>>> > To give you a faster view of change in Sugarizer, I've decided to >>>> open a >>>> > new server dedicated to the development branch. >>>> > >>>> > >>>> > >>>> > So, the branch "master" [1] is now the stable and ready-to-production >>>> > version and could be tested on http://try.sugarizer.org >>>> > >>>> > And the branch "dev" [2] is now the development version (*) - and >>>> > potentially unstable - and could be tested on the new >>>> > http://dev.sugarizer.org >>>> > >>>> > >>>> > >>>> > If you're curious you could discover today on the dev branch: the >>>> great >>>> > ColorMyWorld activity from Charles Cossé and the nice port of >>>> XOEditor, >>>> > Reflection and Abacus activities by the GCI student Euan Ong. >>>> > >>>> > >>>> > >>>> > Sugarizer is growing every day: stay in touch ! >>>> > >>>> > >>>> > >>>> > Best regards from France. >>>> > >>>> > >>>> > >>>> > Lionel. >>>> > >>>> > >>>> > >>>> > [1] https://github.com/llaske/sugarizer/tree/master >>>> > >>>> > [2] https://github.com/llaske/sugarizer/tree/dev >>>> > >>>> > (*) So if you're a developer and want to contribute to Sugarizer, send >>>> > your PR to the dev branch >>>> > >>>> >>> >>> _______________________________________________ >>> Sugar-devel mailing list >>> [email protected] >>> http://lists.sugarlabs.org/listinfo/sugar-devel >>> >>> >> >> >> -- >> Walter Bender >> Sugar Labs >> http://www.sugarlabs.org >> <http://www.sugarlabs.org> >> > > -- Walter Bender Sugar Labs http://www.sugarlabs.org <http://www.sugarlabs.org>
_______________________________________________ Sugar-devel mailing list [email protected] http://lists.sugarlabs.org/listinfo/sugar-devel
