Isaac Connor
|
31a5252afa
|
apply btn and btn-primary styles to remaining buttons on console
|
2016-06-21 09:22:32 -04:00 |
|
Isaac Connor
|
513de21260
|
Merge branch 'add_api_auth' into storageareas
|
2016-06-21 09:10:06 -04:00 |
|
Isaac Connor
|
b4aec41d3d
|
fix warnings and move User import up higher to where it needs to be
|
2016-06-21 09:09:58 -04:00 |
|
Isaac Connor
|
4230bd1bd5
|
move the control_fields into the class so that it is available.
|
2016-06-20 12:46:23 -04:00 |
|
Isaac Connor
|
9c7b22086f
|
introduce a hash to define the fields and default values of the control table. Primarily this is to prevent method warnings when a monitor is not controllable
|
2016-06-20 12:41:14 -04:00 |
|
Isaac Connor
|
1d1cedce95
|
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
|
2016-06-20 12:40:33 -04:00 |
|
Isaac Connor
|
3914e0b394
|
:Merge branch 'fix_zone_edit' into storageareas
|
2016-06-16 12:04:18 -04:00 |
|
Isaac Connor
|
0c82e82ae2
|
Don't update x in updateY and don't update y in updateX as they are not defined.
|
2016-06-16 12:00:00 -04:00 |
|
Isaac Connor
|
c3d3514e51
|
fix update script to add Id column to Filters
|
2016-06-15 11:35:11 -04:00 |
|
Isaac Connor
|
ea87d9a305
|
fix merge problem
|
2016-06-14 21:16:38 -04:00 |
Isaac Connor
|
8e7665d397
|
use getStreamHTML instead of duplicated code
|
2016-06-14 12:40:18 -04:00 |
|
Isaac Connor
|
d5d48bef8a
|
clean out unused variables and don't scale the popup window. The contents of it won't be scaled.
|
2016-06-14 12:39:51 -04:00 |
|
Isaac Connor
|
bfa46e26ee
|
Use monitor Id instead of the array index. Id is unique, so just use it.
|
2016-06-14 12:39:15 -04:00 |
|
Isaac Connor
|
acba5bccf1
|
Always include the monitor Id in the tag id for the videostream
|
2016-06-14 12:38:37 -04:00 |
|
Isaac Connor
|
0f1a1a6294
|
log invalid calls to Monitor Object
|
2016-06-14 12:38:17 -04:00 |
|
Isaac Connor
|
98fab6528d
|
always use \n as separator and remove the segfault
|
2016-06-13 14:00:24 -04:00 |
|
Isaac Connor
|
910fd8212f
|
Merge branch 'fix_1526' into storageareas
|
2016-06-13 09:45:34 -04:00 |
|
Isaac Connor
|
708f9a6240
|
bump version to 1.30.3
|
2016-06-13 09:45:17 -04:00 |
|
Isaac Connor
|
abad7cbf9f
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-06-13 09:43:03 -04:00 |
|
Isaac Connor
|
83ac4cd061
|
change the input handler from onchange to oninput. Disable form submit when hitting enter
|
2016-06-13 09:40:04 -04:00 |
|
Isaac Connor
|
632ec38d7d
|
Put back in neccessary callt o updateArea
|
2016-06-12 16:10:24 -04:00 |
|
Isaac Connor
|
472973e975
|
connect needs a +1
|
2016-06-12 15:45:24 -04:00 |
Isaac Connor
|
76cb031a5e
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-06-12 07:14:30 -04:00 |
|
Isaac Connor
|
fad1d95011
|
fix NULL in linkedMonitors column
|
2016-06-09 13:06:57 -04:00 |
|
Isaac Connor
|
d9f2911f0d
|
handle null values in Monitors columns
|
2016-06-09 12:51:22 -04:00 |
|
Isaac Connor
|
c0cb1419a3
|
fixup delete_empty_directories
|
2016-06-07 22:03:46 -04:00 |
|
Isaac Connor
|
eb4e36789d
|
maybe fix delete_empty_directories
|
2016-06-07 21:43:47 -04:00 |
|
Isaac Connor
|
5ff53ebce0
|
More output on errors, make them non-fatal
|
2016-06-07 21:37:33 -04:00 |
|
Isaac Connor
|
4f2e0edb44
|
remove unnecssary updateAreas
remove unnecessary updateZoneImage
|
2016-06-07 21:23:30 -04:00 |
|
Isaac Connor
|
c3043c1487
|
cleanups, remove unneccessary updateArea calls
|
2016-06-07 21:22:22 -04:00 |
|
Isaac Connor
|
4fbab64368
|
Merge branch 'add_api_auth' into storageareas
|
2016-06-07 16:33:50 -04:00 |
|
Isaac Connor
|
dbdd1ae51e
|
remove debug logging
|
2016-06-07 16:26:58 -04:00 |
|
Isaac Connor
|
f26c9168c4
|
if user=&pass= are in request, use them for auth
|
2016-06-07 16:25:35 -04:00 |
|
Isaac Connor
|
94174a1fe2
|
use user= and pass= instead of auth hash
|
2016-06-07 15:47:59 -04:00 |
Andrew Bauer
|
f9de3215dd
|
Merge pull request #1515 from ZoneMinder/fix_version_problems
Have cmake take the version from the version file
|
2016-06-07 14:42:38 -05:00 |
|
Isaac Connor
|
5f76cc8677
|
accept user=&pass= in url for auth
|
2016-06-07 15:14:47 -04:00 |
|
Isaac Connor
|
086d435712
|
send zmcCommand to api on server
|
2016-06-07 14:39:59 -04:00 |
|
Isaac Connor
|
b2dfdea66e
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-06-07 11:45:50 -04:00 |
|
Isaac Connor
|
593fe2b0c5
|
update area when points move
|
2016-06-07 11:40:53 -04:00 |
|
Isaac Connor
|
bb6adc3012
|
fix missing space
|
2016-06-07 09:37:05 -04:00 |
|
Isaac Connor
|
b081d2e3bf
|
rename fs_monitor to monitor_id, which is what it is
|
2016-06-06 10:30:52 -04:00 |
|
Isaac Connor
|
2460bccdac
|
fix missing $
|
2016-06-06 10:18:21 -04:00 |
|
Andy Bauer
|
fb6c129f8b
|
bump version to 1.30.0
|
2016-06-04 13:46:23 -05:00 |
|
Isaac Connor
|
5f83bac59c
|
add line to delete empty directories
|
2016-06-03 12:01:31 -04:00 |
|
Isaac Connor
|
ad185809f8
|
Merge branch 'fix_zmaudit' into storageareas
|
2016-06-03 11:57:38 -04:00 |
|
Isaac Connor
|
575180ba5e
|
introduce new function that recursively deletes empty directories. Call it on each monitor dir
|
2016-06-03 11:35:28 -04:00 |
|
Isaac Connor
|
ef9c0ca33a
|
Debug the SQL on execute, not on parse
|
2016-06-03 11:15:40 -04:00 |
|
Isaac Connor
|
f0ec2a65ee
|
Merge branch 'fix_errors_when_event_not_found' into storageareas
|
2016-06-03 10:47:47 -04:00 |
|
Isaac Connor
|
380b86614f
|
put quotes around integer values that will be empty strings if the event is not found
|
2016-06-03 10:46:21 -04:00 |
|
Isaac Connor
|
4045211b36
|
Have cmake take the version from the version file
|
2016-06-03 09:51:50 -04:00 |