[Ssc-dev] [guardianproject/InformaCore] 6cac76: abstracting entryjob and intake classes

[harlo]

  Branch: refs/heads/harlo_task_2792
  Home:   https://github.com/guardianproject/InformaCore
  Commit: 6cac761702a1a857d7a4818aecc15eadd0402ca6
      https://github.com/guardianproject/InformaCore/commit/6cac761702a1a857d7a4818aecc15eadd0402ca6
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
    M src/org/witness/informacam/intake/EntryJob.java
    M src/org/witness/informacam/intake/Intake.java

  Log Message:
  -----------
  abstracting entryjob and intake classes


  Commit: f0ad5eacfdc9805faa09ee5497dd3df32085da43
      https://github.com/guardianproject/InformaCore/commit/f0ad5eacfdc9805faa09ee5497dd3df32085da43
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
    M .classpath
    R libs/jackson-core-2.1.3.jar
    R libs/jackson-core-asl-1.9.11.jar
    R libs/jsr305-1.3.9.jar
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/informa/embed/VideoConstructor.java
    M src/org/witness/informacam/models/media/IMedia.java
    M src/org/witness/informacam/models/media/IMediaManifest.java
    M src/org/witness/informacam/models/media/IVideoRegion.java
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/transport/Transport.java
    M src/org/witness/informacam/transport/TransportUtility.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java
    M src/org/witness/informacam/ui/WizardActivity.java
    M src/org/witness/informacam/ui/screens/WizardStepThree.java
    M src/org/witness/informacam/utils/Constants.java

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


  Commit: a89d3b655792f3d3f1655b4a3b3b418bbc70c4d6
      https://github.com/guardianproject/InformaCore/commit/a89d3b655792f3d3f1655b4a3b3b418bbc70c4d6
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M jni/org_witness_informacam_informa_embed_ImageConstructor.cpp
    A src/de/matthiasmann/jpegdecoder/Component.java
    A src/de/matthiasmann/jpegdecoder/Huffman.java
    A src/de/matthiasmann/jpegdecoder/IDCT_2D.java
    A src/de/matthiasmann/jpegdecoder/JPEGDecoder.java
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/informa/embed/ImageConstructor.java
    M src/org/witness/informacam/informa/embed/VideoConstructor.java
    M src/org/witness/informacam/intake/EntryJob.java
    M src/org/witness/informacam/models/media/IImage.java
    M src/org/witness/informacam/models/media/ILog.java
    M src/org/witness/informacam/models/media/IMedia.java
    M src/org/witness/informacam/models/media/IMediaManifest.java
    M src/org/witness/informacam/models/media/IVideo.java
    M src/org/witness/informacam/storage/IOService.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java
    M src/org/witness/informacam/utils/BackgroundProcessor.java
    M src/org/witness/informacam/utils/MediaHasher.java

  Log Message:
  -----------
  merging


  Commit: eb391b14a69567f14288e17f09996da044d3d599
      https://github.com/guardianproject/InformaCore/commit/eb391b14a69567f14288e17f09996da044d3d599
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M external/ODKFormParser
    M src/org/witness/informacam/crypto/KeyUtility.java
    M src/org/witness/informacam/models/media/ILog.java
    M src/org/witness/informacam/storage/IOUtility.java

  Log Message:
  -----------
  updating to latest ODK parser commit.
modified zipping utility.
j3m data directive modified for zipped data as per https://dev.guardianproject.info/issues/2792


Compare: https://github.com/guardianproject/InformaCore/compare/6cac761702a1^...eb391b14a695