lp:~janos-gyerik/ecocitizenapp/backport

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ecocitizenapp

Janos Gyerik: Pending requested 2017-11-04

Diff: 1790 lines (+1596/-31)

13 files modified

.classpath (+1/-0)
AndroidManifest.xml (+4/-4)
assets/RemPodSample1.txt (+1536/-0)
build.xml (+17/-15)
project.properties (+1/-1)
src/backport/android/bluetooth/BluetoothDevice.aidl (+23/-0)
src/backport_android_bluetooth.properties (+3/-0)
src/com/ecocitizen/app/DeviceListActivity.java (+2/-2)
src/com/ecocitizen/app/DeviceManagerClient.java (+2/-2)
src/com/ecocitizen/common/HttpHelper.java (+1/-1)
src/com/ecocitizen/service/BluetoothSensorManager.java (+4/-4)
src/com/ecocitizen/service/DeviceManagerService.java (+1/-1)
src/com/ecocitizen/service/IDeviceManagerService.aidl (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

551. By Janos Gyerik <janos@axiom> on 2012-06-29

merged from main

550. By Janos Gyerik <janos@axiom> on 2012-05-03

merged from main

549. By Janos Gyerik <janos@axiom> on 2012-04-27

merged from main

548. By Janos Gyerik <janos@axiom> on 2012-04-20

merged from main

547. By Janos Gyerik <janos@axiom> on 2012-04-18

merged improvements from mainline

546. By Janos Gyerik <janos@axiom> on 2012-04-17

merged build script improvements

545. By Janos Gyerik <janos@axiom> on 2012-04-15

use rsync instead of scp in publish.sh

544. By Janos Gyerik <janos@axiom> on 2012-04-15

cleaned up the ugly pop-up when there are no files to upload, with a nicer solution thats a bit more work and probably in need of some improvement later for better generalizing in FileManagerActivity

543. By Janos Gyerik <janos@axiom> on 2012-04-15

removed garbage from zephyr sample asset

542. By Janos Gyerik <janos@axiom> on 2012-04-15

removed the test project, it was not used and not useful