Isaac Connor
|
53bd342f85
|
remove Google open Sans external import
|
2016-01-08 09:46:14 -05:00 |
Isaac Connor
|
270c737f40
|
Merge branch 'master' into storageareas
|
2016-01-05 09:36:36 -05:00 |
Isaac Connor
|
44f3b99d24
|
change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet
|
2016-01-04 14:59:04 -05:00 |
Isaac Connor
|
75f6da3526
|
Merge branch 'multi-server' into storageareas
|
2016-01-04 14:53:52 -05:00 |
Isaac Connor
|
6ae1597671
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2016-01-04 14:51:47 -05:00 |
Isaac Connor
|
273ab6c5c6
|
Only show Server column when more than 1 Servers are defined
|
2016-01-04 14:51:24 -05:00 |
Isaac Connor
|
69ddc7d34c
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-01-04 14:38:37 -05:00 |
Isaac Connor
|
b9f17a18d6
|
Merge branch 'multi-server' into storageareas
|
2016-01-04 14:09:41 -05:00 |
Isaac Connor
|
f5db14d823
|
return empty for the non multi-server case
|
2016-01-04 13:46:05 -05:00 |
Isaac Connor
|
5144d3befb
|
Merge branch 'rotate_dimensions_when_image_is_rotated' into storageareas
|
2016-01-04 13:19:09 -05:00 |
Isaac Connor
|
45fc689203
|
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
|
2016-01-04 13:15:50 -05:00 |
Isaac Connor
|
f72260733c
|
Only do CORSHeaders if there is more than 1 server
|
2016-01-04 09:38:24 -05:00 |
Isaac Connor
|
d256530896
|
return early if no servers are defined instead of logging a warning
|
2016-01-04 09:36:45 -05:00 |
Isaac Connor
|
33b8405e0d
|
Merge branch 'multi-server' into storageareas
|
2016-01-03 11:57:07 -05:00 |
Isaac Connor
|
c639822d62
|
When Server is not set, us ZM_BASE_PATH
|
2016-01-03 11:55:53 -05:00 |
Isaac Connor
|
bf2195828f
|
Merge branch 'multi-server' into storageareas
Conflicts:
docs/installationguide/index.rst
|
2016-01-02 14:42:47 -05:00 |
Isaac Connor
|
bd71c4999d
|
test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well.
|
2016-01-02 14:36:37 -05:00 |
Isaac Connor
|
5c0e4aa172
|
Merge branch 'multi-server' into storageareas
|
2016-01-01 17:11:01 -05:00 |
Isaac Connor
|
cf7e168872
|
Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist
|
2016-01-01 17:10:37 -05:00 |
Isaac Connor
|
468f997e4c
|
Soft error, with logging when the filter element doesn't exist
|
2016-01-01 16:36:29 -05:00 |
Isaac Connor
|
ec7504f925
|
Translate ServerId to Server in Log record before sending back
|
2016-01-01 16:33:28 -05:00 |
Isaac Connor
|
93dbc3f0c1
|
Merge multi-server updates and bump version
|
2016-01-01 16:31:02 -05:00 |
Isaac Connor
|
12ee147bc7
|
Add a find_all function to return an array of Server objects
|
2015-12-31 10:13:48 -05:00 |
Isaac Connor
|
bfe4175fdf
|
Add Server to filters and log results
|
2015-12-31 10:13:25 -05:00 |
Isaac Connor
|
31ba0221ed
|
Add Server to filters and log results
|
2015-12-31 10:13:03 -05:00 |
Isaac Connor
|
983b47f6dc
|
Add Server columns
|
2015-12-31 09:09:57 -05:00 |
RBxx
|
0ccce76ef8
|
Convert ru_ru.php to UTF-8
In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
|
2015-12-31 16:58:56 +03:00 |
Isaac Connor
|
492550b5ef
|
Merge branch 'storageareas' into newpointone
Conflicts:
scripts/zmaudit.pl.in
|
2015-12-24 12:36:40 -05:00 |
Isaac Connor
|
45987e92a9
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2015-12-24 12:34:55 -05:00 |
Isaac Connor
|
479e5df454
|
Add default events dir to dropdown
|
2015-12-22 10:53:39 -05:00 |
Isaac Connor
|
eccfced6d4
|
Merge branch 'multi-server' into newpointone
Conflicts:
distros/ubuntu1204/apache.conf
|
2015-12-22 09:54:13 -05:00 |
Isaac Connor
|
6df1425897
|
Slight update to allow the instantiation with no row or Id
|
2015-12-22 09:52:33 -05:00 |
Isaac Connor
|
1aa79c306b
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-12-22 09:47:45 -05:00 |
Isaac Connor
|
658e130d33
|
sync up to c39 version
|
2015-12-22 09:44:46 -05:00 |
Isaac Connor
|
9d8455daea
|
fix size of filter popups
|
2015-12-21 15:18:05 -05:00 |
Isaac Connor
|
c03088e1b5
|
Just say Storage Area instead of Storage Id /Name. Same with Server
|
2015-12-21 14:32:42 -05:00 |
Isaac Connor
|
a840246849
|
Add Server dropdown for ServerId
|
2015-12-21 14:29:53 -05:00 |
Isaac Connor
|
aa9a6ddcc3
|
populate dropdown with the available storage areas when StorageId is selected
|
2015-12-21 14:12:33 -05:00 |
Isaac Connor
|
dfd7986c01
|
Merge branch 'master' into multi-server
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
|
2015-12-21 12:57:45 -05:00 |
Isaac Connor
|
ca07b951cb
|
Merge branch 'master' into newpointone
Conflicts:
docs/installationguide/ubuntu.rst
|
2015-12-21 12:41:25 -05:00 |
Isaac Connor
|
872e5eff15
|
Merge branch 'multi-server' into newpointone
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
|
2015-12-21 11:35:16 -05:00 |
Isaac Connor
|
2548ec3bc0
|
Add Attr lines for StrageId and StorageName
|
2015-12-21 10:10:53 -05:00 |
Isaac Connor
|
6f5c70dd5d
|
Add Attr lines for ServerId and ServerName
|
2015-12-21 10:10:11 -05:00 |
Isaac Connor
|
00c4eedb90
|
Add StorageId and StorageName to fields that we can filter on
|
2015-12-21 10:04:13 -05:00 |
Isaac Connor
|
b626712a2f
|
Add ServerId and ServerName to fields that we can filter on
|
2015-12-21 10:03:48 -05:00 |
Isaac Connor
|
27597c3401
|
Merge branch 'master' into storageareas
Conflicts:
docs/installationguide/ubuntu.rst
|
2015-12-20 11:19:44 -05:00 |
Isaac Connor
|
37212dcf2e
|
Merge pull request #1196 from pliablepixels/api-more-security
Api more security
|
2015-12-20 10:22:40 -05:00 |
arjunrc
|
6e606aa74b
|
removed issue #
|
2015-12-19 19:04:27 -05:00 |
arjunrc
|
38b4785557
|
PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson
|
2015-12-19 18:36:38 -05:00 |
arjunrc
|
c4461c328e
|
initial user role support
|
2015-12-19 17:45:03 -05:00 |
arjunrc
|
b4fdaa9b4d
|
initial user role support
|
2015-12-19 17:44:46 -05:00 |
arjunrc
|
e812398fb9
|
initial user role support
|
2015-12-19 17:44:39 -05:00 |
arjunrc
|
f56688e7c2
|
initial user role support
|
2015-12-19 17:44:16 -05:00 |
arjunrc
|
028c9b956c
|
check for opt_use_api, also pull in user roles support
|
2015-12-19 17:44:02 -05:00 |
Andy Bauer
|
e5f243a9f8
|
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
|
2015-12-19 08:16:20 -06:00 |
Steve Gilvarry
|
e3d634e53e
|
Merge pull request #1182 from ZoneMinder/one_eighth
add a 1/8th scale option, which is useful for 1920x1080 streams
|
2015-12-19 14:07:18 +11:00 |
Isaac Connor
|
a0f8e8be4b
|
increase width and height of monitors popup to fit new fields
|
2015-12-18 13:43:16 -05:00 |
Isaac Connor
|
ee42174002
|
Merge branch 'master' into storageareas
|
2015-12-18 13:42:15 -05:00 |
Isaac Connor
|
983d87f69b
|
increase height and width of groups window to fit buttons in
|
2015-12-18 13:34:44 -05:00 |
Isaac Connor
|
ca45ac23fa
|
increase height of group edit window
|
2015-12-18 13:30:42 -05:00 |
Isaac Connor
|
9782204548
|
include Storage.php
|
2015-12-18 12:13:26 -05:00 |
Isaac Connor
|
fb1766f21f
|
Add storage.php
|
2015-12-18 11:39:42 -05:00 |
Isaac Connor
|
09c75e2363
|
add a storage area editing page
|
2015-12-15 14:08:34 -05:00 |
Isaac Connor
|
8f141305b7
|
add default parameter in constuctor
|
2015-12-15 13:27:57 -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
|
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
|
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
|
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
|
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
|
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
|
3c86965760
|
Merge branch 'master' into multi-server
Conflicts:
web/skins/classic/js/flat.js
|
2015-12-04 15:31:30 -05: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
|
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 |
Isaac Connor
|
c2a7e0c587
|
fix size of monitor popup in flat skin
|
2015-11-25 15:39:46 -05:00 |
Isaac Connor
|
f7cc2fb44f
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-11-23 10:42:14 -05:00 |