Isaac Connor
|
757740ede5
|
Move skin and css changing up above the include of header.php so that the set cookie call will work
|
2016-03-23 16:12:51 -04:00 |
Isaac Connor
|
dd06db0bf0
|
remove duplication
|
2016-03-23 15:54:20 -04:00 |
Isaac Connor
|
a66e97de09
|
Merge & fix new console & options
|
2016-03-23 09:48:57 -04:00 |
Isaac Connor
|
3a8352eb6b
|
Merge branch 'master' into storageareas
|
2016-03-21 10:25:03 -04:00 |
Jon Burgess
|
9c98ccbb75
|
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
|
2016-03-20 16:13:53 +00:00 |
Jon Burgess
|
020731a89e
|
Fix typo in ffmpeg options help: s/passwd/passed/
|
2016-03-20 16:10:49 +00:00 |
Kyle Johnson
|
897a0a995c
|
Convert options layout to side-tabs, and improve readability
|
2016-03-15 15:21:28 -04:00 |
Kyle Johnson
|
87932002cf
|
Push the options page down a bit to make tab look better
|
2016-03-15 14:45:40 -04:00 |
Kyle Johnson
|
183f58ad17
|
Restyle options view with horizontal form layout
|
2016-03-15 14:43:22 -04:00 |
Kyle Johnson
|
694ad0b539
|
Add styling to delete / save / add buttons in options.php
|
2016-03-15 14:08:01 -04:00 |
Kyle Johnson
|
bd30d40522
|
Remove cancel button from options as it no longer makes sense.
|
2016-03-15 14:03:17 -04:00 |
Kyle Johnson
|
0004a1180e
|
Update options.php to use bootstrap container
|
2016-03-15 13:56:54 -04:00 |
Kyle Johnson
|
26748c2de5
|
Oops. Move Console view outside of canView(system) restriction
|
2016-03-15 13:52:36 -04:00 |
Kyle Johnson
|
f05c1548ce
|
Add a link back to console in header
|
2016-03-15 13:49:14 -04:00 |
Kyle Johnson
|
299c61c1ec
|
Make the Options link a standard href (not a popup).
|
2016-03-15 13:47:31 -04:00 |
Kyle Johnson
|
8070bf8700
|
Move console php code to header as that code is now needed in additional views.
|
2016-03-15 13:46:03 -04:00 |
Kyle Johnson
|
49f46ac927
|
Move the header into its own file, and include it in options view.
|
2016-03-15 13:43:49 -04:00 |
Kyle Johnson
|
8acfe1b0d8
|
Update options styling
|
2016-03-12 22:44:11 -05:00 |
Kyle Johnson
|
2378c9a359
|
Fix state link to do popup like before
|
2016-03-12 20:44:42 -05:00 |
Kyle Johnson
|
d202760d82
|
Additional footer padding
|
2016-03-12 20:37:07 -05:00 |
Kyle Johnson
|
f5ba52824a
|
Add styles to additional console buttons
|
2016-03-12 20:36:39 -05:00 |
Kyle Johnson
|
a2c2101c48
|
Remove extra #footer styling
|
2016-03-12 20:28:16 -05:00 |
Kyle Johnson
|
f80cbf52df
|
Bump up the default font size
|
2016-03-12 20:27:51 -05:00 |
Kyle Johnson
|
bebb1017fd
|
Wrap footer in container-fluid
|
2016-03-12 20:27:22 -05:00 |
Kyle Johnson
|
5e2d4bc325
|
Restyle of Login page.
|
2016-03-12 20:11:32 -05:00 |
Kyle Johnson
|
a403c1db8c
|
Move recaptcha javascript to actual <head> tag
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
|
2016-03-12 19:14:07 -05:00 |
arjunrc
|
8a47241e18
|
address issue #1335
|
2016-03-12 08:07:25 -05:00 |
Kyle Johnson
|
71c35e712b
|
Initial major restyle of classic skin.
|
2016-03-12 03:28:02 -05:00 |
Kyle Johnson
|
c9441ec8c0
|
Local copy of bootstrap 3.3.6, included in classic skin.
|
2016-03-12 01:16:19 -05:00 |
Andrew Bauer
|
77f7a3642c
|
remove check for "selected" property
|
2016-03-09 10:34:06 -06:00 |
Andrew Bauer
|
3280aff876
|
disable save button when nothing slected. fixes #1322
|
2016-03-09 09:43:44 -06:00 |
SteveGilvarry
|
24ebc33ea4
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-03-09 20:54:11 +11:00 |
Isaac Connor
|
b06b82f634
|
widen filter popup, because storage area name or server name might be longer
|
2016-03-04 15:35:55 -05:00 |
Isaac Connor
|
86dbe4fa15
|
define default for StorageId to prevent error message
|
2016-03-03 09:22:53 -05:00 |
Isaac Connor
|
bcb403bf08
|
Merge branch 'fix_setButtonStates' into storageareas
|
2016-03-03 09:08:37 -05:00 |
Isaac Connor
|
c0ed40fd06
|
fix structure of if/for
|
2016-03-03 09:06:57 -05:00 |
Isaac Connor
|
cedc46adf3
|
Merge branch 'fix_setButtonStates' into storageareas
|
2016-03-02 09:12:19 -05:00 |
Isaac Connor
|
0d8c63f578
|
Merge branch 'master' into storageareas
|
2016-03-02 09:11:55 -05:00 |
Isaac Connor
|
bb0dcf3d43
|
fix setButtonStates. The checkboxes are an array.
|
2016-03-01 12:19:46 -05:00 |
Isaac Connor
|
c377c96367
|
add a missing semi colon just for completeness
|
2016-03-01 12:18:27 -05:00 |
Isaac Connor
|
010fcec990
|
fix setButtonStates. The checkboxes are an array.
|
2016-03-01 12:17:59 -05:00 |
Andy Bauer
|
466f2b2ae3
|
change multi-server error message text
|
2016-03-01 11:12:54 -06:00 |
Isaac Connor
|
51ef83dd94
|
split Monitor info columns into a separate group and the events into a separate group
|
2016-03-01 11:33:25 -05:00 |
Isaac Connor
|
a407f9a0b7
|
pretty much finish the conversion
|
2016-03-01 11:32:38 -05:00 |
Isaac Connor
|
0853f26062
|
convert console table to divs
|
2016-03-01 10:05:57 -05:00 |
Isaac Connor
|
e7303ccb08
|
change styles from table constructs to class constructs
|
2016-03-01 09:56:57 -05:00 |
Isaac Connor
|
0d8c16bb56
|
move console styles to view/console
|
2016-03-01 09:56:36 -05:00 |
arjunrc
|
84801fcb86
|
typo in function name
|
2016-02-27 13:06:33 -05:00 |
SteveGilvarry
|
3ce620eb89
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-02-27 19:46:56 +11:00 |
SteveGilvarry
|
d40bf89b17
|
Remove Phone BW settings used with mobile skin
|
2016-02-26 22:43:37 +11:00 |
SteveGilvarry
|
4837585601
|
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
Conflicts:
src/zmstreamer.cpp
|
2016-02-26 22:37:23 +11:00 |
SteveGilvarry
|
7c7d7b245c
|
Remove the XML skin folder
|
2016-02-26 22:30:20 +11:00 |
SteveGilvarry
|
e6d57da0d4
|
Remove the mobile skin folder
|
2016-02-26 22:29:41 +11:00 |
SteveGilvarry
|
5ff427d9e9
|
Removed Autotools Makefile.am
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-02-26 22:19:02 +11:00 |
Isaac Connor
|
86c223668d
|
Merge branch 'master' into storageareas
|
2016-02-25 19:11:38 -05:00 |
SteveGilvarry
|
b294f210dc
|
Update to CakePHP 2.8.0 copy in lib folder
|
2016-02-25 23:25:24 +11:00 |
Isaac Connor
|
131d0daefe
|
fix syntax
|
2016-02-19 11:47:18 -05:00 |
Isaac Connor
|
afb0cf2a7e
|
Merge branch 'master' into storageareas
|
2016-02-19 11:09:18 -05:00 |
Isaac Connor
|
5a2a4baa89
|
Must load StorageId as well when loading event
|
2016-02-19 09:47:19 -05:00 |
Isaac Connor
|
e2d892961b
|
use storage area paths in getting analyze images and frame stills
|
2016-02-19 09:46:56 -05:00 |
Isaac Connor
|
68babd783b
|
Merge branch 'master' into storageareas
|
2016-02-17 09:46:56 -05:00 |
Dmitry Smirnov
|
632e9c8e53
|
Upgrade bundled jQuery (Closes: #1263)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-18 00:28:30 +11:00 |
Isaac Connor
|
172a4c6bd4
|
Add montagereview.php to autotools build.
|
2016-02-16 09:29:49 -05:00 |
Isaac Connor
|
292e3a141f
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-12 13:53:34 -05:00 |
Isaac Connor
|
5da8df45a7
|
Merge branch 'hide_rtspdescribe' into storageareas
|
2016-02-12 13:53:09 -05:00 |
Isaac Connor
|
5f217b48e0
|
When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP
|
2016-02-12 13:52:59 -05:00 |
Isaac Connor
|
b7256a6891
|
Merge branch 'master' into storageareas
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
|
2016-02-10 09:17:40 -05:00 |
Andrew Bauer
|
0b2a309014
|
Merge pull request #961 from Linwood-F/960-montage-review-new-feature
960 montage review new feature
|
2016-02-08 20:40:04 -06:00 |
Isaac Connor
|
e106a86f5e
|
Add Concurrent
|
2016-02-05 11:59:05 -05:00 |
Isaac Connor
|
e67f247374
|
add ConcurrentFilter translation
|
2016-02-05 11:58:20 -05:00 |
Isaac Connor
|
51d814ad46
|
add concurrent to save filter
|
2016-02-05 11:58:05 -05:00 |
Isaac Connor
|
0674fa2d7a
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-04 12:21:33 -05:00 |
Isaac Connor
|
89cff287cd
|
Merge branch 'master' into storageareas
|
2016-02-04 12:14:16 -05:00 |
Isaac Connor
|
d3755611c5
|
Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
|
2016-02-04 11:54:02 -05:00 |
Andrew Bauer
|
ab7b4ab3e6
|
Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated
implement Width and Height functions, and test for image rotation and…
|
2016-02-04 10:17:19 -06:00 |
Andrew Bauer
|
1c142a48a6
|
Merge pull request #1212 from RBxx/patch-1
Convert ru_ru.php to UTF-8
|
2016-02-04 10:16:24 -06:00 |
Andrew Bauer
|
cbe88d0a3f
|
Merge pull request #1239 from ZoneMinder/trim_when_saving
use trim on values when saving.
|
2016-02-04 08:29:02 -06:00 |
Isaac Connor
|
08858685c5
|
add find_all function to Storage
|
2016-02-03 09:43:02 -05:00 |
Isaac Connor
|
555904c588
|
Add Storage column to console
|
2016-02-03 09:42:50 -05:00 |
Isaac Connor
|
48283191ec
|
Merge branch 'master' into storageareas
|
2016-02-01 15:47:08 -05:00 |
Isaac Connor
|
cc2c1405ed
|
include Event.php
|
2016-02-01 14:59:06 -05:00 |
Isaac Connor
|
4e9e01836f
|
Use Event->Path instead of ZM_DIR_EVENTS
|
2016-02-01 13:41:57 -05:00 |
Isaac Connor
|
9543a8a364
|
Add Event.php to autoconf build
|
2016-02-01 13:08:48 -05:00 |
SteveGilvarry
|
7301e803ed
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
|
2016-01-30 15:45:08 +11:00 |
Andrew Bauer
|
2f80f26f92
|
Merge pull request #1232 from ZoneMinder/remove_google_fonts
remove Google open Sans external import
|
2016-01-23 10:24:49 -06:00 |
Brandon Odegard
|
54a11175ff
|
Reduce default size of body font in Flat skin
|
2016-01-22 13:56:41 -06:00 |
Brandon Odegard
|
1ca9ace84d
|
Fixed missing semicolons
|
2016-01-22 13:31:02 -06:00 |
Isaac Connor
|
baa805ae60
|
alternatively, accept and eid and fid to specify the frame
|
2016-01-14 13:35:30 -05:00 |
Isaac Connor
|
e057d8d722
|
rough in an Event object.
|
2016-01-14 13:34:51 -05:00 |
Isaac Connor
|
f16fb5c5f6
|
use eid and fid instead of specifying the path to the image
|
2016-01-14 13:34:12 -05:00 |
Isaac Connor
|
02f8fb80da
|
Put the monitor Id in the title so that it appears on mouseover.
|
2016-01-14 11:05:05 -05:00 |
Isaac Connor
|
7ce049dad1
|
add a title to each monitor with the name so that the mouseover will show it
|
2016-01-14 10:50:42 -05:00 |
Isaac Connor
|
ddf7b1ad43
|
Merge branch 'master' into storageareas
Conflicts:
web/skins/classic/js/dark.js
web/skins/classic/js/flat.js
|
2016-01-14 09:41:24 -05:00 |
Isaac Connor
|
4520902dd2
|
use trim on values when saving.
|
2016-01-14 09:37:41 -05:00 |
Isaac Connor
|
3ebeaec8ab
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-01-10 20:59:01 -05:00 |
Isaac Connor
|
2d86e7713d
|
increase height of logout popup to fit content
|
2016-01-08 12:14:01 -05:00 |
Isaac Connor
|
818cd614eb
|
Merge branch 'multi-server' into storageareas
|
2016-01-08 10:17:37 -05:00 |
Isaac Connor
|
d48ec1cfbe
|
Add AddNewServer and Hostname entries
|
2016-01-08 10:15:41 -05:00 |
Isaac Connor
|
99dfaa97fa
|
User Name instead of ServerName and Hostname instead of ServerHostname
|
2016-01-08 10:15:21 -05:00 |
Isaac Connor
|
d13829c6f3
|
Add Hostname to list of servers, since we have the space for it.
|
2016-01-08 10:15:06 -05:00 |
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 |
SteveGilvarry
|
1ff2043774
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2015-12-23 19:24:08 +11: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 |
SteveGilvarry
|
e28e3c2b75
|
Merge branch 'master' into feature-h264-videostorage
|
2015-12-20 14:13:30 +11: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 |