Yes. I'll retag the JS and re-open the other tag issues in JIRA to re-copy the JS and and re-tag once that is done on the 2.6.x branch.
On 3/27/13 12:11 PM, "Jesse" <[email protected]> wrote: >Yeah, I originally did a merge by accident, I then force overwrote that >commit with just the change ... >All looks good now. > >So re-tag? > >@purplecabbage >risingj.com > > >On Wed, Mar 27, 2013 at 12:03 PM, Braden Shepherdson ><[email protected]>wrote: > >> Wait, what did you try to do? >> >> I just cherry-picked your commit into master and pushed it, so that's >> sorted. >> >> If you tried to merge (in either direction) then no, it wouldn't work, >>and >> we should never do that. >> >> Braden >> >> On Wed, Mar 27, 2013 at 2:46 PM, Jesse <[email protected]> wrote: >> >> > I just tried, seems I have pulled in the other commits though ... fml >> > >> > >> > >> > @purplecabbage >> > risingj.com >> > >> > >> > On Wed, Mar 27, 2013 at 11:43 AM, Braden Shepherdson < >> [email protected] >> > >wrote: >> > >> > > Sorry for the bug, Jesse :( >> > > >> > > I can commit a fix shortly. I'll cherry-pick it into 2.6.x and then >>we >> > can >> > > decide whether to retag rc1 or create rc2. >> > > >> > > Braden >> > > >> > > >> > > >> > > On Wed, Mar 27, 2013 at 2:29 PM, Filip Maj <[email protected]> wrote: >> > > >> > > > Since we haven't released anything yet, can we simply retag the >>rc1 >> and >> > > > push a new commit to the 2.6.x branches out there? >> > > > >> > > > On 3/27/13 11:25 AM, "Jesse" <[email protected]> wrote: >> > > > >> > > > >Windows platforms cannot load the JS generated by cordova-js. >> > > > >The deviceready event does not fire because of an exception >>fired in >> > the >> > > > >XHR loading code added by Braden here [1] >> > > > > >> > > > >If I wrap the XHR plugin loading code : >> > > > > >> > > > > try { >> > > > > // Try to XHR the cordova_plugins.json file >>asynchronously. >> > > > > ... >> > > > > >> > > > > } >> > > > > catch(err) >> > > > >{ >> > > > > finishPluginLoading(); >> > > > >} >> > > > > >> > > > >Then all is good. >> > > > >Do we re-tag, move on to rc2, or should I just patch WP7+WP8 ? >> > > > > >> > > > >Cheers, >> > > > > Jesse >> > > > > >> > > > > >> > > > > >> > > > > >> > > > > >> > > > >[1] >> > > > > >> > > > >> > > >> > >> >>https://git-wip-us.apache.org/repos/asf?p=cordova-js.git;a=commit;h=f97bd >>6 >> > > > >94da3364664776d79c5bbf5e914e8e4f5a >> > > > > >> > > > > >> > > > > >> > > > >@purplecabbage >> > > > >risingj.com >> > > > > >> > > > > >> > > > >On Fri, Mar 22, 2013 at 12:57 PM, Filip Maj <[email protected]> >>wrote: >> > > > > >> > > > >> It's under cordova-labs' jira branch. >> > > > >> >> > > > >> Start at line 151 of jira.js [1]. Increment the num_callbacks >>var. >> > > Check >> > > > >> out the flow a little bit to get an idea of what you need to >>do. >> > Then >> > > > >> copy/paste to add the new subtasks. >> > > > >> >> > > > >> Cathc me on gtalk if you have more qs. >> > > > >> >> > > > >> [1] >> > > > >> >> > > > >> >> > > >> https://git-wip-us.apache.org/repos/asf?p=cordova-labs.git;a=blob;f=jira >> > > > . >> > > > >>js >> > > > >> >> ;h=18a76980566e6972203b92ade12bb21f3a9d79a8;hb=refs/heads/jira#l151 >> > > > >> >> > > > >> On 3/22/13 11:35 AM, "Shazron" <[email protected]> wrote: >> > > > >> >> > > > >> >Hi Fil, >> > > > >> >Since cordova-osx is functional now -- how do I add JIRA >>tasks to >> > the >> > > > >> >script (not sure where it is exactly) you used to add subtasks >> for >> > a >> > > > >> >release? I want to add "Update www/ application for OS X" and >> > "Update >> > > > >> >JavaScript for OS X" sub-tasks. >> > > > >> > >> > > > >> > >> > > > >> >On Thu, Mar 21, 2013 at 10:09 AM, Filip Maj <[email protected]> >> wrote: >> > > > >> > >> > > > >> >> Alright folks, mobile-spec and cordova-js are tagged >>2.6.0rc1, >> > and >> > > > >>the >> > > > >> >> 2.6.x branches on both those repos are now pushed up. Gogo >> > release >> > > > >>mode! >> > > > >> >> >> > > > >> >> On 3/21/13 9:12 AM, "James Jong" <[email protected]> >>wrote: >> > > > >> >> >> > > > >> >> >Nice. Thanks Michal. >> > > > >> >> > >> > > > >> >> >-James Jong >> > > > >> >> > >> > > > >> >> >On Mar 21, 2013, at 11:57 AM, Michal Mocny < >> [email protected] >> > > >> > > > >> wrote: >> > > > >> >> > >> > > > >> >> >> Yes, the intent is to have living branches. We may also >> > > > >>cherry-pick >> > > > >> >> >> regressions back to more than just the current release. >> > > > >> >> >> >> > > > >> >> >> >> > > > >> >> >> On Thu, Mar 21, 2013 at 11:50 AM, James Jong >> > > > >><[email protected]> >> > > > >> >> >>wrote: >> > > > >> >> >> >> > > > >> >> >>> Thanks Braden. Is the intent to have 'living' branches >>for >> > > each >> > > > >> >>major >> > > > >> >> >>> release (e.g. 2.6, 3.0) which contain tags for release >> > > candidates >> > > > >> >>and >> > > > >> >> >>>minor >> > > > >> >> >>> revisions? So going forward we would have 2.6.x , >>3.0.x, >> ... >> > > > >> >>branches? >> > > > >> >> >>> >> > > > >> >> >>> -James Jong >> > > > >> >> >>> >> > > > >> >> >>> On Mar 21, 2013, at 10:36 AM, Braden Shepherdson >> > > > >> >><[email protected]> >> > > > >> >> >>> wrote: >> > > > >> >> >>> >> > > > >> >> >>>> I meant to send an email about this last night. Here's >>the >> > > > >> >> >>>>(high-level) >> > > > >> >> >>>> process we'll need to follow for each of the repos. >> > > > >> >> >>>> >> > > > >> >> >>>> Step 0: This time only, delete the 'next' branch. We're >> not >> > > > >>using >> > > > >> >>them >> > > > >> >> >>>> anymore, and they'll just add confusion. >> > > > >> >> >>>> Step 1: Checkout and pull master. >> > > > >> >> >>>> Step 2: git checkout -b 2.6.x (now you're on the new >> branch >> > > > >>2.6.x) >> > > > >> >> >>>> Step 3: tag 2.6.0.rc1 (on the 2.6.x branch) >> > > > >> >> >>>> Step 4: Push the branch and tag. >> > > > >> >> >>>> >> > > > >> >> >>>> NB: The branch is for the minor revision (ie. 2.6.x) >>not >> the >> > > > >>point >> > > > >> >> >>> release >> > > > >> >> >>>> (2.6.0). The branch will have tags called 2.6.0rc1, >> > 2.6.0rc2, >> > > > >>etc. >> > > > >> >>and >> > > > >> >> >>> then >> > > > >> >> >>>> 2.6.0. Any 2.6.1 that we do will be on this 2.6.x >>branch >> as >> > > > >>well, >> > > > >> >>just >> > > > >> >> >>>> adding more tags. >> > > > >> >> >>>> >> > > > >> >> >>>> Remember that commits always land in master first. >> > Regression >> > > > >>fixes >> > > > >> >> >>> should >> > > > >> >> >>>> be cherry-picked to 2.6.x after being committed to >>master. >> > > > >> >> >>>> >> > > > >> >> >>>> Braden >> > > > >> >> >>>> >> > > > >> >> >>>> >> > > > >> >> >>>> >> > > > >> >> >>>> >> > > > >> >> >>>> On Thu, Mar 21, 2013 at 10:17 AM, James Jong >> > > > >><[email protected] >> > > > >> > >> > > > >> >> >>> wrote: >> > > > >> >> >>>> >> > > > >> >> >>>>> Is the new release branching process for 2.6 posted >> > > somewhere? >> > > > >> I >> > > > >> >> >>>>>didn't >> > > > >> >> >>>>> see it searching through the emails. >> > > > >> >> >>>>> >> > > > >> >> >>>>> -James Jong >> > > > >> >> >>>>> >> > > > >> >> >>>>> On Mar 20, 2013, at 1:37 PM, Braden Shepherdson >> > > > >> >><[email protected] >> > > > >> >> > >> > > > >> >> >>>>> wrote: >> > > > >> >> >>>>> >> > > > >> >> >>>>>> My changes are in. >> > > > >> >> >>>>>> >> > > > >> >> >>>>>> >> > > > >> >> >>>>>> On Wed, Mar 20, 2013 at 1:24 PM, Filip Maj < >> [email protected] >> > > >> > > > >> wrote: >> > > > >> >> >>>>>> >> > > > >> >> >>>>>>> Alright sounds like we need to wait on those pull >>reqs. >> > > > >> >> >>>>>>> >> > > > >> >> >>>>>>> Braden, if you get it in time, great, otherwise, >>not a >> > big >> > > > >>deal. >> > > > >> >> >>>>>>> >> > > > >> >> >>>>>>> Related: can someone recap the newer >> > > > >>release/branching/tagging >> > > > >> >> >>> approach >> > > > >> >> >>>>> we >> > > > >> >> >>>>>>> talked about at the face-to-face (and let's decide >>if >> we >> > > > >>want to >> > > > >> >> >>>>>>>use >> > > > >> >> >>> it >> > > > >> >> >>>>> or >> > > > >> >> >>>>>>> not)? >> > > > >> >> >>>>>>> >> > > > >> >> >>>>>>> On 3/20/13 9:20 AM, "Shazron" <[email protected]> >> wrote: >> > > > >> >> >>>>>>> >> > > > >> >> >>>>>>>> I'm trying to get CB-52 for FileTransfer >> upload/download >> > > and >> > > > >> >>the >> > > > >> >> >>>>>>>> keyboardformaccessorybar re-fix in as well - also >> seeing >> > > if >> > > > >>the >> > > > >> >> >>>>>>>> FileTransfer mobile-spec stuff works to test. Was >> > planning >> > > > >>on >> > > > >> >> >>>>>>>>pulling >> > > > >> >> >>>>> in >> > > > >> >> >>>>>>>> the iOS pull requests but may not have time, but it >> > seems >> > > > >> >>Andrew >> > > > >> >> >>>>>>>>is >> > > > >> >> >>> on >> > > > >> >> >>>>> it >> > > > >> >> >>>>>>>> already :) >> > > > >> >> >>>>>>>> >> > > > >> >> >>>>>>>> >> > > > >> >> >>>>>>>> On Wed, Mar 20, 2013 at 8:50 AM, Braden Shepherdson >> > > > >> >> >>>>>>>> <[email protected]>wrote: >> > > > >> >> >>>>>>>> >> > > > >> >> >>>>>>>>> I'm working on rolling some of the plugin JS >>loading >> > > logic >> > > > >> >>into >> > > > >> >> >>>>>>>>> cordova-js. >> > > > >> >> >>>>>>>>> If that makes this release then it will be >>possible >> to >> > > play >> > > > >> >>with >> > > > >> >> >>>>> plugman >> > > > >> >> >>>>>>>>> without also needing bleeding-edge JS. Note that >>this >> > > logic >> > > > >> >> >>>>>>>>>won't be >> > > > >> >> >>>>>>>>> active >> > > > >> >> >>>>>>>>> if there are no plugins, so it shouldn't be a >> high-risk >> > > > >> >>change to >> > > > >> >> >>>>> slide >> > > > >> >> >>>>>>>>> in >> > > > >> >> >>>>>>>>> before a release. >> > > > >> >> >>>>>>>>> >> > > > >> >> >>>>>>>>> >> > > > >> >> >>>>>>>>> On Wed, Mar 20, 2013 at 11:20 AM, Andrew Grieve < >> > > > >> >> >>> [email protected] >> > > > >> >> >>>>>>>>>> wrote: >> > > > >> >> >>>>>>>>> >> > > > >> >> >>>>>>>>>> Time's feeling right for a release. >> > > > >> >> >>>>>>>>>> >> > > > >> >> >>>>>>>>>> I'm planning on going through pull requests >>today. >> > Makes >> > > > >> >>sense >> > > > >> >> >>>>>>>>>>to >> > > > >> >> >>> get >> > > > >> >> >>>>>>>>> those >> > > > >> >> >>>>>>>>>> all in before starting the release. >> > > > >> >> >>>>>>>>>> >> > > > >> >> >>>>>>>>>> >> > > > >> >> >>>>>>>>>> On Wed, Mar 20, 2013 at 6:49 AM, James Jong >> > > > >> >> >>>>>>>>>><[email protected]> >> > > > >> >> >>>>>>>>> wrote: >> > > > >> >> >>>>>>>>>> >> > > > >> >> >>>>>>>>>>> A couple of items I'd like to see get into 2.6: >> > > > >> >> >>>>>>>>>>> 1) Lorin's EXIF camera implementation >> > > > >> >> >>>>>>>>>>> >> > > > >> >> >>>>>>>>>>> 2) adding prompt dialog to the Notification API >> > > > >>(completed, >> > > > >> >> >>>>>>>>>>>just >> > > > >> >> >>>>>>>>> needs >> > > > >> >> >>>>>>>>> to >> > > > >> >> >>>>>>>>>>> be merged in) >> > > > >> >> >>>>>>>>>>> https://github.com/apache/cordova-docs/pull/24 >> > > > >> >> >>>>>>>>>>> https://github.com/apache/cordova-js/pull/21 >> > > > >> >> >>>>>>>>>>> https://github.com/apache/cordova-ios/pull/35 >> > > > >> >> >>>>>>>>>>> >>https://github.com/apache/cordova-android/pull/35 >> > > > >> >> >>>>>>>>>>> >> > https://github.com/apache/cordova-mobile-spec/pull/13 >> > > > >> >> >>>>>>>>>>> >> > > > >> >> >>>>>>>>>>> -James Jong >> > > > >> >> >>>>>>>>>>> >> > > > >> >> >>>>>>>>>>> On Mar 19, 2013, at 6:46 PM, Brian LeRoux < >> > [email protected]> >> > > > >> >>wrote: >> > > > >> >> >>>>>>>>>>> >> > > > >> >> >>>>>>>>>>>> Ya braden put that huge thread on the list w/ >>the >> > > docs.. >> > > > >> >> >>>>>>>>>>>> >> > > > >> >> >>>>>>>>>>>> On Tue, Mar 19, 2013 at 3:22 PM, Filip Maj >> > > > >><[email protected]> >> > > > >> >> >>> wrote: >> > > > >> >> >>>>>>>>>>>>> Haha have we even brought back the new method >>to >> > the >> > > > >>list >> > > > >> >> >>>>>>>>>>>>>since >> > > > >> >> >>>>>>>>> the >> > > > >> >> >>>>>>>>>> F2F? >> > > > >> >> >>>>>>>>>>>>> >> > > > >> >> >>>>>>>>>>>>> On 3/19/13 3:21 PM, "Brian LeRoux" >><[email protected]> >> > > wrote: >> > > > >> >> >>>>>>>>>>>>> >> > > > >> >> >>>>>>>>>>>>>> Yes, lets give this new method a go. >> > > > >> >> >>>>>>>>>>>>>> >> > > > >> >> >>>>>>>>>>>>>> On Tue, Mar 19, 2013 at 1:24 PM, Filip Maj >> > > > >> >><[email protected]> >> > > > >> >> >>>>>>>>> wrote: >> > > > >> >> >>>>>>>>>>>>>>> How we feeling for that? Are there any >> > outstanding >> > > > >> >>features >> > > > >> >> >>> out >> > > > >> >> >>>>>>>>>> there >> > > > >> >> >>>>>>>>>>>>>>> that >> > > > >> >> >>>>>>>>>>>>>>> are on the cusp of landing, or can we go >>into >> rc >> > + >> > > > >>test >> > > > >> >> >>>>>>>>>>>>>>>mode >> > > > >> >> >>>>>>>>>> soon-ish? >> > > > >> >> >>>>>>>>>>>>>>> >> > > > >> >> >>>>>>>>>>>>> >> > > > >> >> >>>>>>>>>>> >> > > > >> >> >>>>>>>>>>> >> > > > >> >> >>>>>>>>>> >> > > > >> >> >>>>>>>>> >> > > > >> >> >>>>>>> >> > > > >> >> >>>>>>> >> > > > >> >> >>>>> >> > > > >> >> >>>>> >> > > > >> >> >>> >> > > > >> >> >>> >> > > > >> >> > >> > > > >> >> >> > > > >> >> >> > > > >> >> > > > >> >> > > > >> > > > >> > > >> > >>
