Commit Graph

111 Commits

Author SHA1 Message Date
digital-gnome 6d6b4366de Fix MontageReview filters 2017-12-02 12:29:54 -05:00
digital-gnome 1289269e6f Change filter to work without popup 2017-12-02 12:28:04 -05:00
digital-gnome 53f886edc4 Make navbar refresh not change header links 2017-12-01 22:15:29 -05:00
digital-gnome 0a995aea78 Add navbar refresh to all pages that use it 2017-11-30 16:33:46 -05:00
Isaac Connor 09938ef7ee join the echo's into 1 to also get the line breaks 2017-11-03 09:24:13 -04:00
Isaac Connor e6918cd1bd implement crude cache busting code for .js and .css files 2017-11-01 09:41:19 -04:00
Isaac Connor 653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
Isaac Connor c363b5a190 fix some missing break lines in output 2017-10-17 10:10:20 -07:00
Isaac Connor ffc1ac43f5 put back disk space in header, more debug in caching storagea 2017-10-10 14:06:21 -04:00
Isaac Connor 31e3a2d28d turn off disk space reporting 2017-10-10 10:41:04 -07:00
Isaac Connor 3af795264d add actual disk space as a mouseover in nav bar 2017-10-10 10:38:13 -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 6c87ed10c1 add a notice when javascript is turned off 2017-10-04 21:51:30 -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 72ca011e2f fix favicon 2017-10-02 13:05:23 -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 c7ac854cfd always include classic.js 2017-10-02 12:30:55 -04:00
Isaac Connor b52944258d use css skin based favicon if it exists. 2017-10-02 11:55:36 -04:00
Isaac Connor 15ba7d2a35 fixes 2017-10-02 11:25:51 -04:00
Isaac Connor eaf29d2024 add a class to the active view link to highlight it 2017-10-02 09:02:57 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
Isaac Connor 4e16523cff Say Groups instead of listing the # of monitors in the header 2017-09-23 13:41:52 -04:00
Isaac Connor f294acde92 add global and for including the state view 2017-07-13 10:07:23 -04:00
Isaac Connor 22e957ba46 clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100% 2017-07-12 12:49:01 -04:00
Isaac Connor 0adc14da4e fix links to Filter and Devices 2017-07-12 11:17:07 -04:00
Isaac Connor 5df4494c6c make Filters a main window view instead of a popup 2017-06-20 09:08:57 -04:00
Isaac Connor 8145f2bc4c whitespace 2017-06-15 12:13:40 -04:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Isaac Connor 175e6921f9 use version-generic urls to jquery and jquery-ui 2017-06-07 14:13:03 -04:00
Isaac Connor b4bdc1fd6b Merge branch 'master' into dragndrop_monitor_sorting 2017-06-06 20:39:58 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor 07835969f1 get rid of viewport line that prevents zooming in and out 2017-06-04 17:31:17 -04:00
Isaac Connor ece10d6278 braces and whitspace 2017-05-31 11:16:55 -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 7cfa0b12ec Merge branch 'dragndrop_monitor_sorting' into storageareas 2017-05-25 15:26:04 -04:00
Isaac Connor aacfea735e always include bootstrap, and include jquery 2017-05-25 15:00:44 -04:00
Isaac Connor f4008e2c6a Merge branch 'master' into storageareas 2017-05-19 11:20:33 -04:00
Isaac Connor f851daca68 merge code to load video.js etc on Event view 2017-05-18 15:10:13 -04:00
Isaac Connor bde887fc9c remove unneeded ;'s 2017-05-05 17:17:55 -04:00
Isaac Connor 9482114f95 add db connections to the header 2017-04-28 14:17:09 -04:00
Isaac Connor 83ba74ad66 work in progress, rough in adding the svg zones to montage 2017-04-24 11:11:54 -04:00
Isaac Connor 035b464b97 Revert "don't use external hosted video.js or moment.js"
This reverts commit fb2f8022a7.
2017-04-20 10:45:51 -04:00
Isaac Connor fb2f8022a7 don't use external hosted video.js or moment.js 2017-04-20 10:12:47 -04:00
Isaac Connor 7b73eb350f update to current. 2017-02-02 12:15:16 -05:00
Isaac Connor 6f6eacaa72 fixup classic and dark skins 2017-01-30 21:45:48 -05:00
Isaac Connor 89022fff0c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-30 21:16:26 -05:00
Isaac Connor f3378207c0 make navbar static instead of fixed, sync up dark theme, and improve storage editing styles 2017-01-30 21:16:21 -05:00
Isaac Connor ad2e00166a use isset 2017-01-30 19:53:08 -05:00
Isaac Connor 4543b3e1b1 include jquery-ui instead of using a cdn version 2017-01-30 19:17:14 -05:00
Isaac Connor 19aed3f860 dont check ZM_DIR_EVENTS if it already exists in storageareas 2017-01-30 17:29:15 -05:00