Isaac Connor
|
b16cd7ec84
|
Merge branch 'h265' into zma_to_thread
|
2018-11-20 12:38:17 -05:00 |
|
Isaac Connor
|
e24a308481
|
Merge branch 'master' into h265
|
2018-11-14 17:15:37 -05:00 |
|
Isaac Connor
|
ec09a71ba0
|
Include defaults for all the missing Monitor Columns
|
2018-11-07 13:18:53 -05:00 |
|
Isaac Connor
|
a8329465fb
|
Merge branch 'master' into h265
|
2018-10-22 10:30:01 -04:00 |
Isaac Connor
|
5ab1126260
|
Merge branch 'storageareas' into zma_to_thread
|
2018-10-20 17:31:14 -04:00 |
|
Isaac Connor
|
37065d15ac
|
fix url to api in monitor restart.
|
2018-10-16 09:47:24 -04:00 |
|
Isaac Connor
|
c4c8a728f2
|
Handle no controls found more gracefully
|
2018-10-10 19:04:00 -04:00 |
|
Isaac Connor
|
52b1439d51
|
fix the lack of /zm/index.php in url in Server->Url() and multiport
|
2018-10-08 09:55:47 -04:00 |
|
Isaac Connor
|
503b40cb62
|
Need to cache the object not the row
|
2018-09-20 10:07:15 -04:00 |
|
Isaac Connor
|
7f98277571
|
Merge updated Monitor.php that does caching
|
2018-09-15 09:52:08 -04:00 |
|
Isaac Connor
|
b5b71edbf6
|
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
|
2018-09-14 14:26:45 -04:00 |
|
Isaac Connor
|
03f769eacc
|
Rough in codec specification for Events
|
2018-09-10 12:22:55 -04:00 |
|
Isaac Connor
|
55dcb161ae
|
find should always return an array
|
2018-09-09 13:59:10 -04:00 |
|
Isaac Connor
|
dfdac2ed70
|
make find and find_one functions consistent across Objects
|
2018-09-07 16:31:11 -04:00 |
|
Isaac Connor
|
979b31ffc3
|
Merge branch 'storageareas' into zma_to_thread
|
2018-08-11 10:08:30 -04:00 |
|
Isaac Connor
|
363e1dda97
|
Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php
|
2018-07-31 10:15:26 -04:00 |
|
Isaac Connor
|
d271d8bf1d
|
Fix my botched change to generateAuthHash
|
2018-06-25 14:50:54 -04:00 |
Andrew Bauer
|
3ffd30ffbd
|
Allow selection of different source column filtering on the console (#2132)
|
2018-06-20 11:12:43 -04:00 |
|
Isaac Connor
|
73555edfdc
|
Add Error message when a monitor has no server assigned in a multi-server setup
|
2018-06-11 16:34:23 -04:00 |
|
Isaac Connor
|
af3ce3660f
|
Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete.
|
2018-05-24 09:54:45 -04:00 |
|
Isaac Connor
|
4454ca0072
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-20 10:39:14 -04:00 |
|
Isaac Connor
|
be424f46f0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-18 12:07:22 -04:00 |
Isaac Connor
|
49d75ce039
|
handle Width and Height not being in ->{} and returnining defaults. Include Path in Source
|
2018-05-15 10:45:47 -07:00 |
|
Isaac Connor
|
94377a4652
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-05 12:57:50 -04:00 |
|
Isaac Connor
|
5772ff9161
|
return default values for Width and Height
|
2018-05-05 12:49:00 -04:00 |
|
Isaac Connor
|
f6139d33ed
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-05 12:25:11 -04:00 |
|
Isaac Connor
|
3fd953a4eb
|
Move code to generate Source from console into Monitor Object
|
2018-05-04 06:46:46 -07:00 |
|
Isaac Connor
|
2a81877664
|
spacing
|
2018-04-25 09:31:40 -04:00 |
|
Isaac Connor
|
80803a164c
|
in set(), check to see if there is a method and if there is call it to set the value. Implement using GroupIds to set the GroupIds value. If the new value is a scalar, then turn it into an array.
|
2018-04-25 09:27:43 -04:00 |
|
Isaac Connor
|
20f6985dff
|
implement capturing bandwidth
|
2018-04-24 14:11:27 -04:00 |
|
Isaac Connor
|
fd1c69d48a
|
switch to uint64_t for event_id because long long can actually be 128 bit
|
2018-04-17 13:51:20 -04:00 |
|
Isaac Connor
|
c7deb91319
|
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
|
2018-04-14 14:58:25 -04:00 |
|
Isaac Connor
|
cd3046abb3
|
Merge branch 'storageareas' into zma_to_thread
|
2018-04-14 11:03:08 -04:00 |
|
Isaac Connor
|
47b871ed9f
|
implement MIN_STREAMING_PORT for Multi-server
|
2018-04-11 13:50:35 -07:00 |
|
Isaac Connor
|
03ff2fcde4
|
add caching and find_one to Storage and Groups
|
2018-04-10 13:05:37 -07:00 |
|
Isaac Connor
|
6faf9b5c35
|
fix including auth on remote restart
|
2018-04-05 11:24:47 -04:00 |
|
Isaac Connor
|
1033755dc8
|
add missing {
|
2018-04-04 16:46:38 -04:00 |
|
Isaac Connor
|
6ebedff2e1
|
If using MIN_STREAMING_PORT then use ['SERVER_NAME'] instead of HTTP_HOST because HTTP_HOST may contain a custom port
|
2018-04-04 16:45:25 -04:00 |
|
Isaac Connor
|
914de097db
|
Fix typo
|
2018-03-23 13:34:46 -07:00 |
|
Isaac Connor
|
61d438511f
|
Fixes to delete
|
2018-03-21 11:32:54 -07:00 |
|
Isaac Connor
|
eade5316b9
|
Move Monitor delete logic to the object. Don't fixSequences when deleting monitors
|
2018-03-20 12:18:07 -07:00 |
|
Isaac Connor
|
03d3f5e665
|
Merge branch 'storageareas' into zma_to_thread
|
2018-03-03 13:28:01 -08:00 |
|
Isaac Connor
|
9a157bf4ca
|
add Type, MaxFPS, AlarmMaxFPS to field defaults
|
2018-03-01 19:23:27 -08:00 |
|
Isaac Connor
|
c443168389
|
split out codec and encoder, allowing one to specify which encoder to use
|
2018-02-28 07:17:16 -08:00 |
|
Isaac Connor
|
67cc7dcf7c
|
Add a GroupIds function to return the groups
|
2018-02-27 11:20:41 -08:00 |
|
Isaac Connor
|
3ce46d3fed
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-29 15:55:05 -05:00 |
|
Isaac Connor
|
67b365948e
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
|
2018-01-29 15:53:26 -05:00 |
|
Isaac Connor
|
e638817cb9
|
Check for ServerId exists in MonitorObject
|
2018-01-29 10:40:50 -08:00 |
|
Isaac Connor
|
73d84c6b08
|
fix typo
|
2018-01-29 07:53:48 -08:00 |
|
Isaac Connor
|
8c4a786114
|
Move status fields out of the object fields
|
2018-01-29 10:27:46 -05:00 |