9c8b229c74
Fix cutnpaste error
2017-01-14 17:08:13 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
0e7794f2a7
Merge pull request #1 from connortechnology/cookie_http_only
...
set http_only flag in cookie settings
2017-01-12 09:25:36 -07:00
7ef7a36f39
fix conditional logic in controlcap.js
2017-01-10 17:53:05 -06:00
55403219d8
fix regexp for direction in control command. Also log if the regexp doesn't match
2017-01-10 12:35:38 -05:00
fea5fa1b59
fix xtell should be -1 for move left
2017-01-10 12:35:02 -05:00
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
0a90dbac9f
require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path.
2017-01-02 10:35:51 -05:00
30674919c4
always include Storage object, because in the end we will be using it everywhere
2017-01-02 10:34:45 -05:00
f6ea52280a
Update Event object to @iconnor's latest which brings us a createListThumbnail function copied from includes/functions
2017-01-02 10:34:15 -05:00
b063d8d6aa
Merge pull request #1728 from connortechnology/path_zms_message
...
Path zms message
2017-01-02 08:54:32 -06:00
ef71ae248c
fix ramSocketFile to remSocketFile
2017-01-02 09:31:26 -05:00
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
25ab1bee18
more fixed to gpl license text
2016-12-26 10:40:09 -06:00
2dda2d9e1e
remove unneeded, empty files
2016-12-26 09:49:14 -06:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
38c0cedecc
remove the use of empty which on php < 5.5 only supports variables.
2016-12-20 16:37:42 -05:00
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05:00
68a24040ab
Merge pull request #1710 from connortechnology/path_zms_message
...
replace the old socket_sendto error message with something more useful
2016-12-20 10:30:35 -06:00
8b726996f7
FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant.
2016-12-19 21:36:39 -05:00
fe3f3d91ce
replace the old socket_sendto error message with something more useful so that people stop asking us how to fix it.
2016-12-16 09:12:27 -05:00
794043cbe9
On successful login, tell php to regenerate the session id
2016-12-14 15:06:18 -05:00
ad157cf21c
fix tabs
2016-12-14 14:56:54 -05:00
69c39f8a23
set http_only flag in cookie settings
2016-12-14 14:39:44 -05:00
a9548d3f6b
Add a config entry to turn event disk space on/off
2016-12-13 13:34:56 -05:00
30ec67d4c3
Merge branch 'master' into disk_space_in_events
2016-12-13 13:28:32 -05:00
b5e4c94682
test for integer string as well
2016-12-08 15:58:00 -05:00
7c84e2417d
remove extra ?
2016-12-08 15:53:38 -05:00
c8009baf3f
fix missing ; and test for integer string in limit
2016-12-08 15:46:42 -05:00
d600eb0e8b
Merge branch 'master' into fix_sql_injection
2016-12-08 13:39:04 -05:00
e7d0861530
check limit for a valid integer and complain if not.
2016-12-08 13:37:23 -05:00
587fd16aa6
Add testing for limit, sortField and all the filters to ensure that they are valid.
2016-12-08 13:31:44 -05:00
857b4e8345
Merge branch 'master' into improve_filter
2016-12-06 11:58:41 -05:00
986567839e
Additional minor changes
2016-12-02 10:08:49 +01:00
e27639f599
Updated dutch translation
2016-12-02 09:49:50 +01:00
9312eed17f
Merge branch 'master' into disk_space_in_events
2016-11-22 10:58:24 -05:00
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -05:00
bb6b0c2d49
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
2016-11-17 12:16:49 -05:00
4eb5ff7aff
Fix Undefined index: loginFailed. Resolves #1684
2016-11-16 19:42:04 -07:00
8f71971209
Show error message upon unsuccessful login. Fixes #1648 ( #1680 )
...
* Add additional post-cmake files to .gitignore
* Add bootstrap 3.3.7
* Load bootstrap css
* Restyle login page, move recaptcha js to <head>
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
* Update doctype to HTML5, add meta tags for mobile browsers
* Move inline Login css to css file
* Remove extra php tag in functions.php
* Show error message upon unsuccessful login. Fixes #1648
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
* Only load bootstrap css in specific views.
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
* Test for invalid login via session variable.
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
* Fix a few typos in login inputs
* Add new fonts directory to web CMakeLists
2016-11-14 21:24:43 -05:00
b0d22aa2a5
Add new fonts directory to web CMakeLists
2016-11-14 19:23:05 -07:00
49d8e35e56
Show available PATH_MAP percent on console ( #1675 )
...
* Add PATH_SWAP percent to console
* add changes to console.php
* use ZM_PATH_MAP instead of ZM_PATH_SWAP
* show the folder name PATH_MAP points to
* use a dash as the delimiter instead of fwd slash
2016-11-11 08:47:08 -05:00
65fe07e7aa
Fix a few typos in login inputs
2016-11-10 23:36:28 -07:00
95d00f70a3
Test for invalid login via session variable.
...
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
2016-11-10 23:29:12 -07:00
3916b02a74
Only load bootstrap css in specific views.
...
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
2016-11-10 23:07:52 -07:00
0800a69a57
Show error message upon unsuccessful login. Fixes #1648
...
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
2016-11-10 22:51:32 -07:00
97fb53e95c
Remove extra php tag in functions.php
2016-11-10 21:49:57 -07:00
227b196a2e
Move inline Login css to css file
2016-11-10 21:48:42 -07:00
3e3956f45d
Update doctype to HTML5, add meta tags for mobile browsers
2016-11-10 21:47:53 -07:00
eacf6cd415
Restyle login page, move recaptcha js to <head>
...
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
1607ae1210
Load bootstrap css
2016-11-10 21:45:46 -07:00
2c93f61622
Add bootstrap 3.3.7
2016-11-10 21:45:18 -07:00
9f43825b92
prevent the end user from slecting an invalid configuration on the PT… ( #1676 )
...
* prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab
* change to console.php should not be in this pr
2016-11-08 22:10:51 -05:00
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
bd47439056
Merge pull request #1639 from connortechnology/cookie_scale
...
store the scale value for watch and event views in a cookie, differen…
2016-11-03 12:35:15 -06:00
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
d504043a9e
Update ru_ru.php
...
Remote extra line
2016-11-01 00:32:46 +11:00
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
0409ae5582
Merge pull request #1652 from connortechnology/fix_popup
...
handle when window.open fails
2016-10-20 05:17:44 +11:00
11cc73f55d
Merge pull request #1651 from connortechnology/fix_disable_monitor
...
Fix logic when disabling a monitor
2016-10-20 05:16:22 +11:00
c78a543e8e
Merge pull request #1475 from connortechnology/htmlselect
...
introduce htmlselect as an alternative to buildselect
2016-10-20 05:05:59 +11:00
192d0dbb45
added TimeZone get API
2016-10-18 14:07:31 -04:00
aaf8f6c98b
add the missing case for ServerId in Filter processing.
2016-10-18 10:14:19 -04:00
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
c02b840274
Fix logic when disabling a monitor
2016-10-11 12:10:47 -04:00
ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
3801d9e43e
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
2016-10-10 11:27:36 -07:00
7b574e0d41
Merge pull request #1645 from connortechnology/fix_onvif
...
Fix onvif
2016-10-04 16:34:58 -05:00
ac24865647
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:51 -04:00
6814bcc791
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:38 -04:00
09c5e3012a
username and password don't actually have to be specified
2016-10-04 14:09:32 -04:00
21a94a6200
better error message
2016-10-04 10:29:37 -04:00
6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
92d7cad5f1
enabled utf8
2016-09-21 11:53:34 -04:00
5f46b8f942
Merge pull request #1621 from connortechnology/fix_1620
...
ptzControl expects a monitor object instead of a dbrow array.
2016-09-15 10:18:26 -04:00
db8cada380
fix merge
2016-09-13 15:01:02 -04:00
54db9f2e3a
ptzControl expects a monitor object instead of a dbrow array.
2016-09-12 21:36:03 -04:00
563f4a9d46
Merge pull request #1505 from ZoneMinder/fix_filter_actions
...
Confirmed check box status is now retained after save and changing filters.
2016-09-11 14:13:51 +10:00
e35ef3ce83
Merge pull request #1617 from coracis/master
...
Update German translation
2016-09-09 08:55:19 -05:00
321deb5506
Merge pull request #1599 from sabbath88/master
...
add some more translation
2016-09-09 08:40:05 -05:00
070051d06a
Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
...
For easy pull-requesting
2016-09-09 14:20:03 +02:00
6fab2e97b1
Update German translation of Buffer
2016-09-09 13:32:20 +02:00
b10c79b4f7
Add translation for 'Montage Review'
2016-09-09 13:26:19 +02:00
6b18184e4a
Remove confusing link to web console
2016-09-09 12:38:30 +02:00
4dc6fc03b3
Add a missing translate()-call
2016-09-09 12:35:34 +02:00
430ecd8e32
Fix some too direct translations into German
2016-09-09 11:51:53 +02:00
d017138550
Fix a 'false friend' in German translation
2016-09-09 11:25:12 +02:00
1440dd9265
retab
2016-09-03 15:02:32 -04:00
7bf0b3c423
readded forMonitor - removed by mistake
2016-09-03 14:51:24 -04:00
9a4330eb59
#1537 Zones Controller not returning all zones
2016-09-03 14:46:47 -04:00
d6852e10b7
Merge pull request #1609 from connortechnology/fix_1606
...
implement suggested code to stop the monitor when Function is set to …
2016-09-01 22:57:57 -06:00
55f5db55dd
implement suggested code to stop the monitor when Function is set to None
2016-09-01 11:43:20 -04:00
2d44531d1f
add some more translation
2016-08-25 14:24:14 +02:00
7d48b2c6c5
Merge pull request #1577 from ZoneMinder/fix_zmaControl
...
fix error in calling zmaControl
2016-08-17 08:36:51 -05:00
ea34f3d69a
Merge pull request #1576 from ZoneMinder/show_other_zones
...
include polygons for the other zones.
2016-08-15 20:36:16 -05:00
31cb86046c
Merge pull request #1592 from connortechnology/fix_analysis_frame
...
Fix analysis frame
2016-08-14 10:54:46 -05:00
a0bc30d3fe
fix the order of analyse/capture being passed
2016-08-12 15:40:47 -04:00
240336e3ec
silence error when Event has no StorageId set
2016-08-12 15:20:21 -04:00
9106675842
pass capture or analyse to getImageSrc
2016-08-12 15:17:13 -04:00
bcb7dd1ba4
take optional show= to specify the analyse image or the capture image
2016-08-12 15:16:05 -04:00
3dadcc8d32
add ability to pass show=capture or show=analyse to getImageSrc
2016-08-12 15:14:51 -04:00
bc4923b555
use instead of for the frame object and pass to getImageSrc which expects an array
2016-08-12 13:50:18 -04:00
24d471f452
Merge pull request #1503 from ZoneMinder/id_on_console
...
add option to show monitor ID on console
2016-08-06 10:59:03 -05:00
9d65ef3bb2
Merge pull request #1556 from knnniggett/banner
...
custom banner text on web console
2016-08-06 10:59:53 -04:00
382896dc0d
Merge pull request #1498 from josh4trunks/mysql_port_socket
...
Add support for MySQL Port / Unix Socket
2016-08-06 09:32:32 -05:00
aa78b403a1
zmaControl can take an id #, so need to move the check for local server test down.
2016-08-02 12:33:41 -04:00
8093470a2e
make only the editing polygon have a border. Set default for Type when creating a new zone
2016-08-02 12:19:55 -04:00
b522371080
include polygons for the other zones.
2016-08-02 12:02:07 -04:00
cd43d1fa7a
Rough in Event disk space reporting
2016-07-19 17:34:01 -04:00
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
3eccdcd3e2
Merge pull request #1524 from ZoneMinder/add_api_auth
...
if user=&pass= are in request, use them for auth in api
2016-06-29 21:47:44 +10:00
f3779d543c
Merge pull request #1521 from ZoneMinder/fix_zone_edit
...
update area when points move
2016-06-29 21:46:28 +10:00
bdd0790106
Merge pull request #1522 from ZoneMinder/video_session
...
Move the session start down to where it is actually needed so that we…
2016-06-29 21:45:12 +10:00
b4aec41d3d
fix warnings and move User import up higher to where it needs to be
2016-06-21 09:09:58 -04:00
0c82e82ae2
Don't update x in updateY and don't update y in updateX as they are not defined.
2016-06-16 12:00:00 -04:00
d0e08b32f5
Merge pull request #1506 from Disassembler0/master
...
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-06-17 00:01:08 +10:00
f804f7739d
Adjust download file path to swap path to match the file generated.
2016-06-14 20:49:38 +10:00
83ac4cd061
change the input handler from onchange to oninput. Disable form submit when hitting enter
2016-06-13 09:40:04 -04:00
632ec38d7d
Put back in neccessary callt o updateArea
2016-06-12 16:10:24 -04:00
4f2e0edb44
remove unnecssary updateAreas
...
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
dbdd1ae51e
remove debug logging
2016-06-07 16:26:58 -04:00
f26c9168c4
if user=&pass= are in request, use them for auth
2016-06-07 16:25:35 -04:00
593fe2b0c5
update area when points move
2016-06-07 11:40:53 -04:00
1930b18100
Move the session start down to where it is actually needed so that we don't hold it open while generating videos
2016-06-07 10:38:37 -04:00
a57a3d3186
Merge pull request #1501 from ZoneMinder/fix_zone_edit
...
Fix zone edit
2016-05-31 10:33:31 -05:00
883b323528
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-05-29 22:16:00 +02:00
9f6f5100fe
also copy Name from the request on update and only show delete button if it has a name
2016-05-29 11:32:18 -04:00
101c93d422
When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object
2016-05-27 12:45:36 -04:00
c4e5299943
sync up auto to Auto
2016-05-27 12:45:04 -04:00
65e33d6c19
synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter
2016-05-27 11:11:30 -04:00
7277283659
rename AttrServerId to AttrServer, because that is the text that is returned
2016-05-27 10:12:46 -04:00
f461bc1e80
get rid of extra )
2016-05-26 12:18:58 -04:00
f969186abb
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
2016-05-26 11:15:13 -04:00
730abc9789
make zones unclickable when zm is not running
2016-05-26 09:35:36 -05:00
1972c4116b
Merge pull request #1486 from connortechnology/update_image_view
...
Update image view
2016-05-26 09:05:14 -05:00
ceaacf91bf
Merge pull request #1470 from connortechnology/api_improvements
...
Api improvements
2016-05-25 12:45:03 -05:00
575f8ec265
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
...
Hide rtspdescribe
2016-05-25 08:44:17 -05:00
8f1596d683
use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr
2016-05-25 09:08:28 -04:00
7cfa2a5eaa
Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone
2016-05-24 16:46:34 -04:00
277fdafa85
Remove entry for Server Name, making Server Id just say Server. The filters will be populated with a dropdown, so no need to go by Id or Name
2016-05-24 16:45:55 -04:00
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
89f58daf89
Merge branch 'master' into fix_zone_edit
2016-05-24 15:30:56 -04:00
0052bb080c
unlink only if file exists
2016-05-24 12:13:17 -05:00
00abd36af8
fix the other case of the wrong case of rtsp
2016-05-24 12:19:31 -04:00
056eed6df9
fix to show RTSP describe option when switching back to rtsp
2016-05-24 12:15:59 -04:00
bc49aa6aa6
add missing ; and remove extra )
2016-05-24 09:34:36 -04:00
5eac0559e2
Merge branch 'master' into hide_rtspdescribe
2016-05-24 09:32:41 -04:00
bec14bf111
Merge pull request #1478 from ZoneMinder/fix_montage_server_refs
...
pass in the server url into the monitor object to use instead of the …
2016-05-23 20:14:35 -05:00
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
4018cab743
don't pass partial data to daemoncontrol
2016-05-19 14:53:16 -04:00
20c4d07a00
Merge branch 'master' into hide_rtspdescribe
2016-05-16 14:40:04 -04:00
0faa28d058
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-05-16 14:38:49 -04:00
6084e2d00f
improve error message. The unrecognized action error happens above, so this error should just mention permissions
2016-05-16 14:38:40 -04:00
df8964c1f9
use eid= & fid= instead of path to frame image. The use of view=image also provides more security.
2016-05-16 10:33:21 -04:00
235095ed5f
fix URL to image view
2016-05-16 10:32:43 -04:00
8cb2692bbb
pass in the server url into the monitor object to use instead of the portal url
2016-05-13 11:09:12 -04:00
ed3e975e5a
take fid and eid as alternate parameters
2016-05-12 11:55:48 -04:00
1530096560
whitespace/google code style
2016-05-12 10:17:41 -04:00
aba80f0935
introduce htmlselect as an alternative to buildselect
2016-05-12 09:43:37 -04:00
b513bcef82
icon's gonna kill me
2016-05-10 20:09:41 -04:00
af3cae578e
fixed verbose handling bug for status command on zmu
2016-05-10 20:07:28 -04:00
8d5f2a8e5d
added iconnor's change back
2016-05-10 19:17:09 -04:00
df830a5190
resolved merge conflicts
2016-05-10 19:15:00 -04:00
2888142e68
added status command to retrieve alarmed status of monitor in addition to on/of
2016-05-10 16:55:43 -04:00
c0d3d69bec
Merge pull request #1420 from connortechnology/fix_event_menubars
...
remove set height on the menu bars, fixing flow issues
2016-05-10 16:55:06 +10:00
b03d2660cb
Merge pull request #1455 from ZoneMinder/api_servers
...
rough in Server object support
2016-05-10 08:00:58 +10:00
cffcbc6357
Merge pull request #1462 from ZoneMinder/merge_storageareas
...
Merge object model classes from storageareas
2016-05-10 07:59:25 +10:00
41776547cb
Merge branch 'master' into fix_zone_edit
2016-05-09 12:33:05 -04:00
e12160456b
Support user defined MySQL Port/Socket in API
2016-05-09 00:24:08 -07:00
966a9dcd8d
Merge pull request #1467 from ZoneMinder/api_fixes
...
Don't pass request data as a monitor array to daemonControl
2016-05-07 18:25:35 -04:00
e35b0a1eb2
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
...
added alarmed frames filter
2016-05-07 17:06:37 -04:00
be329e1e0d
switched to named param format, more flexible, in line with other APIs
2016-05-07 16:28:25 -04:00
8347b69b09
added alarmed frames filter
2016-05-07 14:26:09 -04:00
6d991a1c6c
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
...
added alarm enable/disable
2016-05-07 11:26:49 -04:00
6f9cc0f19f
to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF
2016-05-07 11:01:03 -04:00
15977f1a3c
Don't pass request data as a monitor array to daemonControl
2016-05-07 10:56:38 -04:00
0280ae4dd5
added alarm enable/disable
2016-05-07 10:37:42 -04:00
c050969141
Merge object model classes from storageareas
2016-05-05 15:33:28 -04:00
01aa2c9319
change permissions to stream permissions for view
2016-05-02 19:48:24 -04:00
75f9fde920
rough in Server object support
2016-05-02 10:41:25 -04:00
ce69f24bdd
use zm.conf values for database connection
2016-04-30 08:11:39 -04:00
532fb77ecb
As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes
2016-04-30 08:09:56 -04:00
be5f0cd4a9
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
2016-04-29 10:44:46 -04:00
513d1568d0
Merge pull request #1444 from ZoneMinder/handle_disk_free_space_error
...
handle disk_free_space error
2016-04-29 21:36:29 +10:00
c4410c512a
Merge branch 'master' into fix_event_menubars
2016-04-28 09:35:58 -04:00
5e20831030
Don't return of disk_free_space returns false, just log it.
2016-04-28 09:29:40 -04:00
ac5fdb8956
Merge pull request #1421 from connortechnology/fix_events_pagination
...
remove the if(pages>1) so that the if > line always happens
2016-04-28 21:43:54 +10:00
d847d66e99
handle disk_free_space error
2016-04-26 14:40:40 -04:00
fe9cb4b7ec
Merge pull request #1442 from ZoneMinder/fix_rotate
...
Fix rotate
2016-04-26 09:54:01 -05:00
85798932ee
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
2016-04-25 14:10:26 -04:00
fed575bdb4
add some missing () on class method calls. Remove some no longer needed global 's and some empty lines
2016-04-25 08:56:21 -04:00
81757a0465
Merge pull request #1418 from pliablepixels/1417-clone-monitor
...
Clone feature added
2016-04-20 13:02:10 -05:00
b2d02a64f4
reload stream after error
2016-04-19 12:02:58 -04:00
50f2747bb4
remove the if(pages>1) so that the if > line always happens
2016-04-15 16:11:53 -04:00
2b05815bfa
remove set height on the menu bars, fixing flow issues
2016-04-15 15:44:35 -04:00
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
851a81eff7
Merge pull request #1406 from ZoneMinder/svg_zones
...
replace the static zone image with a stream, and use SVG to draw the zones
2016-04-11 11:14:11 -04:00
Isaac Connor
Kyle Johnson
Andy Bauer
klemens
Bernardus Jansen
Isaac Connor
Isaac Connor
Steve Gilvarry
Pliable Pixels
Jeff Vogt
corax
David Sabbath Grits
Disassembler
Andrew Bauer
Isaac Connor
josh4trunks
Isaac Connor