Kyle Johnson
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
Kyle Johnson
97fb53e95c
Remove extra php tag in functions.php
2016-11-10 21:49:57 -07:00
Kyle Johnson
227b196a2e
Move inline Login css to css file
2016-11-10 21:48:42 -07:00
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
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
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
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
Isaac Connor
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -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
Isaac Connor
ac24865647
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:51 -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
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
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
corax
070051d06a
Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
...
For easy pull-requesting
2016-09-09 14:20:03 +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
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
Isaac Connor
a0bc30d3fe
fix the order of analyse/capture being passed
2016-08-12 15:40:47 -04:00
Isaac Connor
9106675842
pass capture or analyse to getImageSrc
2016-08-12 15:17:13 -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
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
Andy Bauer
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05: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
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
593fe2b0c5
update area when points move
2016-06-07 11:40:53 -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
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
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
575f8ec265
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
...
Hide rtspdescribe
2016-05-25 08:44:17 -05:00