Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cordova.apache.org
From: onflapp <git@git.apache.org>
To: callback-dev@incubator.apache.org
Reply-To: callback-dev@incubator.apache.org
Message-ID: <git-pr-9-cordova-osx@git.apache.org>
Subject: [GitHub] cordova-osx pull request: enhancements to the cordova-osx
Content-Type: text/plain
Date: Sat, 26 Apr 2014 21:31:06 +0000 (UTC)

GitHub user onflapp opened a pull request:

    https://github.com/apache/cordova-osx/pull/9

    enhancements to the cordova-osx

    - added kiosk mode - full screen, hide cursor
    - configuration to enable WebKit inspector
    - added SourceBaseDir parameter to make development easier (no need to rebuild app after changing CSS/JS)
    - CDVViewController can be used to create multiple windows (makes window.open to works)
    - small fixes

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

    $ git pull https://github.com/onflapp/cordova-osx master

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

    https://github.com/apache/cordova-osx/pull/9.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 #9
    
----
commit c7b79980afd0036874560d8f0d06c1f5ea418321
Author: Ondrej Florian <oflorian@adobe.com>
Date:   2014-04-21T09:44:00Z

    kiosk mode settings

commit c282580905d137a907a269d8e8f9756149a8635d
Author: onflapp <onflapp@gmail.com>
Date:   2014-04-21T21:19:13Z

    view controller updates

commit 7ae5d22f305265b525682dd0bc7f81f06b662b16
Author: onflapp <onflapp@gmail.com>
Date:   2014-04-21T21:30:48Z

    FileAPI

commit 9f47efc802786d4f6baa6eef58c4fb0821b9bfb6
Author: onflapp <onflapp@gmail.com>
Date:   2014-04-22T07:40:00Z

    view controller reorg

commit 1a2e63902fe791f3b4d4e9f5cae4a29944efaa5e
Author: Ondrej Florian <oflorian@adobe.com>
Date:   2014-04-26T16:19:33Z

    commit before the merge

commit 90dc01779a48337ad8ed2dad172c8d149c918b4b
Author: Ondrej Florian <oflorian@adobe.com>
Date:   2014-04-26T19:59:54Z

    Merge branch 'master' of https://github.com/apache/cordova-osx
    
    Conflicts:
    	CordovaFramework/CordovaFramework.xcodeproj/project.pbxproj
    	CordovaLib/CordovaLib/Classes/CDVViewController.m
    	bin/templates/project/__TESTING__/config.xml
    	templates/project/__CDV_PRODUCT_NAME__/Classes/MainViewController.m

commit 265ecfcc7ce2988b584e22b610616617681394a6
Author: Ondrej Florian <oflorian@adobe.com>
Date:   2014-04-26T20:11:50Z

    upstream merge

commit 821a81234db762e77e0659aafcac94212c7f5782
Author: Ondrej Florian <oflorian@adobe.com>
Date:   2014-04-26T20:41:04Z

    additional merge changes

commit 361fe26100e7700a8dcfafbf43520c59dc9da872
Author: Ondrej Florian <oflorian@adobe.com>
Date:   2014-04-26T21:01:10Z

    move initialization from awareFromNib to __init

commit 0914d83c231e57d04213770886f112f5db540a0e
Author: Ondrej Florian <oflorian@adobe.com>
Date:   2014-04-26T21:01:30Z

    fix the message in the command delegate

commit 5c0eb8d24180676e6abe389a175f63d591d40aa1
Author: Ondrej Florian <oflorian@adobe.com>
Date:   2014-04-26T21:21:59Z

    addition options description and changes to the templates

----


---
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.
---