Isaac Connor
|
5ab1126260
|
Merge branch 'storageareas' into zma_to_thread
|
2018-10-20 17:31:14 -04:00 |
Isaac Connor
|
c47b4a5a04
|
Merge branch 'improve_config_efficiency' into storageareas
|
2018-10-19 15:03:00 -04:00 |
|
Isaac Connor
|
e30b100e8e
|
Don't load & process categories in initial config loading
|
2018-10-19 15:00:30 -04:00 |
|
Isaac Connor
|
98579fc02a
|
Merge branch 'master' into storageareas
|
2018-10-19 11:27:43 -04:00 |
|
Isaac Connor
|
f9b1453705
|
Include SERVER_PORT when not doing multi-server or multi-port but are running on a port other than 80.
|
2018-10-19 10:59:16 -04:00 |
|
Isaac Connor
|
c2af380e29
|
Merge branch 'master' into storageareas
|
2018-10-16 11:39:26 -04:00 |
|
Isaac Connor
|
37065d15ac
|
fix url to api in monitor restart.
|
2018-10-16 09:47:24 -04:00 |
|
Isaac Connor
|
7149576a7c
|
Merge branch 'smarter_packetqueue' into storageareas
|
2018-10-15 10:59:50 -04:00 |
|
Isaac Connor
|
f2b38f175d
|
Update Frame::find_one so that we can specify an ordering for find_one and so that semantics match other objects find methods
|
2018-10-11 09:14:40 -04:00 |
|
Isaac Connor
|
c4c8a728f2
|
Handle no controls found more gracefully
|
2018-10-10 19:04:00 -04:00 |
|
Isaac Connor
|
2881d2af3f
|
Merge branch 'master' into storageareas
|
2018-10-10 14:13:27 -04:00 |
|
Isaac Connor
|
6ed146b4dd
|
Use Hostname instead of Url in test for CORS access.
|
2018-10-10 14:01:36 -04:00 |
|
Isaac Connor
|
e268264761
|
Merge branch 'cleanup_auth' into storageareas
|
2018-10-09 10:24:32 -04:00 |
|
Isaac Connor
|
1958351a13
|
Merge branch 'master' into storageareas
|
2018-10-09 10:24:24 -04:00 |
|
Isaac Connor
|
cbc26e0cec
|
cleanup trailing whitespace
|
2018-10-09 10:07:40 -04:00 |
|
Isaac Connor
|
a3d0cb42ea
|
Move GOOGLE RECAPCHA to includes/auth.php, clean login actions.
|
2018-10-09 10:05:50 -04:00 |
|
Isaac Connor
|
918d5fd469
|
move utility functions for doing get/post requests into functions.php from actions.php
|
2018-10-09 09:39:04 -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
|
1eb8e9ed9e
|
Include PHP_SELF in url to Server. This will assume that all servers in a multi-server setup use the same path
|
2018-10-08 09:45:03 -04:00 |
|
Isaac Connor
|
5dba17e1fc
|
Merge branch 'master' into storageareas
|
2018-09-21 10:50:10 -04:00 |
|
Isaac Connor
|
999e4c6c43
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-20 13:37:46 -04:00 |
|
Isaac Connor
|
90d1d79e9a
|
Add missing AutoUpload field to Filter
|
2018-09-20 13:37:36 -04:00 |
|
Isaac Connor
|
7fe2749de6
|
Merge branch 'master' into storageareas
|
2018-09-20 10:58:36 -04:00 |
|
Isaac Connor
|
ba4878d2b5
|
fix use of instead of ['limit']
|
2018-09-20 10:11:55 -04:00 |
|
Isaac Connor
|
503b40cb62
|
Need to cache the object not the row
|
2018-09-20 10:07:15 -04:00 |
|
Isaac Connor
|
520d1bb7bf
|
Merge branch 'master' into storageareas
|
2018-09-20 09:08:29 -04:00 |
|
Isaac Connor
|
c6e953c4a9
|
if Monitor is not found, return empty Monitor instead of null
|
2018-09-20 09:02:20 -04:00 |
|
Isaac Connor
|
c4108a2610
|
Fix missing quotes inc Event::Monitor
|
2018-09-20 08:59:15 -04:00 |
|
Isaac Connor
|
7f98277571
|
Merge updated Monitor.php that does caching
|
2018-09-15 09:52:08 -04:00 |
|
Isaac Connor
|
b0c555599c
|
Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209
|
2018-09-15 09:42:59 -04:00 |
|
Isaac Connor
|
5dc852132e
|
Add defaults to Server, getting rid of error log when loading the default non existent storage area
|
2018-09-15 09:39:40 -04:00 |
|
Isaac Connor
|
246b50be9c
|
add caching to Server
|
2018-09-15 09:39:04 -04:00 |
|
Isaac Connor
|
02403c4c30
|
add caching to Monitor
|
2018-09-15 09:38:52 -04:00 |
|
Isaac Connor
|
27bc9d0a50
|
fix $limit should be $options['limit']
|
2018-09-15 09:38:36 -04:00 |
|
Isaac Connor
|
1db59283e3
|
use find_one when loading Monitor to take advantage of caching
|
2018-09-15 09:38:09 -04:00 |
|
Isaac Connor
|
2b66b28689
|
fix $limit should be $options['limit']
|
2018-09-15 09:37:44 -04:00 |
|
Isaac Connor
|
fa55cec12c
|
fix error when scale is auto
|
2018-09-14 16:57:28 -04:00 |
|
Isaac Connor
|
77edb8f74b
|
Add test for auto scale and don't rescale. Use find_one when loading StorageArea so as to use caching
|
2018-09-14 16:19:29 -04:00 |
|
Isaac Connor
|
34c7ee32ee
|
Merge branch 'master' into storageareas
|
2018-09-14 15:13:57 -04:00 |
|
Isaac Connor
|
f1442eba90
|
once we have found a match for our origin, break out of loop
|
2018-09-14 14:56:26 -04:00 |
|
Isaac Connor
|
d9b1d3ec11
|
fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port
|
2018-09-14 14:52:33 -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
|
5eec7e00c5
|
Merge branch 'master' into storageareas
|
2018-09-09 14:09:52 -04:00 |
|
Isaac Connor
|
55dcb161ae
|
find should always return an array
|
2018-09-09 13:59:10 -04:00 |
|
Isaac Connor
|
b4f80fbe11
|
Always return an array from find
|
2018-09-09 13:56:29 -04:00 |
|
Isaac Connor
|
e4c87ce256
|
Merge branch 'master' into storageareas
|
2018-09-09 11:36:52 -04:00 |
|
Isaac Connor
|
dfdac2ed70
|
make find and find_one functions consistent across Objects
|
2018-09-07 16:31:11 -04:00 |
|
Isaac Connor
|
c9b4f14171
|
fix deleting events
|
2018-09-04 09:57:32 -04:00 |
|
Isaac Connor
|
672b4affe1
|
Merge branch 'storageareas' into zma_to_thread
|
2018-08-31 19:05:22 -04:00 |
|
Isaac Connor
|
2858564155
|
Merge branch 'master' into storageareas
|
2018-08-31 16:06:13 -04:00 |