[Ssc-dev] [guardianproject/InformaCore] a96589: Merge pull request #18 from guardianproject/harlo_...

[harlo]

  Branch: refs/heads/harlo_task_2290
  Home:   https://github.com/guardianproject/InformaCore
  Commit: a96589997ecc921c2bda9cf03387141489913b2d
      https://github.com/guardianproject/InformaCore/commit/a96589997ecc921c2bda9cf03387141489913b2d
  Author: n8fr8 <nathan at guardianproject.info>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/models/j3m/IGenealogy.java
    M src/org/witness/informacam/models/media/IMedia.java

  Log Message:
  -----------
  Merge pull request #18 from guardianproject/harlo_feature_2286

standard wrapping for j3m metadata


  Commit: 9551ec059a8481b018d578fae34835d72e75e189
      https://github.com/guardianproject/InformaCore/commit/9551ec059a8481b018d578fae34835d72e75e189
  Author: n8fr8 <nathan at freitas.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/informa/InformaService.java

  Log Message:
  -----------
  enable GPS preference option


  Commit: 67885717da0c8ba6c9f3a9045d75f8ae173302d3
      https://github.com/guardianproject/InformaCore/commit/67885717da0c8ba6c9f3a9045d75f8ae173302d3
  Author: n8fr8 <nathan at guardianproject.info>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/informa/InformaService.java

  Log Message:
  -----------
  Merge pull request #19 from n8fr8/master

enable GPS preference option


  Commit: 791421bc8141ee2387f84e40d568577038ebaafc
      https://github.com/guardianproject/InformaCore/commit/791421bc8141ee2387f84e40d568577038ebaafc
  Author: n8fr8 <nathan at freitas.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/models/media/IMedia.java

  Log Message:
  -----------
  add new method to get j3m data directly


  Commit: e376c6491780124b7974b184e279b138bec44e3e
      https://github.com/guardianproject/InformaCore/commit/e376c6491780124b7974b184e279b138bec44e3e
  Author: n8fr8 <nathan at guardianproject.info>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/models/media/IMedia.java

  Log Message:
  -----------
  Merge pull request #20 from n8fr8/master

add new method to get j3m data directly


  Commit: 519cd6d8f4d7de8103dc9bbd23eab0e77633a1f2
      https://github.com/guardianproject/InformaCore/commit/519cd6d8f4d7de8103dc9bbd23eab0e77633a1f2
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/informa/InformaService.java
    M src/org/witness/informacam/models/media/IMedia.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:guardianproject/InformaCam into harlo_task_2290


  Commit: d7d4feae9b6535159fca8ca8dc4a7a729af00aed
      https://github.com/guardianproject/InformaCore/commit/d7d4feae9b6535159fca8ca8dc4a7a729af00aed
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M .classpath
    R libs/google-api-client-1.15.0-rc.jar
    R libs/google-api-client-android-1.15.0-rc.jar
    R libs/google-api-services-drive-v2-rev82-1.15.0-rc.jar
    R libs/google-http-client-1.15.0-rc.jar
    R libs/google-http-client-android-1.15.0-rc.jar
    R libs/google-http-client-gson-1.15.0-rc.jar
    R libs/google-oauth-client-1.15.0-rc.jar
    R libs/jackson-core-2.1.3.jar
    R libs/jackson-core-asl-1.9.11.jar
    R libs/jsr305-1.3.9.jar
    R libs/protobuf-java-2.4.1.jar
    M src/org/witness/informacam/models/media/IVideoRegion.java
    R src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java

  Log Message:
  -----------
  removing extra drive cruft, adding in some stuff mikael included.


Compare: https://github.com/guardianproject/InformaCore/compare/ab3d02d2c2ef...d7d4feae9b65