Isaac Connor
|
e9c65785e8
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-03-30 10:56:53 -04:00 |
Isaac Connor
|
204a128ecc
|
fix use of connected when it should be mem_ptr
|
2016-03-29 15:46:47 -04:00 |
|
Isaac Connor
|
50f9241c14
|
When no Id is specified, default to ZM_DIR_EVENTS
|
2016-03-29 15:38:53 -04:00 |
|
Isaac Connor
|
1b69299c2d
|
Include Monitor object so it can be used elsewhere
|
2016-03-29 14:36:42 -04:00 |
|
Isaac Connor
|
1262e831ac
|
rework zmu to load data from the last event with frames when it can't connect to zmc
|
2016-03-29 14:36:16 -04:00 |
|
Isaac Connor
|
0ab6e27259
|
Use Monitor object
|
2016-03-29 14:35:12 -04:00 |
|
Isaac Connor
|
22554603b1
|
remove duplicate zmtelemetry.pl entry
|
2016-03-29 12:31:27 -04:00 |
|
Isaac Connor
|
cfa11b95dc
|
Add missing Server and Storage Area filters
|
2016-03-29 12:27:23 -04:00 |
|
Isaac Connor
|
d91045319d
|
Use Event object delete method in deleteEvent
|
2016-03-29 12:07:13 -04:00 |
|
Isaac Connor
|
c309cdaad4
|
include Event object so it can be used elsewhere
|
2016-03-29 12:06:51 -04:00 |
|
Isaac Connor
|
f0a307e082
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
Conflicts:
distros/ubuntu1504_cmake/control
|
2016-03-29 11:53:17 -04:00 |
|
Isaac Connor
|
1ea1852476
|
Do some Storage Areas support
|
2016-03-29 11:52:25 -04:00 |
|
Isaac Connor
|
58f19f14e1
|
print ip and hostname when can't connect
|
2016-03-29 11:51:58 -04:00 |
|
Isaac Connor
|
34c50b8cfc
|
ipv6 support
|
2016-03-29 11:51:28 -04:00 |
|
Isaac Connor
|
e3564f6a63
|
add zmtelemtry.pl
|
2016-03-29 11:51:03 -04:00 |
|
Isaac Connor
|
e4d0f2ffda
|
fixup depends
|
2016-03-29 11:50:51 -04:00 |
|
Isaac Connor
|
3cb7687789
|
add zmtelemetry.pl to autotools build
|
2016-03-29 11:50:25 -04:00 |
|
Isaac Connor
|
655116eea9
|
add LinkPath and delete methods
|
2016-03-29 11:49:15 -04:00 |
|
Isaac Connor
|
7f34a0df37
|
Remove deprecated --enable-crashtrace
|
2016-03-29 11:48:30 -04:00 |
|
Isaac Connor
|
a66e97de09
|
Merge & fix new console & options
|
2016-03-23 09:48:57 -04:00 |
|
Isaac Connor
|
3a8352eb6b
|
Merge branch 'master' into storageareas
|
2016-03-21 10:25:03 -04:00 |
Andrew Bauer
|
cf35da07b5
|
Merge pull request #1349 from altaroca/onvif-discovery-1346
Improved Onvif discovery #1346
|
2016-03-21 08:47:23 -05:00 |
Steve Gilvarry
|
ecb8c48b3b
|
Merge pull request #1344 from jburgess777/spelling
Fix spelling of 'environment' in README.Centos7
|
2016-03-20 09:05:47 +11:00 |
|
Steve Gilvarry
|
e85c56d005
|
Merge pull request #1348 from jburgess777/spelling2
Doc reference to Astericks was presumably meant to be Asterisk.
|
2016-03-20 09:05:07 +11:00 |
Jan M. Hochstein
|
39053f9325
|
WSDiscovery version changed from 1.1 to 1.0
|
2016-03-19 18:36:12 +01:00 |
Jon Burgess
|
b11f3bce53
|
Assume this was meant to be Asterisk, not Astericks.
|
2016-03-19 15:25:17 +00:00 |
|
Jon Burgess
|
06e04127d6
|
Fix spelling in other README files as well
|
2016-03-18 23:27:43 +00:00 |
|
Jon Burgess
|
94057a94ff
|
Fix spelling of 'environment'
|
2016-03-18 22:42:34 +00:00 |
Kyle Johnson
|
897a0a995c
|
Convert options layout to side-tabs, and improve readability
|
2016-03-15 15:21:28 -04:00 |
|
Kyle Johnson
|
87932002cf
|
Push the options page down a bit to make tab look better
|
2016-03-15 14:45:40 -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
|
26748c2de5
|
Oops. Move Console view outside of canView(system) restriction
|
2016-03-15 13:52:36 -04:00 |
|
Kyle Johnson
|
f05c1548ce
|
Add a link back to console in header
|
2016-03-15 13:49:14 -04:00 |
|
Kyle Johnson
|
299c61c1ec
|
Make the Options link a standard href (not a popup).
|
2016-03-15 13:47:31 -04:00 |
|
Kyle Johnson
|
8070bf8700
|
Move console php code to header as that code is now needed in additional views.
|
2016-03-15 13:46:03 -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 |
|
Andrew Bauer
|
fe46785e94
|
Update redhat.rst
|
2016-03-15 07:33:40 -05:00 |
|
Andrew Bauer
|
68a5e78efc
|
Update redhat.rst
|
2016-03-15 07:30:31 -05:00 |
|
Andrew Bauer
|
dcdb879637
|
Update redhat.rst
|
2016-03-15 07:24:15 -05:00 |
|
Andrew Bauer
|
4581379d45
|
Update redhat.rst
minor edits
|
2016-03-15 07:21:34 -05:00 |
|
Andrew Bauer
|
8f3cdef44c
|
Merge pull request #1312 from knnniggett/readthedocs
add redhat instructions to readthedocs
|
2016-03-15 07:08:43 -05:00 |
|
Andrew Bauer
|
51a16b73c4
|
Merge pull request #1338 from altaroca/onvif-proxies-1320
Added Proxies for WSNotification and ONVIF-Analytics
|
2016-03-13 17:28:53 -05:00 |
|
Jan M. Hochstein
|
2c0c014535
|
Added Proxies for WSNotification and ONVIF-Analytics
|
2016-03-13 10:16:20 +01:00 |
|
Kyle Johnson
|
8acfe1b0d8
|
Update options styling
|
2016-03-12 22:44:11 -05:00 |
|
Kyle Johnson
|
2378c9a359
|
Fix state link to do popup like before
|
2016-03-12 20:44:42 -05:00 |
|
Kyle Johnson
|
d202760d82
|
Additional footer padding
|
2016-03-12 20:37:07 -05:00 |
|
Kyle Johnson
|
f5ba52824a
|
Add styles to additional console buttons
|
2016-03-12 20:36:39 -05:00 |