Isaac Connor
|
7588f6088f
|
change method from getPath to Path
|
2015-12-15 13:27:18 -05:00 |
|
Isaac Connor
|
916cfe5ee6
|
change method from getPath to Path
|
2015-12-15 12:10:07 -05:00 |
|
Isaac Connor
|
0f4757b1ad
|
change method from getPath to Path
|
2015-12-15 12:10:01 -05:00 |
|
Isaac Connor
|
6daa8e2290
|
add server_id to event_data
|
2015-12-15 12:09:45 -05:00 |
|
Isaac Connor
|
2597bbd9bf
|
use storage object instead of config.dir_events
|
2015-12-15 12:09:34 -05:00 |
|
Isaac Connor
|
3802d16922
|
add ServerId to Events Table
|
2015-12-15 12:09:11 -05:00 |
|
Isaac Connor
|
c345d697b2
|
missed dbServer -> dbStorage
|
2015-12-15 11:21:52 -05:00 |
|
Isaac Connor
|
6ce7952acb
|
Merge branch 'multi-server' into storageareas
|
2015-12-15 11:20:01 -05:00 |
|
Isaac Connor
|
aaa9f3bcc9
|
Handle case where parameter is not passed to constuctor
|
2015-12-15 11:19:50 -05:00 |
|
Isaac Connor
|
1151fe39ab
|
More debug lines, and use the default config.events_dir path when not specified otherwise
|
2015-12-15 11:17:32 -05:00 |
|
Isaac Connor
|
d7568180fe
|
add getStorage method to return the desired Storage Area object
|
2015-12-15 11:16:51 -05:00 |
|
Isaac Connor
|
20f9a01a66
|
Add a Storage tab, to provide a place to define your storage areas
|
2015-12-15 11:13:21 -05:00 |
|
Isaac Connor
|
14dc447145
|
add a Storage Area dropdown to set where this monitor will storage it's events
|
2015-12-15 11:13:00 -05:00 |
|
Isaac Connor
|
9ffbaabde5
|
add save and delete actions for Storage
|
2015-12-15 11:12:33 -05:00 |
|
Isaac Connor
|
c07c63cde6
|
Check for setting of IdOrRow. When loading from db, using FETCH_CLASS, the constructor is called without arguments
|
2015-12-15 11:12:21 -05:00 |
|
Isaac Connor
|
010d7b3d64
|
convert to using storage->getPath instaed of config.events_dir
|
2015-12-15 11:11:34 -05:00 |
|
Isaac Connor
|
6aadd7330a
|
make loading a null or invalid storage area not be fatal, but use the default path
|
2015-12-15 09:39:29 -05:00 |
|
Isaac Connor
|
a196906345
|
Move where StorageId goes to after ServerId
|
2015-12-15 09:12:11 -05:00 |
|
Isaac Connor
|
ccc001a27f
|
bump version to 110
|
2015-12-15 09:11:56 -05:00 |
|
Isaac Connor
|
43968b7862
|
add Storage table creation
|
2015-12-14 17:03:45 -05:00 |
|
Isaac Connor
|
9488f71244
|
Add zmupdate script to add Storage table and StorageId to Monitors, and bump version
|
2015-12-14 17:00:04 -05:00 |
|
Isaac Connor
|
14cde582cf
|
Merge branch 'multi-server' into multiserverplusstorage
Conflicts:
src/zm_monitor.h
|
2015-12-14 16:55:26 -05:00 |
|
Isaac Connor
|
b2b1afa8ad
|
Merge master
|
2015-12-14 15:49:32 -05:00 |
|
Isaac Connor
|
b21b26a41b
|
remove requirment for mysql. Mysql could be on another machine
|
2015-12-09 12:34:16 -05:00 |
|
Isaac Connor
|
6cfd993890
|
Merge branch 'master' into multi-server
|
2015-12-09 10:43:38 -05:00 |
|
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 |