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

7072 Commits

Author SHA1 Message Date
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 408646ea4d remove extra s 2016-05-27 10:52:59 -04:00
Isaac Connor 7277283659 rename AttrServerId to AttrServer, because that is the text that is returned 2016-05-27 10:12:46 -04:00
Isaac Connor d52a6f9a95 Merge branch 'improve_filter' into storageareas 2016-05-27 09:57:05 -04:00
Isaac Connor f8f8dbe9fe Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-27 09:01:09 -04:00
Isaac Connor 1983f106f4 Add a missing sth->finish 2016-05-27 09:01:01 -04:00
Isaac Connor b0116f25e9 put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo 2016-05-27 08:59:46 -04:00
Isaac Connor 419e67caa1 Put back the code that populates ZM_SERVER_ID 2016-05-26 12:42:22 -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
Isaac Connor b9322a02e8 Merge branch 'get_rid_of_ConfigAdmin' into storageareas 2016-05-26 09:56:16 -04:00
Isaac Connor e329bacb78 remove deprecated ConfigAdmin 2016-05-26 09:51:48 -04:00
Andrew Bauer ceaacf91bf Merge pull request #1470 from connortechnology/api_improvements 
Api improvements
 2016-05-25 12:45:03 -05:00
Isaac Connor b309837f02 put back zmDbRow use 2016-05-25 10:21:44 -04:00
Isaac Connor 7a08d4620f Merge branch 'master' into storageareas 2016-05-25 10:17:46 -04:00
Isaac Connor a0af99459a Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-05-25 10:12:22 -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
Isaac Connor aedba1bc7f whitespace, google code style. Adds special cases for ServerId Attribute. ANd uses * to load all event fields instead of specifying each one. 2016-05-24 16:49:04 -04:00
Isaac Connor 7cfa2a5eaa Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone 2016-05-24 16:46:34 -04:00
Isaac Connor 277fdafa85 Remove entry for Server Name, making Server Id just say Server. The filters will be populated with a dropdown, so no need to go by Id or Name 2016-05-24 16:45:55 -04:00
Isaac Connor 8fabeb78d3 Merge branch 'fix_zone_edit' into storageareas 2016-05-24 15:55:49 -04:00
Isaac Connor a8e407172a split out versus get functionality in includes/functions. Fix positioning of svg over image stream 2016-05-24 15:50:22 -04:00
Isaac Connor 89f58daf89 Merge branch 'master' into fix_zone_edit 2016-05-24 15:30:56 -04:00
Isaac Connor ae1eb94f27 fix getStreamHTML when using helper 2016-05-24 15:10:37 -04:00
Isaac Connor 3f880fad3a Merge pull request #1500 from knnniggett/zmdc_unlink 
remove one unlink, add better error reporting to the rest
 2016-05-24 14:35:39 -04:00
Andrew Bauer 0052bb080c unlink only if file exists 2016-05-24 12:13:17 -05:00
Isaac Connor 00abd36af8 fix the other case of the wrong case of rtsp 2016-05-24 12:19:31 -04:00
Isaac Connor 056eed6df9 fix to show RTSP describe option when switching back to rtsp 2016-05-24 12:15:59 -04:00
Isaac Connor 0522b03364 Merge pull request #1499 from knnniggett/mserver_msg 
move multiserver message to display once during startup only
 2016-05-24 11:08:11 -04:00
Andy Bauer d12b9dc16d fix typo. needs } 2016-05-24 09:24:18 -05:00
Andrew Bauer 11701357aa remove one unlink, add better error reporting to the rest 2016-05-24 09:01:32 -05:00
Andy Bauer 6e82f2c9a9 add messages back with debug 3 2016-05-24 08:50:09 -05:00
Isaac Connor bc49aa6aa6 add missing ; and remove extra ) 2016-05-24 09:34:36 -04:00
Isaac Connor 5eac0559e2 Merge branch 'master' into hide_rtspdescribe 2016-05-24 09:32:41 -04:00
Andrew Bauer bec14bf111 Merge pull request #1478 from ZoneMinder/fix_montage_server_refs 
pass in the server url into the monitor object to use instead of the …
 2016-05-23 20:14:35 -05:00
Andrew Bauer bc163b33fc move multiserver message to once during startup only 2016-05-23 20:06:29 -05:00
Isaac Connor 47db5819db Merge pull request #1494 from pliablepixels/1493-api-fix-add-monitor-daemonc 
don't pass partial data to daemoncontrol
 2016-05-22 10:15:40 -04:00
Isaac Connor d18bbc032f Merge pull request #1495 from pliablepixels/update-api-docs 
added alarm apis
 2016-05-22 10:15:00 -04:00
Isaac Connor 68bc10eb93 Merge pull request #1497 from ZoneMinder/zmtelemetry 
fix invalid key name in config hash
 2016-05-22 10:14:12 -04:00
Isaac Connor 1e52934dcf Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem 2016-05-20 20:33:47 -04:00
Andrew Bauer 8bbb443c67 fix invalid key name in config hash 2016-05-20 10:35:03 -05:00
Andrew Bauer 58b5194054 Merge pull request #1496 from ZoneMinder/undo_merge_db_connects 
revert the bulk of the merge_db_connects changes.
 2016-05-20 09:37:53 -05:00