Commit Graph

86 Commits

Author SHA1 Message Date
Isaac Connor
1fbb5bc0f8 Fix zmaudit.pl => zmaudit, etc. 2018-01-17 14:22:04 -05:00
Isaac Connor
64f9118e46 remove debug line 2018-01-10 13:47:03 -05:00
Isaac Connor
156bdbd089 Add zmstats, zmaudit, zmtrigger flags to Server object listing/editing 2018-01-10 12:59:27 -05:00
Isaac Connor
2c361de9d3 add Server Storage Areas 2017-12-22 11:39:43 -08:00
Isaac Connor
dcfae11fc7 fix typos 2017-12-18 13:16:54 -05:00
Isaac Connor
9bd12d5b9a set a type on the buttons 2017-12-12 11:15:53 -05:00
Isaac Connor
5bd5f03611 redo buttons as button tags 2017-12-11 12:51:38 -05:00
Isaac Connor
00c5590a71 add Monitor count to servers 2017-11-27 11:56:48 -08:00
digital-gnome
b655689f47 Fix cache_bust
Cache busting was preventing changing css due to leaving symlinks behind.  Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
Isaac Connor
6905c6a1fb add CpuLoad t Servers list 2017-10-24 16:08:52 -07:00
Isaac Connor
82bf507ee9 Add Status, ram, swap to Servers List 2017-10-24 12:43:32 -07:00
Isaac Connor
345d9749ce Add Type to Storage Editing 2017-10-16 08:31:01 -07:00
Isaac Connor
28ef94fad0 handle an array as a Hint, fixing bandwidth option 2017-10-12 11:43:53 -07:00
Isaac Connor
e6c0add17e add ZM_BANDWIDTH_DEFAULT 2017-10-12 12:09:05 -04:00
Isaac Connor
ddb7305aab Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-02 09:11:55 -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
b5699dcac3 google code style 2017-09-26 17:14:27 -04:00
Isaac Connor
d69b16df24 add group filter to montagereview 2017-09-26 11:28:19 -04:00
Isaac Connor
085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Andrew Bauer
bacf65ae9a Migrate values from Options -> Paths to zm.conf (#1908)
* initial commit to migrate contents of Options->Paths to zm.conf

* remove paths items from configdata.pm

* remove paths tab from options

* update deb packaging scripts with new cmake vars

* remove extraneous file

* save custom paths variables to config file before dB is freshened

* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04: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
5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer
254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor
9262d9d14e remove debug messages on css changing 2016-07-22 16:02:55 -04:00
Isaac Connor
02b5cd6b6c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:17:10 -04:00
Isaac Connor
5d8eeb5b56 deprecate header, just the getNavBarHTML function 2016-05-06 15:16:48 -04:00
Isaac Connor
49dc917b2e Merge isaac:ZoneMinder.p1 into storageareas 2016-05-05 15:24:14 -04:00
Isaac Connor
4defe92911 Merge branch 'master' into updated-console 2016-05-03 14:22:37 -04:00
Isaac Connor
516bacdfd3 Merge branch 'updated-console' into storageareas 2016-05-03 13:38:57 -04:00
Kyle Johnson
a1b4869ee6 Add state modal to options view 2016-05-03 13:33:22 -04:00
Isaac Connor
9d6a7541c8 add Id column to storage areas 2016-05-02 10:40:42 -04:00
Isaac Connor
60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor
b3f0f5d0e8 Merge branch 'updated-console' into storageareas 2016-04-04 11:51:07 -04:00
Kyle Johnson
92e0552f8e Add side tab list to options page, and style it. 2016-04-01 14:02:19 -04:00
Isaac Connor
757740ede5 Move skin and css changing up above the include of header.php so that the set cookie call will work 2016-03-23 16:12:51 -04:00
Isaac Connor
dd06db0bf0 remove duplication 2016-03-23 15:54:20 -04:00
Isaac Connor
a66e97de09 Merge & fix new console & options 2016-03-23 09:48:57 -04:00
Kyle Johnson
897a0a995c Convert options layout to side-tabs, and improve readability 2016-03-15 15:21:28 -04:00
Kyle Johnson
183f58ad17 Restyle options view with horizontal form layout 2016-03-15 14:43:22 -04:00
Kyle Johnson
694ad0b539 Add styling to delete / save / add buttons in options.php 2016-03-15 14:08:01 -04:00
Kyle Johnson
bd30d40522 Remove cancel button from options as it no longer makes sense. 2016-03-15 14:03:17 -04:00
Kyle Johnson
0004a1180e Update options.php to use bootstrap container 2016-03-15 13:56:54 -04:00
Kyle Johnson
49f46ac927 Move the header into its own file, and include it in options view. 2016-03-15 13:43:49 -04:00
Kyle Johnson
8acfe1b0d8 Update options styling 2016-03-12 22:44:11 -05:00
SteveGilvarry
d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
SteveGilvarry
4837585601 Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
Conflicts:
	src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
Isaac Connor
818cd614eb Merge branch 'multi-server' into storageareas 2016-01-08 10:17:37 -05:00
Isaac Connor
d13829c6f3 Add Hostname to list of servers, since we have the space for it. 2016-01-08 10:15:06 -05:00
Isaac Connor
20f9a01a66 Add a Storage tab, to provide a place to define your storage areas 2015-12-15 11:13:21 -05:00
Isaac Connor
880e77b096 Merge branch 'master' into multi-server
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
2015-08-19 13:30:48 -04:00