ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,110 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

2692 Commits

Author SHA1 Message Date
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 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 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 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
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 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 b8c406f969 Merge branch 'master' into storageareas 2016-06-03 09:32:55 -04:00
Isaac Connor 060988c05c set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding 2016-05-31 16:02:37 -04:00
Andrew Bauer a57a3d3186 Merge pull request #1501 from ZoneMinder/fix_zone_edit 
Fix zone edit
 2016-05-31 10:33:31 -05:00
Isaac Connor 1add5a954a Merge branch 'fix_filter_actions' into storageareas 2016-05-29 11:37:08 -04:00
Isaac Connor 9f6f5100fe also copy Name from the request on update and only show delete button if it has a name 2016-05-29 11:32:18 -04:00
Isaac Connor 7725109917 Merge branch 'fix_filter_actions' into storageareas 2016-05-27 12:47:32 -04:00
Isaac Connor 101c93d422 When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object 2016-05-27 12:45:36 -04:00
Isaac Connor c4e5299943 sync up auto to Auto 2016-05-27 12:45:04 -04:00
Isaac Connor c25b680799 Merge branch 'fix_filter_actions' into storageareas 2016-05-27 11:12:18 -04:00
Isaac Connor 65e33d6c19 synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter 2016-05-27 11:11:30 -04:00
Isaac Connor d52a6f9a95 Merge branch 'improve_filter' into storageareas 2016-05-27 09:57:05 -04:00
Isaac Connor 3058dd9463 Merge branch 'id_on_console' into storageareas 2016-05-26 12:19:33 -04:00
Isaac Connor f461bc1e80 get rid of extra ) 2016-05-26 12:18:58 -04:00
Isaac Connor 05709f3084 Merge branch 'id_on_console' into storageareas 2016-05-26 11:17:41 -04:00
Isaac Connor f969186abb add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console 2016-05-26 11:15:13 -04:00
Andrew Bauer 730abc9789 make zones unclickable when zm is not running 2016-05-26 09:35:36 -05:00
Andrew Bauer 1972c4116b Merge pull request #1486 from connortechnology/update_image_view 
Update image view
 2016-05-26 09:05:14 -05:00
Andrew Bauer ceaacf91bf Merge pull request #1470 from connortechnology/api_improvements 
Api improvements
 2016-05-25 12:45:03 -05:00
Isaac Connor 7a08d4620f Merge branch 'master' into storageareas 2016-05-25 10:17:46 -04:00
Andrew Bauer 575f8ec265 Merge pull request #1488 from ZoneMinder/hide_rtspdescribe 
Hide rtspdescribe
 2016-05-25 08:44:17 -05:00
Isaac Connor 8f1596d683 use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr 2016-05-25 09:08:28 -04:00