You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cordova.apache.org by benconnito <gi...@git.apache.org> on 2016/02/15 15:31:09 UTC

[GitHub] cordova-ios pull request: fix formating issues from pull request 1...

GitHub user benconnito opened a pull request:

    https://github.com/apache/cordova-ios/pull/192

    fix formating issues from pull request 191

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/benconnito/cordova-ios master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cordova-ios/pull/192.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #192
    
----
commit c484a8f8f45ec13ee4fad54635fce76e09a31d79
Author: Ben Connito <be...@exponentialent.com>
Date:   2016-02-06T15:58:17Z

    CB-10184: Images.xcassets: A 83.5x83.5@2x app icon is required for iPad apps targeting iOS 9.0 and later
    
    added image to project template
    added destination to prepare.js

commit 419cffaeab548a3a2eca8653b7e4234769fbb41f
Author: Ben Connito <be...@exponentialent.com>
Date:   2016-02-06T16:01:24Z

    added to ipad pro image definition to contents.json

commit c9514f478e2523268659967ed00c127f67ddbc99
Author: Ben Connito <be...@exponentialent.com>
Date:   2016-02-06T16:04:27Z

    CB-10493: [iOS] Missing icon.png
    
    removed key CFBundleIconFile and string icon.png. This fixes the itc submission error that this file is missing.

commit 048c50b7f2fd4dad9d07312ba9b89875e8d387de
Author: Ben Connito <be...@exponentialent.com>
Date:   2016-02-15T14:20:24Z

    fix formating issues with recent pull request 191

commit 89ee4a558a92f6dd1b136e325797ffad5f55d9fb
Author: Ben Connito <be...@exponentialent.com>
Date:   2016-02-15T14:23:38Z

    fix formating issues with recent pull request 191

commit 8c13b5a8afea2f3f09139523248659f59a20c005
Author: Ben Connito <be...@exponentialent.com>
Date:   2016-02-15T14:29:25Z

    Merge remote-tracking branch 'upstream/master'
    
    # Conflicts:
    #	bin/templates/scripts/cordova/lib/prepare.js

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org
For additional commands, e-mail: dev-help@cordova.apache.org


[GitHub] cordova-ios pull request: fix formating issues from pull request 1...

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

    https://github.com/apache/cordova-ios/pull/192


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org
For additional commands, e-mail: dev-help@cordova.apache.org


[GitHub] cordova-ios pull request: fix formating issues from pull request 1...

Posted by stevengill <gi...@git.apache.org>.
Github user stevengill commented on a diff in the pull request:

    https://github.com/apache/cordova-ios/pull/192#discussion_r54118663
  
    --- Diff: bin/templates/project/__PROJECT_NAME__/Images.xcassets/AppIcon.appiconset/Contents.json ---
    @@ -121,6 +121,12 @@
           "scale" : "2x"
         },
         {
    +      "idiom" : "ipad",
    +      "size" : "83.5x83.5",
    --- End diff --
    
    I think this might be a mistake. Formatting is messed up on line 117. Lines 123-128 look like a copy of lines 117-122


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org
For additional commands, e-mail: dev-help@cordova.apache.org