Merge lp://staging/~dbarth/cordova-ubuntu/container-add-network-plugin into lp://staging/cordova-ubuntu/container
Proposed by
David Barth
| Status: | Approved | ||||
|---|---|---|---|---|---|
| Approved by: | Alexandre Abreu | ||||
| Approved revision: | 26 | ||||
| Proposed branch: | lp://staging/~dbarth/cordova-ubuntu/container-add-network-plugin | ||||
| Merge into: | lp://staging/cordova-ubuntu/container | ||||
| Diff against target: |
1723 lines (+789/-202) 46 files modified
apparmor.json (+1/-1) build/VERSION (+1/-1) build/bin/node_modules/colors/package.json (+2/-8) build/bin/node_modules/elementtree/CHANGES.md (+9/-4) build/bin/node_modules/elementtree/README.md (+114/-0) build/bin/node_modules/elementtree/lib/elementtree.js (+15/-2) build/bin/node_modules/elementtree/node_modules/sax/package.json (+1/-8) build/bin/node_modules/elementtree/package.json (+4/-7) build/bin/node_modules/elementtree/tests/test-simple.js (+40/-0) build/bin/node_modules/optimist/node_modules/minimist/index.js (+8/-14) build/bin/node_modules/optimist/node_modules/minimist/package.json (+2/-5) build/bin/node_modules/optimist/node_modules/minimist/test/parse.js (+21/-0) build/bin/node_modules/optimist/node_modules/minimist/test/short.js (+0/-18) build/bin/node_modules/optimist/node_modules/wordwrap/package.json (+0/-3) build/bin/node_modules/optimist/package.json (+1/-8) build/bin/node_modules/shelljs/package.json (+1/-8) build/src/coreplugins.cpp (+13/-10) build/src/plugins/org.apache.cordova.camera/camera.cpp (+3/-3) build/src/plugins/org.apache.cordova.camera/camera.h (+10/-0) build/src/plugins/org.apache.cordova.device-motion/accelerometer.cpp (+1/-1) build/src/plugins/org.apache.cordova.file-transfer/file-transfer.cpp (+7/-7) build/src/plugins/org.apache.cordova.network-information/network_information.cpp (+63/-0) build/src/plugins/org.apache.cordova.network-information/network_information.h (+47/-0) build/www/cordova.js (+2/-2) config.xml (+3/-3) cordova/node_modules/colors/package.json (+2/-8) cordova/node_modules/elementtree/CHANGES.md (+9/-4) cordova/node_modules/elementtree/README.md (+114/-0) cordova/node_modules/elementtree/lib/elementtree.js (+15/-2) cordova/node_modules/elementtree/node_modules/sax/package.json (+1/-8) cordova/node_modules/elementtree/package.json (+4/-7) cordova/node_modules/elementtree/tests/test-simple.js (+40/-0) cordova/node_modules/optimist/node_modules/minimist/index.js (+8/-14) cordova/node_modules/optimist/node_modules/minimist/package.json (+2/-5) cordova/node_modules/optimist/node_modules/minimist/test/parse.js (+21/-0) cordova/node_modules/optimist/node_modules/minimist/test/short.js (+0/-18) cordova/node_modules/optimist/node_modules/wordwrap/package.json (+0/-3) cordova/node_modules/optimist/package.json (+1/-8) cordova/node_modules/shelljs/package.json (+1/-8) debian/changelog (+12/-0) platform_www/cordova.js (+2/-2) qml/CaptureWidget.qml (+1/-1) www/cordova_plugins.js (+25/-1) www/plugins/org.apache.cordova.network-information/www/Connection.js (+36/-0) www/plugins/org.apache.cordova.network-information/www/network.js (+91/-0) www/plugins/org.apache.cordova.splashscreen/www/splashscreen.js (+35/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~dbarth/cordova-ubuntu/container-add-network-plugin | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexandre Abreu (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add the network-information plugin
Description of the change
Add the network-information plugin
To post a comment you must log in.
Revision history for this message
| Alexandre Abreu (abreu-alexandre) | # |
review:
Approve
Unmerged revisions
- 26. By David Barth
-
missing www files (and splashscreen)
- 25. By David Barth
-
adding the network-information plugin
- 24. By David Barth
-
manual saucy backport
- 23. By David Barth
-
3.4.0 with ubuntu fixes
- 22. By David Barth
-
add Maxim's latest fixes for camera, file-transfer and device-motion plugins
- 21. By David Barth
-
Update to 3.4.0 release
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
