GitHub user hypery2k opened a pull request:
https://github.com/apache/cordova-osx/pull/12
Fix OS X build
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/hypery2k/cordova-osx master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cordova-osx/pull/12.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 #12
----
commit c7b79980afd0036874560d8f0d06c1f5ea418321
Author: Ondrej Florian <[email protected]>
Date: 2014-04-21T09:44:00Z
kiosk mode settings
commit c282580905d137a907a269d8e8f9756149a8635d
Author: onflapp <[email protected]>
Date: 2014-04-21T21:19:13Z
view controller updates
commit 7ae5d22f305265b525682dd0bc7f81f06b662b16
Author: onflapp <[email protected]>
Date: 2014-04-21T21:30:48Z
FileAPI
commit 9f47efc802786d4f6baa6eef58c4fb0821b9bfb6
Author: onflapp <[email protected]>
Date: 2014-04-22T07:40:00Z
view controller reorg
commit 1a2e63902fe791f3b4d4e9f5cae4a29944efaa5e
Author: Ondrej Florian <[email protected]>
Date: 2014-04-26T16:19:33Z
commit before the merge
commit 90dc01779a48337ad8ed2dad172c8d149c918b4b
Author: Ondrej Florian <[email protected]>
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 <[email protected]>
Date: 2014-04-26T20:11:50Z
upstream merge
commit 821a81234db762e77e0659aafcac94212c7f5782
Author: Ondrej Florian <[email protected]>
Date: 2014-04-26T20:41:04Z
additional merge changes
commit 361fe26100e7700a8dcfafbf43520c59dc9da872
Author: Ondrej Florian <[email protected]>
Date: 2014-04-26T21:01:10Z
move initialization from awareFromNib to __init
commit 0914d83c231e57d04213770886f112f5db540a0e
Author: Ondrej Florian <[email protected]>
Date: 2014-04-26T21:01:30Z
fix the message in the command delegate
commit 5c0eb8d24180676e6abe389a175f63d591d40aa1
Author: Ondrej Florian <[email protected]>
Date: 2014-04-26T21:21:59Z
addition options description and changes to the templates
commit 35e5a0dac7902179bb9d6f6077c0758cb4a3fa70
Author: Ondrej Florian <[email protected]>
Date: 2014-04-28T16:05:04Z
fix for the NSArray categories not being found by plugins properly
commit 6ff8bdd387371e9d3a278b4887911f4d8ff903ab
Author: Ondrej Florian <[email protected]>
Date: 2014-04-28T16:05:35Z
add associatedObject - used by some plugins
commit 9dd99d4bcc70d759e79541a2684375181c7d3f18
Author: Ondrej Florian <[email protected]>
Date: 2014-04-28T16:06:41Z
add postWindow handling from the javascript
commit 02a806c3ed565e9b4d52f49305526d14cb7024f0
Author: Ondrej Florian <[email protected]>
Date: 2014-04-28T16:07:30Z
support for massing ArrayBuffers as NSData to the native functions (used by
the writer for example)
commit 65d7ee098f61eee47125321a5ef1b36960e178e1
Author: Ondrej Florian <[email protected]>
Date: 2014-04-28T16:07:49Z
missing includes
commit 80029013ba873078f91fbe4ab7c5171aea769a95
Author: Tobias Bocanegra <[email protected]>
Date: 2014-04-30T07:27:46Z
CB-6567 Adding the OSX platform also copies over the CordovaLibTests
fixed
* moved CordovaLibTests to project root
* fixed schemes
* fixed bug in create script
commit 6ff4bdf15fd82c0459515f3787b68d10ae971734
Author: Ondrej Florian <[email protected]>
Date: 2014-04-30T08:11:45Z
fix task exit notification arriving before the data notification
commit 7cd48388b5e49ad3c64c842bc6881e9d066b0c66
Author: Ondrej Florian <[email protected]>
Date: 2014-04-30T08:13:55Z
Merge branch 'master' of https://github.com/apache/cordova-osx into
before-merge
commit 16cc8ce423cb33a6788ac2bb6260075dc6d09cd2
Author: Ondrej Florian <[email protected]>
Date: 2014-04-30T08:21:41Z
Removing the testapp
Merge commit '80029013ba873078f91fbe4ab7c5171aea769a95' into before-merge
Conflicts:
CordovaLib/CordovaLib.xcodeproj/project.pbxproj
commit f431459a4a6a7c5e4542d0d1be1179d4c634ba4f
Author: Ondrej Florian <[email protected]>
Date: 2014-04-30T08:31:26Z
re-adding utility classes after the merge
- the utility classes are expected by some plugins
commit 705e8c1a5d688562ebec92d684b40de6d12d2c49
Author: Ondrej Florian <[email protected]>
Date: 2014-04-30T09:49:35Z
update the project template
-add DocumentViewController (used for creating new windows - e.g.
window.open)
- various other fixes
commit ee8ed2dd4622c1ebfe4771de88c282095ce00d45
Author: Ondrej Florian <[email protected]>
Date: 2014-05-01T06:25:34Z
Merge branch 'master' of https://github.com/apache/cordova-osx
commit 9443413a65c9ac1733922a5ac8eff120ce6542b7
Author: Ondrej Florian <[email protected]>
Date: 2014-05-01T07:09:34Z
fixes indentation and remove unused code
commit abc4ad6c21a2326a92d380042bd1b5efbf2426bc
Author: Ondrej Florian <[email protected]>
Date: 2014-05-23T05:14:40Z
fix compiler warnings
commit ef0d8098a68f3a61a43a18bbd017819e89129f49
Author: Ondrej Florian <[email protected]>
Date: 2014-05-23T05:18:54Z
add a possibility to pass data string to subprocessâs stdin
commit 69d7f55dfeaac5c76a67771467d1aac5b269bd68
Author: Ondrej Florian <[email protected]>
Date: 2014-06-04T14:15:48Z
execute task with input
commit 1ab2c72b155048c87d17baf995287f22695a6cbc
Author: Ondrej Florian <[email protected]>
Date: 2014-06-04T15:21:21Z
NSMutableArray+QueueAdditions.h is needed for some plugins
commit 96425752bb06138c07ca3b1ed329730596813ace
Author: Ondrej Florian <[email protected]>
Date: 2014-06-14T07:01:35Z
execute shell with input (reverted changes)
commit f974ca48182e296279406a6e45a77911e0c0faa9
Author: onflapp <[email protected]>
Date: 2014-07-05T09:45:42Z
updated documentation
----
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
