Hi Harshan, The changes we do to this branch needs to go in release. Therefore this branch will later will be merged to dev and then master, but there are fixes and changes which have gone to dev and therefore we can't directly merge cloud branch to dev as it will overwrite some of the commits.
Regards, Nira On Thu, Aug 14, 2014 at 10:51 AM, Harshan Liyanage <[email protected]> wrote: > Hi Niranjan, > > This was taken from the master branch because this pack needs to be a > released pack. If there is no issue for using dev branch for this, we can > merge our changes to a pack taken from dev branch & update cloud feature > branch with that. > > Thanks, > > Best Regards, > > Lakshitha Harshan > Software Engineer > Mobile: *+94724423048* > Email: [email protected] > Blog : http://harshanliyanage.blogspot.com/ > *WSO2, Inc. :** wso2.com <http://wso2.com/>* > lean.enterprise.middleware. > > > On Thu, Aug 14, 2014 at 10:46 AM, Niranjan Karunanandham < > [email protected]> wrote: > >> Hi Harshan, >> >> There were some fixes that where done for the develop branch. From the >> top of my head, fixes like Unit Test issues and all where committed to the >> dev branch. Also since it was taken from the master branch, we will be >> having some problem merging it to the dev branch. >> >> Regards, >> Nira >> >> >> On Thu, Aug 14, 2014 at 10:42 AM, Harshan Liyanage <[email protected]> >> wrote: >> >>> Hi, >>> >>> I have taken this from EMM 1.1.0 master branch in wso2. It's same in the >>> master branch also. >>> >>> >>> https://github.com/wso2/product-emm/blob/master/modules/apps/emm/modules/device.js >>> >>> Thanks, >>> >>> Best Regards, >>> >>> Lakshitha Harshan >>> Software Engineer >>> Mobile: *+94724423048* >>> Email: [email protected] >>> Blog : http://harshanliyanage.blogspot.com/ >>> *WSO2, Inc. :** wso2.com <http://wso2.com/>* >>> lean.enterprise.middleware. >>> >>> >>> On Thu, Aug 14, 2014 at 10:33 AM, Niranjan Karunanandham < >>> [email protected]> wrote: >>> >>>> Hi Dilan / Harshan, >>>> >>>> Below is the commit for branch feature/cloud where the agent download >>>> URL has been changed to mdm from emm. Why is this? >>>> >>>> modules/apps/emm/modules/device.js >>>> * } else if (userAgent.indexOf("iPhone") > 0) {* >>>> *- >>>> >>>> return("itms-services://?action=download-manifest&url=itms-services://?action=download-manifest&url=" >>>> + configFile.HTTPS_URL + "/emm/api/devices/ios/download");* >>>> *+ >>>> >>>> return("itms-services://?action=download-manifest&url=itms-services://?action=download-manifest&url=" >>>> + configFile.HTTPS_URL + "/mdm/api/devices/ios/download");* >>>> * } else if (userAgent.indexOf("iPad") > 0){* >>>> *- >>>> >>>> return("itms-services://?action=download-manifest&url=itms-services://?action=download-manifest&url=" >>>> + configFile.HTTPS_URL + "/emm/api/devices/ios/download");* >>>> *+ >>>> >>>> return("itms-services://?action=download-manifest&url=itms-services://?action=download-manifest&url=" >>>> + configFile.HTTPS_URL + "/mdm/api/devices/ios/download");* >>>> * } else if (userAgent.indexOf("iPod") > 0){* >>>> *- >>>> >>>> return("itms-services://?action=download-manifest&url=itms-services://?action=download-manifest&url=" >>>> + configFile.HTTPS_URL + "/emm/api/devices/ios/download");* >>>> *+ >>>> >>>> return("itms-services://?action=download-manifest&url=itms-services://?action=download-manifest&url=" >>>> + configFile.HTTPS_URL + "/mdm/api/devices/ios/download");* >>>> * }* >>>> >>>> >>>> Regards, >>>> Nira >>>> >>>> -- >>>> >>>> *Niranjan Karunanandham* >>>> Senior Software Engineer - WSO2 Inc. >>>> WSO2 Inc.: http://www.wso2.com >>>> M: +94 777 749 661 <http:///> >>>> >>> >>> >> >> >> -- >> >> *Niranjan Karunanandham* >> Senior Software Engineer - WSO2 Inc. >> WSO2 Inc.: http://www.wso2.com >> M: +94 777 749 661 <http:///> >> > > -- *Niranjan Karunanandham* Senior Software Engineer - WSO2 Inc. WSO2 Inc.: http://www.wso2.com M: +94 777 749 661 <http:///>
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
