Isaac Connor
|
53dec9f26d
|
check for setting of __REQUEST['object'] to silence php NOTICE
|
2015-12-09 10:43:23 -05:00 |
|
Isaac Connor
|
39e396eb6e
|
Merge branch 'master' into multi-server
|
2015-12-09 10:36:51 -05:00 |
Isaac Connor
|
ac23efebef
|
Merge pull request #1184 from ZoneMinder/TV-IP862_new_firmware
Add code to detect the change in REALM from older to newer firmware
|
2015-12-09 10:36:27 -05:00 |
|
Isaac Connor
|
6d34f8f424
|
Use Monitor class instead of old sql
|
2015-12-09 09:23:42 -05:00 |
|
Isaac Connor
|
e6c9830728
|
Use Monitor class instead of old sql
|
2015-12-09 09:23:36 -05:00 |
|
Isaac Connor
|
7c298c58ed
|
Add code to detect the change in REALM from older to newer firmware
|
2015-12-08 16:20:38 -05:00 |
|
Isaac Connor
|
f2065e2fcb
|
Merge branch 'one_eighth' into multi-server
|
2015-12-08 08:47:35 -05:00 |
|
Isaac Connor
|
d6b2e1959f
|
add a 1/8th scale option, which is useful for 1920x1080 streams
|
2015-12-08 08:40:44 -05:00 |
|
Isaac Connor
|
cb14a12325
|
Merge pull request #1176 from SteveGilvarry/zmupdate_fix
Partial fix for #1167
|
2015-12-07 09:53:41 -05:00 |
SteveGilvarry
|
709cf07fa9
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-05 16:07:45 +11:00 |
Andrew Bauer
|
ec60e6e18f
|
Merge pull request #1180 from ZoneMinder/zms_socket_lock
Zms socket lock
|
2015-12-04 15:48:49 -06:00 |
|
Isaac Connor
|
688ee7f103
|
Merge branch 'zms_socket_lock' into multi-server
|
2015-12-04 16:41:26 -05:00 |
|
Isaac Connor
|
0fc68e2e91
|
delete lock when we are done with it
|
2015-12-04 16:38:24 -05:00 |
|
Isaac Connor
|
be36301779
|
use exclusive lock, add includes
|
2015-12-04 16:35:27 -05:00 |
|
Isaac Connor
|
6d605362fc
|
Merge branch 'zms_socket_lock' into multi-server
|
2015-12-04 15:39:51 -05:00 |
|
Isaac Connor
|
e637915823
|
add a lock around the socket creating/deleting.
|
2015-12-04 15:39:37 -05:00 |
|
Isaac Connor
|
3c86965760
|
Merge branch 'master' into multi-server
Conflicts:
web/skins/classic/js/flat.js
|
2015-12-04 15:31:30 -05:00 |
|
Isaac Connor
|
11a808556b
|
Merge pull request #1178 from knnniggett/submodulecheck
Check for the presence of CrudControllerTrait.php instead of .git
|
2015-12-04 13:09:03 -05:00 |
Andrew Bauer
|
1957c5672f
|
Check for the presence of CrudControllerTrait.php instead of .git
|
2015-12-04 12:03:18 -06:00 |
|
Isaac Connor
|
af59dbee2e
|
== should be =
|
2015-12-04 10:40:55 -05:00 |
|
SteveGilvarry
|
5390605797
|
Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version
|
2015-12-03 10:23:19 +11:00 |
|
SteveGilvarry
|
f4d0581eb5
|
Merge branch 'master' of https://github.com/SteveGilvarry/ZoneMinder
|
2015-12-03 09:59:28 +11:00 |
|
Isaac Connor
|
f54b8c27ee
|
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
|
2015-12-02 12:10:32 -05:00 |
|
Isaac Connor
|
34f6590107
|
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
|
2015-12-02 12:10:26 -05:00 |
|
Isaac Connor
|
961dc90b0e
|
add Server function
|
2015-12-02 11:21:04 -05:00 |
|
Isaac Connor
|
70fb6a6786
|
output message when not doing dbupdate. put quotes in to fix bash error when ZM_DB_HOST is not defined
|
2015-12-02 11:17:23 -05:00 |
|
Isaac Connor
|
b8fb711593
|
only do CORS if Origin is set
|
2015-12-02 11:02:47 -05:00 |
|
Isaac Connor
|
41d92bbf94
|
need to include Server class
|
2015-12-02 10:26:11 -05:00 |
|
Isaac Connor
|
62adb756a9
|
put back CORS validity checking code
|
2015-12-02 10:12:20 -05:00 |
|
Isaac Connor
|
644080fd41
|
call CORSHeaders
|
2015-12-02 10:05:27 -05:00 |
|
Isaac Connor
|
3f8a45bbbb
|
Add a function to setup CORS access headers
|
2015-12-02 10:05:03 -05:00 |
|
Isaac Connor
|
a799a1ce79
|
Make Server constructor take a row or an id
|
2015-12-02 10:04:47 -05:00 |
|
Isaac Connor
|
aa91e69a9b
|
add monitorUrl to be used to target the recording server for the monitor
|
2015-12-01 15:17:49 -05:00 |
|
Isaac Connor
|
342326e159
|
append monitorUrl to thsiURL to get access to the recording server for the monitor stream
|
2015-12-01 15:17:25 -05:00 |
|
Isaac Connor
|
95f002c7d6
|
convert monitor hash accesses to function calls
|
2015-12-01 15:16:53 -05:00 |
|
Isaac Connor
|
c5d57b5b64
|
convert monitor hash accesses to function calls
|
2015-12-01 15:16:43 -05:00 |
|
Isaac Connor
|
945949ebc0
|
fix __call to actually return the value
|
2015-12-01 15:16:18 -05:00 |
|
Isaac Connor
|
2dfa6d6bae
|
add Url and __call functions
|
2015-12-01 15:16:07 -05:00 |
|
Isaac Connor
|
382ad0f390
|
put () after property names of Monitor object
|
2015-12-01 14:30:24 -05:00 |
|
Isaac Connor
|
e85ba683e1
|
improve constructor to handle numeric as well, and give error when something else
|
2015-12-01 14:29:57 -05:00 |
|
Isaac Connor
|
e4f5f76782
|
rewrite constructor to take a row as well as an Id
|
2015-12-01 14:03:55 -05:00 |
Steve Gilvarry
|
d9e8f74298
|
Merge pull request #1173 from knnniggett/submodule
Error on missing submodules
|
2015-11-29 13:22:30 +11:00 |
|
Isaac Connor
|
7514f43ef4
|
only update db if db is local
|
2015-11-27 13:54:31 -05:00 |
|
Isaac Connor
|
c2a7e0c587
|
fix size of monitor popup in flat skin
|
2015-11-25 15:39:46 -05:00 |
|
Andrew Bauer
|
91f700a7cd
|
Update CMakeLists.txt
|
2015-11-23 10:10:56 -06:00 |
|
Isaac Connor
|
f7cc2fb44f
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-11-23 10:42:14 -05:00 |
|
Isaac Connor
|
7d97ecb9c9
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-11-23 10:40:08 -05:00 |
|
Isaac Connor
|
4126f1f072
|
Merge pull request #1168 from knnniggett/swap_path
fix mem alloc fault in zm_monitor.cpp
|
2015-11-21 22:13:47 -05:00 |
|
Andy Bauer
|
dabe32a593
|
Error on missing submodules
|
2015-11-21 18:21:18 -06:00 |
|
Steve Gilvarry
|
79d486b5aa
|
Test Example of 1.29 Changelog
|
2015-11-22 10:21:38 +11:00 |