1ca5eee53a
spacing
2019-05-06 10:45:40 -04:00
501324d778
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-04-01 22:09:57 -04:00
d5402e9cba
Correct Storaage Server name in list
2019-04-01 22:09:47 -04:00
052a2ef1fd
fix eventserver => eventnotification
2019-03-25 12:20:21 -04:00
7e62ccca3c
Handle div by zero when TotalMem is not known for Server
2019-03-25 12:08:56 -04:00
804c384b4c
add Event Notification support to server
2019-02-27 09:29:11 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
99f1e23c5b
Replace usage of PHP_SELF in views/. Fixes #2450
2019-02-09 21:39:19 -08:00
43a1725060
Fix duplicate 'class' attribute in options ( #2418 )
2019-01-18 10:05:44 -05:00
a2c23d3263
Need nonce in inline script setting display css
2019-01-16 13:45:26 -05:00
d33fec9c3f
Add a CSP script-src policy with nonce-source and convert more inline event handlers ( #2413 )
...
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy
* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'
Only handle ones that don't return a value.
* Use @data-on-click to attach inline click event handlers with no args and no return value
* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument
* Enforce a script-src CSP on views without inline JS
* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
083f284599
Replace onclick inline event handlers for createPopup ( #2410 )
...
* Move <script> before </body>
* Change makePopupLink to not use onclick
* Change makePopupButton to not use onclick
* Use .popup-link in control_functions.php
* Use makePopupButton in controlcaps.php
* Prevent double-encoding in makePopup*
* Use makePopupButton in devices.php
* Use makePopupButton in logout.php
* Use makePopupLink in monitor.php
* Use makePopupLink and .popup-link in montage.php
* Use makePopupButton in options.php
* Use makePopupButton, makePopupLink, and .popup-link in zones.php
2019-01-15 09:01:58 -05:00
874930d8fc
Merge branch 'master' into improve_config_efficiency
2019-01-02 13:07:53 -05:00
1c17f334d3
fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well
2018-11-29 14:26:30 -05:00
cd13dda294
fix use of instead of
2018-11-28 09:54:22 -05:00
f8b2ff5c77
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
2018-11-27 17:35:25 -05:00
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
4c7fe8741b
Load the complete config info only for options
2018-10-19 15:00:47 -04:00
8a5c989cac
fix warning when editing users after a monitor has been deleted
2018-09-18 08:52:43 -04:00
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
6e5472d305
Merge branch 'master' into server_path_prefix
2018-08-22 12:57:16 -04:00
6ab1c3ced8
proper case table header
2018-07-25 09:39:08 -04:00
0b4d76f931
Add PathPrefix column to the server list
2018-07-09 14:36:46 -04:00
5d772f16f6
fix closing td
2018-06-01 16:18:07 -04:00
e891c88a3e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-28 12:38:57 -04:00
abd52ebfb1
Add DiskSpace column to storage listing
2018-04-28 12:38:10 -04:00
636d0caf30
handle no swap
2018-04-25 10:28:19 -07:00
b077cc8900
table header - keep consistent
2018-03-26 11:50:14 -04:00
9d1a8b1e18
Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10%
2018-02-26 10:39:45 -08:00
1fbb5bc0f8
Fix zmaudit.pl => zmaudit, etc.
2018-01-17 14:22:04 -05:00
64f9118e46
remove debug line
2018-01-10 13:47:03 -05:00
156bdbd089
Add zmstats, zmaudit, zmtrigger flags to Server object listing/editing
2018-01-10 12:59:27 -05:00
2c361de9d3
add Server Storage Areas
2017-12-22 11:39:43 -08:00
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
9bd12d5b9a
set a type on the buttons
2017-12-12 11:15:53 -05:00
5bd5f03611
redo buttons as button tags
2017-12-11 12:51:38 -05:00
00c5590a71
add Monitor count to servers
2017-11-27 11:56:48 -08:00
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
6905c6a1fb
add CpuLoad t Servers list
2017-10-24 16:08:52 -07:00
82bf507ee9
Add Status, ram, swap to Servers List
2017-10-24 12:43:32 -07:00
345d9749ce
Add Type to Storage Editing
2017-10-16 08:31:01 -07:00
28ef94fad0
handle an array as a Hint, fixing bandwidth option
2017-10-12 11:43:53 -07:00
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
ddb7305aab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-02 09:11:55 -04:00
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
b5699dcac3
google code style
2017-09-26 17:14:27 -04:00
d69b16df24
add group filter to montagereview
2017-09-26 11:28:19 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
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
f3378207c0
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
2017-01-30 21:16:21 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
9262d9d14e
remove debug messages on css changing
2016-07-22 16:02:55 -04:00
02b5cd6b6c
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:17:10 -04:00
5d8eeb5b56
deprecate header, just the getNavBarHTML function
2016-05-06 15:16:48 -04:00
49dc917b2e
Merge isaac:ZoneMinder.p1 into storageareas
2016-05-05 15:24:14 -04:00
4defe92911
Merge branch 'master' into updated-console
2016-05-03 14:22:37 -04:00
516bacdfd3
Merge branch 'updated-console' into storageareas
2016-05-03 13:38:57 -04:00
a1b4869ee6
Add state modal to options view
2016-05-03 13:33:22 -04:00
9d6a7541c8
add Id column to storage areas
2016-05-02 10:40:42 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
b3f0f5d0e8
Merge branch 'updated-console' into storageareas
2016-04-04 11:51:07 -04:00
92e0552f8e
Add side tab list to options page, and style it.
2016-04-01 14:02:19 -04:00
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
dd06db0bf0
remove duplication
2016-03-23 15:54:20 -04:00
a66e97de09
Merge & fix new console & options
2016-03-23 09:48:57 -04:00
897a0a995c
Convert options layout to side-tabs, and improve readability
2016-03-15 15:21:28 -04:00
183f58ad17
Restyle options view with horizontal form layout
2016-03-15 14:43:22 -04:00
694ad0b539
Add styling to delete / save / add buttons in options.php
2016-03-15 14:08:01 -04:00
bd30d40522
Remove cancel button from options as it no longer makes sense.
2016-03-15 14:03:17 -04:00
0004a1180e
Update options.php to use bootstrap container
2016-03-15 13:56:54 -04:00
49f46ac927
Move the header into its own file, and include it in options view.
2016-03-15 13:43:49 -04:00
8acfe1b0d8
Update options styling
2016-03-12 22:44:11 -05:00
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
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
818cd614eb
Merge branch 'multi-server' into storageareas
2016-01-08 10:17:37 -05:00
d13829c6f3
Add Hostname to list of servers, since we have the space for it.
2016-01-08 10:15:06 -05:00
20f9a01a66
Add a Storage tab, to provide a place to define your storage areas
2015-12-15 11:13:21 -05:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
99d674ef78
remove code that put a * next to the server name. It was copied from the user list and indicated the logged in user.
2015-08-16 12:22:31 -04:00
c051f3482b
add Groups to options again
2015-08-15 12:37:25 -05:00
1d97e9d1f9
Add Groups column to options
2015-08-15 12:24:48 -05:00
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
05206279df
add missing commas
2014-12-18 09:44:04 -05:00
478c9bc630
add custom lines for loading the available skins and css options
2014-12-18 09:34:14 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
af0d9a1065
bug fix for listing the css options.
...
use SELECTED="SELECTED" instead of just SELECTED
2014-12-01 15:58:00 -05:00
193cb71b71
Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css.
2014-11-26 11:55:53 -05:00
9a0eb63df2
Merge pull request #415 from m-bene/selectSkin
...
make skin selection persistent
2014-07-04 12:57:37 -05:00
11718f0559
The users tab should always be available. It is useful to configure users BEFORE turning on auth.
2014-06-25 13:39:31 -04:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
de107f77ba
fix option help text for overlooked languages
2014-05-17 04:51:01 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
b197f985e0
make expiry date relative (~10years)
2014-05-01 09:53:45 +02:00
ed7ca66045
make skin selection cookie persistent
2014-05-01 09:37:39 +02:00
f737af15b9
Fix reload loop on switching skins
2014-04-11 09:40:23 +02:00
b64c506659
Added SFTP upload option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
Isaac Connor
Isaac Connor
Matthew Noorenberghe
Isaac Connor
Pliable Pixels
digital-gnome
Isaac Connor
Andrew Bauer
Andy Bauer
Isaac Connor
Kyle Johnson
Isaac Connor
SteveGilvarry
Andrew Bauer
SteveGilvarry
m-bene
stan