Commit Graph

669 Commits

Author SHA1 Message Date
Andrew Bauer a10d52a3e1 Merge pull request #1844 from connortechnology/fix_1812
fix Monitors filtering SQL
2017-04-03 20:06:39 -05:00
Isaac Connor d3f6ab3d29 fix Monitors filtering SQL 2017-03-30 13:06:54 -04:00
Isaac Connor 7e3b27a130 Test for Controllable as well as ControlId 2017-03-30 10:49:02 -04:00
Isaac Connor eaca58bb7c Merge pull request #1815 from mnoorenberghe/postlogin
Properly escape postLoginQuery. Fixes #1797
2017-03-21 10:27:13 -04:00
Isaac Connor badbf1c74c Merge pull request #1816 from mnoorenberghe/flat_window_sizes
Increase default window sizes for the flat theme. Fixes #1059
2017-03-20 13:10:13 -04:00
Andrew Bauer 2dcd95bc7f Merge pull request #1504 from ZoneMinder/improve_filter
Improve filter
2017-03-18 21:12:58 -05:00
Matthew Noorenberghe 91ad6afffb Increase default window sizes for the flat theme. Fixes #1059
Used the computed height of <html> and rounded up the nearest multiple of 5.
2017-03-17 22:24:42 -07:00
Matthew Noorenberghe ea5342abd2 Properly escape postLoginQuery. Fixes #1797 2017-03-17 21:05:28 -07:00
Andrew Bauer 9681a444b4 Merge pull request #1765 from SteveGilvarry/ffmpeg_url
Align Method description to what it is actually doing
2017-03-16 09:32:30 -05:00
Manojav Sridhar 11b90e6011 fix usage of wrong key 2017-02-17 12:37:58 -05:00
SteveGilvarry 9716c4ef89 Add Option help 2017-02-05 18:43:47 +11:00
SteveGilvarry c72704bf0b Change descriptions for ffmpeg methods and put TCP first. 2017-02-05 15:34:06 +11:00
Andy Bauer 7ef7a36f39 fix conditional logic in controlcap.js 2017-01-10 17:53:05 -06:00
Isaac Connor fea5fa1b59 fix xtell should be -1 for move left 2017-01-10 12:35:02 -05:00
Isaac Connor b4bddee337 Merge branch 'master' into improve_filter 2017-01-03 08:49:56 -05:00
Isaac Connor 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
Andy Bauer 2dda2d9e1e remove unneeded, empty files 2016-12-26 09:49:14 -06:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 38c0cedecc remove the use of empty which on php < 5.5 only supports variables. 2016-12-20 16:37:42 -05:00
Isaac Connor 752f0eb40b Merge branch 'master' into improve_filter 2016-12-20 11:43:02 -05:00
Isaac Connor a9548d3f6b Add a config entry to turn event disk space on/off 2016-12-13 13:34:56 -05:00
Isaac Connor 30ec67d4c3 Merge branch 'master' into disk_space_in_events 2016-12-13 13:28:32 -05:00
Isaac Connor 857b4e8345 Merge branch 'master' into improve_filter 2016-12-06 11:58:41 -05:00
Isaac Connor 9312eed17f Merge branch 'master' into disk_space_in_events 2016-11-22 10:58:24 -05:00
Isaac Connor 02cd3e8cba Merge branch 'master' into small_fixes 2016-11-22 10:52:07 -05:00
Isaac Connor bb6b0c2d49 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter 2016-11-17 12:16:49 -05:00
Kyle Johnson 4eb5ff7aff Fix Undefined index: loginFailed. Resolves #1684 2016-11-16 19:42:04 -07:00
Isaac Connor 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
Andrew Bauer 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
Kyle Johnson 65fe07e7aa Fix a few typos in login inputs 2016-11-10 23:36:28 -07:00
Kyle Johnson 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
Kyle Johnson 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
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
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
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 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 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