Commit Graph

9643 Commits

Author SHA1 Message Date
digital-gnome c39cf77a9c removealarmcuesPHP
removed the PHP rendering and placement code
2017-10-08 21:42:12 -04:00
Isaac Connor 219b7e0f36 output failing sql 2017-10-08 09:13:56 -04:00
Isaac Connor 7b7d477ab2 spacing, increase debug level of discovered formats. Don't crash if device returns more than 64 formats 2017-10-08 09:13:37 -04:00
Isaac Connor d4cf84f7e6 Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
Isaac Connor d0541b0837 Merge pull request #27 from digital-gnome/eventnavFix
Fix nearevents path
2017-10-07 12:49:50 -04:00
digital-gnome e23b4a0d5d Fix event path 2017-10-07 12:42:16 -04:00
Isaac Connor f230aa01ef turn off debug 2017-10-07 11:31:48 -04:00
Isaac Connor df1fa97e0c handle nulls in StorageId and device 2017-10-06 16:17:37 -04:00
Isaac Connor ed3d001c65 Merge pull request #26 from digital-gnome/NPH-ZMS-loading-on-mp4
Only load imageFeed if needed
2017-10-05 17:09:45 -04:00
Isaac Connor 69ab1b18ad fix new gruop not being savable 2017-10-05 16:12:12 -04:00
Isaac Connor ee87b29189 fix new gruop not being savable 2017-10-05 16:12:05 -04:00
Isaac Connor a7e3c0b458 spacing 2017-10-05 16:11:54 -04:00
Isaac Connor 827e858feb use a cached Storage object to prevent hitting the db al lot 2017-10-05 16:11:43 -04:00
Isaac Connor c768e6ed88 add some more utility functions that should be available everywhere 2017-10-05 16:11:21 -04:00
Isaac Connor 09242d72b3 implement alternate ports for streaming 2017-10-05 16:05:41 -04:00
digital-gnome 6952e84c01 Only load imageFeed if needed 2017-10-05 11:20:42 -04:00
Isaac Connor 40972383c1 remove debug 2017-10-05 10:48:04 -04:00
Isaac Connor b56a976d7a fixes to montage review and cleanup in group filtering/editing 2017-10-05 10:46:04 -04:00
Isaac Connor de03726675 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-10-05 09:35:32 -04:00
Isaac Connor 20087e69e6 TEXT cannot have a default value 2017-10-04 22:22:28 -04:00
Isaac Connor b2426321b0 increase the length of MonitorIds in Groups 2017-10-04 21:53:47 -04:00
Isaac Connor 91c2e07e64 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-04 21:51:38 -04:00
Isaac Connor 6c87ed10c1 add a notice when javascript is turned off 2017-10-04 21:51:30 -04:00
Isaac Connor 87a49ad009 work on infinite depths of groups 2017-10-04 16:40:09 -04:00
digital-gnome 398600d5f2 Placement for alarmCues 2017-10-04 11:09:22 -04:00
digital-gnome ea4b9486aa alarmCues CSS
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
Isaac Connor 54949db0b5 spacing/google code style 2017-10-04 10:48:37 -04:00
Isaac Connor 8f8d66189c Google code style 2017-10-04 10:48:24 -04:00
Isaac Connor 995809ccb7 fix play/pause while editing zone 2017-10-04 10:48:14 -04:00
Isaac Connor 42d383da6b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-10-04 10:04:53 -04:00
digital-gnome 5bbe9b40e7 renderAlarmCues function
Generates the html for alarmcues and passes it to JS var
2017-10-03 19:26:48 -04:00
APHW2 MFGENG c11f310f54 fix 2017-10-03 14:51:57 -07:00
APHW2 MFGENG 354262c557 wip nvsocket 2017-10-03 13:28:56 -07:00
Isaac Connor ad1808d43b warn when path doesn't exist in event::age 2017-10-03 13:25:05 -04:00
Isaac Connor c46769495b Merge pull request #22 from digital-gnome/storageareas-navigation
Storageareas navigation
2017-10-03 10:18:44 -04:00
Isaac Connor e8cc0d8256 set a default on DefaultVideo 2017-10-02 15:43:15 -04:00
digital-gnome 9b241ee370 Also change class
With the css class properly set it turns out this wasn't working.
2017-10-02 15:41:04 -04:00
digital-gnome 33a3e04f43 Fix class selector 2017-10-02 15:40:18 -04:00
Isaac Connor 72ca011e2f fix favicon 2017-10-02 13:05:23 -04:00
Isaac Connor a1847aff75 add in new experimental nvsocket camera 2017-10-02 12:57:40 -04:00
Isaac Connor 462ea72ef5 properly test for existence of popupSizes 2017-10-02 12:43:52 -04:00
Isaac Connor 351d8ef24d make the word bandwidth also be part of the link 2017-10-02 12:39:39 -04:00
Isaac Connor d831f98dfb remove debug 2017-10-02 12:31:38 -04:00
Isaac Connor c7ac854cfd always include classic.js 2017-10-02 12:30:55 -04:00
Isaac Connor d8c69ab514 error gracefully when popupSizes not defined 2017-10-02 12:30:30 -04:00
Isaac Connor 207d57a3e6 use xhtmlfooter function to finish off html 2017-10-02 11:55:52 -04:00
Isaac Connor b52944258d use css skin based favicon if it exists. 2017-10-02 11:55:36 -04:00
Isaac Connor 16a731af1c fix path when changing status. 2017-10-02 11:55:17 -04:00
Isaac Connor 15ba7d2a35 fixes 2017-10-02 11:25:51 -04:00
digital-gnome c35face630 LengthTypo 2017-10-02 10:52:55 -04:00