Kyle Johnson
3e3956f45d
Update doctype to HTML5, add meta tags for mobile browsers
2016-11-10 21:47:53 -07:00
Kyle Johnson
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
Kyle Johnson
1607ae1210
Load bootstrap css
2016-11-10 21:45:46 -07:00
Kyle Johnson
2c93f61622
Add bootstrap 3.3.7
2016-11-10 21:45:18 -07:00
Andrew Bauer
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
Kyle Johnson
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
Kyle Johnson
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
Isaac Connor
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
Kyle Johnson
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
Isaac Connor
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
Steve Gilvarry
d504043a9e
Update ru_ru.php
...
Remote extra line
2016-11-01 00:32:46 +11:00
Isaac Connor
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
Steve Gilvarry
0409ae5582
Merge pull request #1652 from connortechnology/fix_popup
...
handle when window.open fails
2016-10-20 05:17:44 +11:00
Steve Gilvarry
11cc73f55d
Merge pull request #1651 from connortechnology/fix_disable_monitor
...
Fix logic when disabling a monitor
2016-10-20 05:16:22 +11:00
Steve Gilvarry
c78a543e8e
Merge pull request #1475 from connortechnology/htmlselect
...
introduce htmlselect as an alternative to buildselect
2016-10-20 05:05:59 +11:00
Pliable Pixels
192d0dbb45
added TimeZone get API
2016-10-18 14:07:31 -04:00
Isaac Connor
aaf8f6c98b
add the missing case for ServerId in Filter processing.
2016-10-18 10:14:19 -04:00
Isaac Connor
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
Isaac Connor
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
Isaac Connor
c02b840274
Fix logic when disabling a monitor
2016-10-11 12:10:47 -04:00
Isaac Connor
ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
Jeff Vogt
3801d9e43e
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
2016-10-10 11:27:36 -07:00
Andrew Bauer
7b574e0d41
Merge pull request #1645 from connortechnology/fix_onvif
...
Fix onvif
2016-10-04 16:34:58 -05:00
Isaac Connor
ac24865647
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:51 -04:00
Isaac Connor
6814bcc791
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:38 -04:00
Isaac Connor
09c5e3012a
username and password don't actually have to be specified
2016-10-04 14:09:32 -04:00
Isaac Connor
21a94a6200
better error message
2016-10-04 10:29:37 -04:00
Isaac Connor
6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
Pliable Pixels
92d7cad5f1
enabled utf8
2016-09-21 11:53:34 -04:00
Isaac Connor
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
Isaac Connor
db8cada380
fix merge
2016-09-13 15:01:02 -04:00
Isaac Connor
54db9f2e3a
ptzControl expects a monitor object instead of a dbrow array.
2016-09-12 21:36:03 -04:00
Steve Gilvarry
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
Andrew Bauer
e35ef3ce83
Merge pull request #1617 from coracis/master
...
Update German translation
2016-09-09 08:55:19 -05:00
Andrew Bauer
321deb5506
Merge pull request #1599 from sabbath88/master
...
add some more translation
2016-09-09 08:40:05 -05:00
corax
070051d06a
Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
...
For easy pull-requesting
2016-09-09 14:20:03 +02:00
corax
6fab2e97b1
Update German translation of Buffer
2016-09-09 13:32:20 +02:00
corax
b10c79b4f7
Add translation for 'Montage Review'
2016-09-09 13:26:19 +02:00
corax
6b18184e4a
Remove confusing link to web console
2016-09-09 12:38:30 +02:00
corax
4dc6fc03b3
Add a missing translate()-call
2016-09-09 12:35:34 +02:00
corax
430ecd8e32
Fix some too direct translations into German
2016-09-09 11:51:53 +02:00
corax
d017138550
Fix a 'false friend' in German translation
2016-09-09 11:25:12 +02:00
Pliable Pixels
1440dd9265
retab
2016-09-03 15:02:32 -04:00
Pliable Pixels
7bf0b3c423
readded forMonitor - removed by mistake
2016-09-03 14:51:24 -04:00
Pliable Pixels
9a4330eb59
#1537 Zones Controller not returning all zones
2016-09-03 14:46:47 -04:00
Kyle Johnson
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
Isaac Connor
55f5db55dd
implement suggested code to stop the monitor when Function is set to None
2016-09-01 11:43:20 -04:00
David Sabbath Grits
2d44531d1f
add some more translation
2016-08-25 14:24:14 +02:00
Andrew Bauer
7d48b2c6c5
Merge pull request #1577 from ZoneMinder/fix_zmaControl
...
fix error in calling zmaControl
2016-08-17 08:36:51 -05:00
Andrew Bauer
ea34f3d69a
Merge pull request #1576 from ZoneMinder/show_other_zones
...
include polygons for the other zones.
2016-08-15 20:36:16 -05:00
Andrew Bauer
31cb86046c
Merge pull request #1592 from connortechnology/fix_analysis_frame
...
Fix analysis frame
2016-08-14 10:54:46 -05:00
Isaac Connor
a0bc30d3fe
fix the order of analyse/capture being passed
2016-08-12 15:40:47 -04:00
Isaac Connor
240336e3ec
silence error when Event has no StorageId set
2016-08-12 15:20:21 -04:00
Isaac Connor
9106675842
pass capture or analyse to getImageSrc
2016-08-12 15:17:13 -04:00
Isaac Connor
bcb7dd1ba4
take optional show= to specify the analyse image or the capture image
2016-08-12 15:16:05 -04:00
Isaac Connor
3dadcc8d32
add ability to pass show=capture or show=analyse to getImageSrc
2016-08-12 15:14:51 -04:00
Isaac Connor
bc4923b555
use instead of for the frame object and pass to getImageSrc which expects an array
2016-08-12 13:50:18 -04:00
Andrew Bauer
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
Isaac Connor
9d65ef3bb2
Merge pull request #1556 from knnniggett/banner
...
custom banner text on web console
2016-08-06 10:59:53 -04:00
Andrew Bauer
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
b522371080
include polygons for the other zones.
2016-08-02 12:02:07 -04:00
Isaac Connor
cd43d1fa7a
Rough in Event disk space reporting
2016-07-19 17:34:01 -04:00
Andy Bauer
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
Steve Gilvarry
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
Steve Gilvarry
f3779d543c
Merge pull request #1521 from ZoneMinder/fix_zone_edit
...
update area when points move
2016-06-29 21:46:28 +10:00
Steve Gilvarry
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
Isaac Connor
b4aec41d3d
fix warnings and move User import up higher to where it needs to be
2016-06-21 09:09:58 -04:00
Isaac Connor
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
Steve Gilvarry
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
Steve Gilvarry
f804f7739d
Adjust download file path to swap path to match the file generated.
2016-06-14 20:49:38 +10:00
Isaac Connor
83ac4cd061
change the input handler from onchange to oninput. Disable form submit when hitting enter
2016-06-13 09:40:04 -04:00
Isaac Connor
632ec38d7d
Put back in neccessary callt o updateArea
2016-06-12 16:10:24 -04:00
Isaac Connor
4f2e0edb44
remove unnecssary updateAreas
...
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
Isaac Connor
dbdd1ae51e
remove debug logging
2016-06-07 16:26:58 -04:00
Isaac Connor
f26c9168c4
if user=&pass= are in request, use them for auth
2016-06-07 16:25:35 -04:00
Isaac Connor
593fe2b0c5
update area when points move
2016-06-07 11:40:53 -04:00
Isaac Connor
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
Andrew Bauer
a57a3d3186
Merge pull request #1501 from ZoneMinder/fix_zone_edit
...
Fix zone edit
2016-05-31 10:33:31 -05:00
Disassembler
883b323528
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-05-29 22:16:00 +02:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
c4e5299943
sync up auto to Auto
2016-05-27 12:45:04 -04:00
Isaac Connor
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
Isaac Connor
7277283659
rename AttrServerId to AttrServer, because that is the text that is returned
2016-05-27 10:12:46 -04:00
Isaac Connor
f461bc1e80
get rid of extra )
2016-05-26 12:18:58 -04:00
Isaac Connor
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
Andrew Bauer
730abc9789
make zones unclickable when zm is not running
2016-05-26 09:35:36 -05:00
Andrew Bauer
1972c4116b
Merge pull request #1486 from connortechnology/update_image_view
...
Update image view
2016-05-26 09:05:14 -05:00
Andrew Bauer
ceaacf91bf
Merge pull request #1470 from connortechnology/api_improvements
...
Api improvements
2016-05-25 12:45:03 -05:00
Andrew Bauer
575f8ec265
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
...
Hide rtspdescribe
2016-05-25 08:44:17 -05:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
Isaac Connor
89f58daf89
Merge branch 'master' into fix_zone_edit
2016-05-24 15:30:56 -04:00
Andrew Bauer
0052bb080c
unlink only if file exists
2016-05-24 12:13:17 -05:00
Isaac Connor
00abd36af8
fix the other case of the wrong case of rtsp
2016-05-24 12:19:31 -04:00
Isaac Connor
056eed6df9
fix to show RTSP describe option when switching back to rtsp
2016-05-24 12:15:59 -04:00
Isaac Connor
bc49aa6aa6
add missing ; and remove extra )
2016-05-24 09:34:36 -04:00
Isaac Connor
5eac0559e2
Merge branch 'master' into hide_rtspdescribe
2016-05-24 09:32:41 -04:00
Andrew Bauer
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
josh4trunks
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
arjunrc
4018cab743
don't pass partial data to daemoncontrol
2016-05-19 14:53:16 -04:00
Isaac Connor
20c4d07a00
Merge branch 'master' into hide_rtspdescribe
2016-05-16 14:40:04 -04:00
Isaac Connor
0faa28d058
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-05-16 14:38:49 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
235095ed5f
fix URL to image view
2016-05-16 10:32:43 -04:00
Isaac Connor
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
Isaac Connor
ed3e975e5a
take fid and eid as alternate parameters
2016-05-12 11:55:48 -04:00
Isaac Connor
1530096560
whitespace/google code style
2016-05-12 10:17:41 -04:00
Isaac Connor
aba80f0935
introduce htmlselect as an alternative to buildselect
2016-05-12 09:43:37 -04:00
arjunrc
b513bcef82
icon's gonna kill me
2016-05-10 20:09:41 -04:00
arjunrc
af3cae578e
fixed verbose handling bug for status command on zmu
2016-05-10 20:07:28 -04:00
arjunrc
8d5f2a8e5d
added iconnor's change back
2016-05-10 19:17:09 -04:00
arjunrc
df830a5190
resolved merge conflicts
2016-05-10 19:15:00 -04:00
arjunrc
2888142e68
added status command to retrieve alarmed status of monitor in addition to on/of
2016-05-10 16:55:43 -04:00
Steve Gilvarry
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
Steve Gilvarry
b03d2660cb
Merge pull request #1455 from ZoneMinder/api_servers
...
rough in Server object support
2016-05-10 08:00:58 +10:00
Steve Gilvarry
cffcbc6357
Merge pull request #1462 from ZoneMinder/merge_storageareas
...
Merge object model classes from storageareas
2016-05-10 07:59:25 +10:00
Isaac Connor
41776547cb
Merge branch 'master' into fix_zone_edit
2016-05-09 12:33:05 -04:00
Joshua Ruehlig
e12160456b
Support user defined MySQL Port/Socket in API
2016-05-09 00:24:08 -07:00
Isaac Connor
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
Isaac Connor
e35b0a1eb2
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
...
added alarmed frames filter
2016-05-07 17:06:37 -04:00
arjunrc
be329e1e0d
switched to named param format, more flexible, in line with other APIs
2016-05-07 16:28:25 -04:00
arjunrc
8347b69b09
added alarmed frames filter
2016-05-07 14:26:09 -04:00
Isaac Connor
6d991a1c6c
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
...
added alarm enable/disable
2016-05-07 11:26:49 -04:00
arjunrc
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
Isaac Connor
15977f1a3c
Don't pass request data as a monitor array to daemonControl
2016-05-07 10:56:38 -04:00
arjunrc
0280ae4dd5
added alarm enable/disable
2016-05-07 10:37:42 -04:00
Isaac Connor
c050969141
Merge object model classes from storageareas
2016-05-05 15:33:28 -04:00
Isaac Connor
01aa2c9319
change permissions to stream permissions for view
2016-05-02 19:48:24 -04:00
Isaac Connor
75f9fde920
rough in Server object support
2016-05-02 10:41:25 -04:00
Isaac Connor
ce69f24bdd
use zm.conf values for database connection
2016-04-30 08:11:39 -04:00
Isaac Connor
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
Isaac Connor
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
Steve Gilvarry
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
Isaac Connor
c4410c512a
Merge branch 'master' into fix_event_menubars
2016-04-28 09:35:58 -04:00
Isaac Connor
5e20831030
Don't return of disk_free_space returns false, just log it.
2016-04-28 09:29:40 -04:00
Steve Gilvarry
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
Isaac Connor
d847d66e99
handle disk_free_space error
2016-04-26 14:40:40 -04:00
Andrew Bauer
fe9cb4b7ec
Merge pull request #1442 from ZoneMinder/fix_rotate
...
Fix rotate
2016-04-26 09:54:01 -05:00
Isaac Connor
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
Isaac Connor
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
Andrew Bauer
81757a0465
Merge pull request #1418 from pliablepixels/1417-clone-monitor
...
Clone feature added
2016-04-20 13:02:10 -05:00
Isaac Connor
b2d02a64f4
reload stream after error
2016-04-19 12:02:58 -04:00
Isaac Connor
50f2747bb4
remove the if(pages>1) so that the if > line always happens
2016-04-15 16:11:53 -04:00
Isaac Connor
2b05815bfa
remove set height on the menu bars, fixing flow issues
2016-04-15 15:44:35 -04:00