Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upVideo Highlander #618
Conversation
mastertheknife
added some commits
Dec 19, 2013
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
knight-of-ni
Dec 24, 2013
Member
Note that a div id of "videoEvent" is already being used in line 133. Probably should give this a different name.
|
Note that a div id of "videoEvent" is already being used in line 133. Probably should give this a different name. |
mastertheknife
and others
added some commits
Dec 25, 2013
pushed a commit
that referenced
this pull request
Dec 3, 2014
knight-of-ni
merged commit 63f3ec4
into
ZoneMinder:feature-h264-videostorage
Dec 3, 2014
1 check passed
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
SteveGilvarry
Jan 13, 2015
Member
@connortechnology I don't think $Monitor is available here, well it doesn't seem to be defined when I debug it. But I am merging two branches so I may have clobbered something that loaded it. I know it was a while ago, but maybe you have branch still working and can check it.
|
@connortechnology I don't think $Monitor is available here, well it doesn't seem to be defined when I debug it. But I am merging two branches so I may have clobbered something that loaded it. I know it was a while ago, but maybe you have branch still working and can check it. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
connortechnology
Jan 13, 2015
Member
I might have pushed this, but it was originally written by @mastertheknife . Seems to me that Monitor needs to be defined. Perhaps the line that defines it has been lost.
|
I might have pushed this, but it was originally written by @mastertheknife . Seems to me that Monitor needs to be defined. Perhaps the line that defines it has been lost. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
SteveGilvarry
Jan 13, 2015
Member
No worries I pulled the required field in with the event query, which was already joining monitor table so easy to just add those new fields.
|
No worries I pulled the required field in with the event query, which was already joining monitor table so easy to just add those new fields. |
SteveGilvarry commentedDec 2, 2014
Yes that is right there can only be one. Rather than chop off heads, I have merged the two competing solutions for video storage. This is the raw merge so it will have issues, but I wanted to put this out there and see what people think.
Issues to be resolved
This will break feature-h264-videostorage branch, but you have to break some eggs to make a cake.