Isaac Connor
|
4889f3d0e8
|
rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image!
|
2017-05-31 20:54:34 -04:00 |
|
Isaac Connor
|
ce59c9e16c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-31 20:45:50 -04:00 |
|
Isaac Connor
|
dbeb000505
|
Merge ../ZoneMinder.connortechnology
|
2017-05-31 20:45:37 -04:00 |
|
Isaac Connor
|
2b9134512f
|
remove leftover
|
2017-05-31 20:45:21 -04:00 |
|
Isaac Connor
|
98b3621681
|
add Debug, and fix logic deleting frames before the appropriate keyframe
|
2017-05-31 20:44:43 -04:00 |
|
Isaac Connor
|
a6421a9126
|
handle deprecations
|
2017-05-31 20:44:23 -04:00 |
|
Isaac Connor
|
2eabf13eaf
|
handle deprecations, make some logic more clear
|
2017-05-31 20:44:13 -04:00 |
Andrew Bauer
|
85c19532cf
|
Update startpackpack.sh
fix copy/paste error
|
2017-05-31 19:04:14 -05:00 |
|
Andrew Bauer
|
106a8ab720
|
Update startpackpack.sh
add debug lines for troubleshooting
|
2017-05-31 19:00:17 -05:00 |
|
Andrew Bauer
|
c555ea0f76
|
Update .travis.yml
ensure sed is installed in the Travis environment
|
2017-05-31 15:53:06 -05:00 |
|
Andrew Bauer
|
a7ca9bf212
|
Update startpackpack.sh
spelling typo
|
2017-05-31 15:28:05 -05:00 |
|
Isaac Connor
|
bc32837e3a
|
fix braces
|
2017-05-31 13:55:21 -04:00 |
|
Isaac Connor
|
06a9598755
|
Merge ../ZoneMinder.connortechnology
|
2017-05-31 12:55:35 -04:00 |
|
Isaac Connor
|
8596891e4d
|
fix double to single quote mistakes
|
2017-05-31 12:55:27 -04:00 |
|
Isaac Connor
|
ece10d6278
|
braces and whitspace
|
2017-05-31 11:16:55 -04:00 |
|
Isaac Connor
|
53a7b2e72c
|
more double quotes to single quotes and fix some spacing
|
2017-05-31 09:57:55 -04:00 |
|
Isaac Connor
|
36ccc5b7b6
|
Merge bits from SA. Mostly double to single quotes plus some debug lines when errors happen
|
2017-05-31 09:33:51 -04:00 |
|
Isaac Connor
|
82a13fac76
|
new class for Monitors
|
2017-05-30 21:21:51 -04:00 |
|
Isaac Connor
|
32d1e62f73
|
braces, spacing, quotes
|
2017-05-30 21:18:13 -04:00 |
|
Isaac Connor
|
885823aeb6
|
remove unnecessary quotes and convert double quotes to single quotes
|
2017-05-30 21:11:51 -04:00 |
|
Isaac Connor
|
1d5248c0b8
|
merge from SA, but remove Storageareas bits
|
2017-05-30 20:06:29 -04:00 |
|
Isaac Connor
|
ab85239d82
|
fix braces, invert control directions when camera is flipped
|
2017-05-30 19:49:30 -04:00 |
|
Isaac Connor
|
0bb2bed32c
|
remove blank lines, do some better escaping
|
2017-05-30 19:47:35 -04:00 |
|
Isaac Connor
|
cca2c624f9
|
fix spelling mistake
|
2017-05-30 19:42:38 -04:00 |
|
Isaac Connor
|
83d6f415b3
|
cleanup whitespace
|
2017-05-30 14:07:37 -04:00 |
|
Isaac Connor
|
b96f5cf49d
|
more merges/fixes from SA
|
2017-05-30 13:50:24 -04:00 |
|
Isaac Connor
|
8b3b9eb30e
|
more merges/fixes from SA
|
2017-05-30 13:47:30 -04:00 |
|
Isaac Connor
|
1a43334113
|
Use NULLs instead of '' when saving things
|
2017-05-30 13:38:57 -04:00 |
|
Isaac Connor
|
c7b52bd998
|
fix logging dirs
|
2017-05-30 13:14:43 -04:00 |
|
Isaac Connor
|
e9a0474cf7
|
add back required lines with a comment
|
2017-05-30 12:04:12 -04:00 |
|
Isaac Connor
|
c5288a172d
|
fix merge problem
|
2017-05-30 11:57:20 -04:00 |
|
Isaac Connor
|
5bbe13f98f
|
update cycle from SA
|
2017-05-30 11:53:05 -04:00 |
|
Isaac Connor
|
a75488e0f3
|
flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed
|
2017-05-30 11:52:04 -04:00 |
|
Isaac Connor
|
5c5aafb1e8
|
white space and a check for mid being set to quiet error messages
|
2017-05-30 11:37:48 -04:00 |
|
Isaac Connor
|
59d00b20b1
|
fix fetchImage
|
2017-05-30 11:35:52 -04:00 |
|
Isaac Connor
|
f88abfcb4d
|
the liveStream element now has the monitorId appended to it, to be consistent with montage so we can reuse code
|
2017-05-30 11:26:57 -04:00 |
|
Isaac Connor
|
3062fe43f3
|
revert csrf on login page. csrf needs to be off in order for zmNinja to work
|
2017-05-30 11:25:25 -04:00 |
|
Isaac Connor
|
fe2155dd1a
|
merges from SA
|
2017-05-30 11:15:00 -04:00 |
|
Isaac Connor
|
e5616d5719
|
Merge ../ZoneMinder.connortechnology
|
2017-05-30 10:53:20 -04:00 |
|
Isaac Connor
|
8b0b938fc8
|
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
|
2017-05-30 10:51:15 -04:00 |
|
Isaac Connor
|
772df5b41b
|
add a cast to quiet compiler warning
|
2017-05-30 10:31:02 -04:00 |
Isaac Connor
|
b948bc5403
|
fix a few extra )
|
2017-05-30 10:21:34 -04:00 |
|
Isaac Connor
|
b979712892
|
fix inconsistent whitespace
|
2017-05-30 10:01:02 -04:00 |
|
Isaac Connor
|
3c9d8f4ec6
|
Don't do the qqq thing to remove whitespace from the config descriptions. HTML doesn't care about it. That kind of parsing should be done at display time.
|
2017-05-30 09:44:43 -04:00 |
|
Isaac Connor
|
c616a3b3b7
|
fix some bad to '' changes
|
2017-05-30 09:39:01 -04:00 |
|
Isaac Connor
|
ff08843d68
|
replace with ''
|
2017-05-30 09:10:41 -04:00 |
|
Isaac Connor
|
b23c45c9bc
|
bump version to 1.31.0
|
2017-05-29 10:00:46 -04:00 |
|
Isaac Connor
|
e2df0b74d4
|
remove including state.js.php as it has nothing to do with this pr
|
2017-05-29 09:51:31 -04:00 |
|
Isaac Connor
|
77d068fc48
|
merge updates from SA relating to building debian packages
|
2017-05-26 22:25:59 -04:00 |
|
Isaac Connor
|
94151b0318
|
put back changelog
|
2017-05-26 14:30:21 -04:00 |