Commits

Branch selector

master

User selector

All users

All time

Commit history

Commits on Aug 17, 2016

• Merge pull request #1579 from peruchi/master

  Show description for 69461a7
  connortechnology

  authored
  69461a7View commit details

  Copy full SHA for 69461a7

  Browse repository at this point

• Merge pull request #1577 from ZoneMinder/fix_zmaControl

  Show description for 7d48b2c
  

  Andrew Bauer

  authored
  7d48b2cView commit details

  Copy full SHA for 7d48b2c

  Browse repository at this point

• Update zmdc.pl.in

  peruchi

  authored
  50f55afView commit details

  Copy full SHA for 50f55af

  Browse repository at this point

• Update zmdc.pl.in

  peruchi

  authored
  7b389a7View commit details

  Copy full SHA for 7b389a7

  Browse repository at this point

Commits on Aug 16, 2016

• Merge pull request #1594 from vikaskedia/patch-2

  Show description for cc696cb
  connortechnology

  authored
  cc696cbView commit details

  Copy full SHA for cc696cb

  Browse repository at this point

• update fedora rpm readme

  

  Andy Bauer

  committed
  4895942View commit details

  Copy full SHA for 4895942

  Browse repository at this point

• Merge pull request #1576 from ZoneMinder/show_other_zones

  Show description for ea34f3d
  

  Andrew Bauer

  authored
  ea34f3dView commit details

  Copy full SHA for ea34f3d

  Browse repository at this point

Commits on Aug 15, 2016

• Merge pull request #1578 from erelson/patch-2

  Show description for 872adc1
  connortechnology

  authored
  872adc1View commit details

  Copy full SHA for 872adc1

  Browse repository at this point

• Update README.md

  vikaskedia

  authored
  31ca095View commit details

  Copy full SHA for 31ca095

  Browse repository at this point

Commits on Aug 14, 2016

• Merge pull request #1585 from ZoneMinder/copy_av_dict_parse_string_from_ffmpeg

  Show description for cd55c8b
  

  Andrew Bauer

  authored
  cd55c8bView commit details

  Copy full SHA for cd55c8b

  Browse repository at this point

• Merge pull request #1592 from connortechnology/fix_analysis_frame

  Show description for 31cb860
  

  Andrew Bauer

  authored
  31cb860View commit details

  Copy full SHA for 31cb860

  Browse repository at this point

Commits on Aug 12, 2016

• fix the order of analyse/capture being passed

  connortechnology

  committed
  a0bc30dView commit details

  Copy full SHA for a0bc30d

  Browse repository at this point

• silence error when Event has no StorageId set

  connortechnology

  committed
  240336eView commit details

  Copy full SHA for 240336e

  Browse repository at this point

• pass capture or analyse to getImageSrc

  connortechnology

  committed
  9106675View commit details

  Copy full SHA for 9106675

  Browse repository at this point

• take optional show= to specify the analyse image or the capture image

  connortechnology

  committed
  bcb7dd1View commit details

  Copy full SHA for bcb7dd1

  Browse repository at this point

• add ability to pass show=capture or show=analyse to getImageSrc

  connortechnology

  committed
  3dadcc8View commit details

  Copy full SHA for 3dadcc8

  Browse repository at this point

• use instead of for the frame object and pass to getImageSrc which expects an array

  connortechnology

  committed
  bc4923bView commit details

  Copy full SHA for bc4923b

  Browse repository at this point

• Merge ../ZoneMinder.master

  connortechnology

  committed
  3dc2170View commit details

  Copy full SHA for 3dc2170

  Browse repository at this point

• add an echo to tell us that updating is done and we are trying to start.

  connortechnology

  committed
  1058796View commit details

  Copy full SHA for 1058796

  Browse repository at this point

• add an echo to tell us that updating is done and we are trying to start.

  connortechnology

  committed
  bdcc53dView commit details

  Copy full SHA for bdcc53d

  Browse repository at this point

• add an echo to tell us that updating is done and we are trying to start.

  connortechnology

  committed
  c1d2407View commit details

  Copy full SHA for c1d2407

  Browse repository at this point

Commits on Aug 10, 2016

• Merge pull request #3 from ZoneMinder/master

  Show description for d6dfe3d
  connortechnology

  authored
  d6dfe3dView commit details

  Copy full SHA for d6dfe3d

  Browse repository at this point

• fix path in cake api cleanup rules

  connortechnology

  committed
  6b70ff9View commit details

  Copy full SHA for 6b70ff9

  Browse repository at this point

Commits on Aug 9, 2016

• bump libavutil version check as per @SteveGilvarry

  connortechnology

  committed
  3f713dfView commit details

  Copy full SHA for 3f713df

  Browse repository at this point

• Merge branch 'master' into copy_av_dict_parse_string_from_ffmpeg

  connortechnology

  committed
  0b92b95View commit details

  Copy full SHA for 0b92b95

  Browse repository at this point

Commits on Aug 8, 2016

• get the other dbPass use and quote it. Slight visual code style cleanup.

  connortechnology

  committed
  fbc0086View commit details

  Copy full SHA for fbc0086

  Browse repository at this point

Commits on Aug 7, 2016

• Fixes #1584. I've just copied the relevant functions from ffmpeg source. Please review carefully before merging.

  

  Isaac Connor

  committed
  177c2c7View commit details

  Copy full SHA for 177c2c7

  Browse repository at this point

Commits on Aug 6, 2016

• Update definemonitor.rst

  

  Andrew Bauer

  authored
  3a804a0View commit details

  Copy full SHA for 3a804a0

  Browse repository at this point

• Merge pull request #1503 from ZoneMinder/id_on_console

  Show description for 24d471f
  

  Andrew Bauer

  authored
  24d471fView commit details

  Copy full SHA for 24d471f

  Browse repository at this point

• Merge pull request #1556 from knnniggett/banner

  Show description for 9d65ef3
  connortechnology

  authored
  9d65ef3View commit details

  Copy full SHA for 9d65ef3

  Browse repository at this point

• Merge pull request #1567 from SteveGilvarry/avdictparsestring

  Show description for f67394f
  

  Andrew Bauer

  authored
  f67394fView commit details

  Copy full SHA for f67394f

  Browse repository at this point

• Merge pull request #1581 from ZoneMinder/fix_1571

  Show description for 528230c
  

  Andrew Bauer

  authored
  528230cView commit details

  Copy full SHA for 528230c

  Browse repository at this point

• Merge pull request #1498 from josh4trunks/mysql_port_socket

  Show description for 382896d
  

  Andrew Bauer

  authored
  382896dView commit details

  Copy full SHA for 382896d

  Browse repository at this point

• Merge pull request #1549 from SteveGilvarry/initd_sql_wait

  Show description for 6c8001f
  

  Andrew Bauer

  authored
  6c8001fView commit details

  Copy full SHA for 6c8001f

  Browse repository at this point

• Merge pull request #1566 from gerdesj/Keekoon

  Show description for e6b1cf9
  

  Andrew Bauer

  authored
  e6b1cf9View commit details

  Copy full SHA for e6b1cf9

  Browse repository at this point