Commit Graph

6276 Commits

Author SHA1 Message Date
Andy Bauer 873bb9902b recalculating zmswap at this point is unnesessary 2016-11-19 08:53:17 -06:00
Andy Bauer 3afa8937d8 calculate string lengths and array ndx's properly 2016-11-19 08:52:22 -06:00
Andrew Bauer b67450b8ae Update zoneminder.php-fpm.conf.in 2016-11-17 19:48:35 -06:00
Kyle Johnson 2b10cbf37a Merge pull request #1687 from connortechnology/sort_gitignore2
sort and remove duplicates from .gitignore
2016-11-17 10:08:36 -07:00
Isaac Connor d80adc9f98 add comment at top, suggesting how to keep sorting maintained 2016-11-17 12:05:42 -05:00
Isaac Connor c647d43616 sort and remove duplicates using vims :%sort u command 2016-11-17 12:01:30 -05:00
Isaac Connor 0b3eb574b2 Merge pull request #1685 from kylejohnson/1684_loginFailed
Fix Undefined index: loginFailed.  Resolves #1684
2016-11-16 22:06:25 -05:00
Kyle Johnson 4eb5ff7aff Fix Undefined index: loginFailed. Resolves #1684 2016-11-16 19:42:04 -07:00
Andrew Bauer bcc5a57b02 prelimniary support for nginx on fedora 2016-11-15 18:34:25 -06:00
Isaac Connor acc62585a2 Merge ../ZoneMinder.master 2016-11-14 21:48:31 -05:00
Isaac Connor 27b5b60eae Merge branch 'master' into fix_braces 2016-11-14 21:46:25 -05:00
Isaac Connor 2d1b50dc6a Merge pull request #1681 from knnniggett/unlink_mmap
unlink the mmap file when the monitor object is destroyed
2016-11-14 21:35:43 -05: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
Kyle Johnson b0d22aa2a5 Add new fonts directory to web CMakeLists 2016-11-14 19:23:05 -07:00
Andy Bauer d3a7fca079 only unlink if zmc is being destroyed 2016-11-14 19:01:00 -06:00
Andy Bauer 6c7d71361a unlink the mmap file when the monitor object is destroyed 2016-11-13 16:40:54 -06:00
Isaac Connor 70b28eb8c2 Merge ../ZoneMinder.master 2016-11-11 22:31:26 -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
Kyle Johnson 2c93f61622 Add bootstrap 3.3.7 2016-11-10 21:45:18 -07:00
Kyle Johnson bbb1e5b6ec Add additional post-cmake files to .gitignore 2016-11-10 21:45:04 -07:00
Isaac Connor a94b865781 Merge ../ZoneMinder.master 2016-11-08 22:12:06 -05: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
Isaac Connor 1be6c57aee fix extra semi colon 2016-11-08 13:11:10 -05:00
Isaac Connor 5f0c1c0e26 fix layout in a complex map 2016-11-08 12:55:07 -05:00
Isaac Connor 6361f14387 Rremove Index from options to prevent directory listings 2016-11-08 09:30:24 -05:00
Isaac Connor 21f38f85ec Merge ../ZoneMinder.master 2016-11-08 09:22:09 -05:00
Andrew Bauer 29e48da3b9 fix sftp xfers in zmfilter (#1677) 2016-11-07 16:08:43 -05:00
Andrew Bauer 976c2eee0f Merge pull request #1672 from kylejohnson/1671-watch-view-event-delete
Fix event deletion from watch view.  Fixes #1671
2016-11-06 18:57:43 -06:00
Andy Bauer 4be668f838 Add HikVision ptz control sciprt 2016-11-06 08:03:43 -06:00
Kyle Johnson 735d2df3c9 event is redefined before being passed to deleteEvent. Fixes #1671 2016-11-04 23:23:40 -06:00
Isaac Connor 0dbde8e290 correct a lot of braces 2016-11-04 15:53:14 -04:00
Isaac Connor 4613e5390d Merge ../ZoneMinder.master 2016-11-04 15:23:05 -04:00
Kyle Johnson ae0afaed0c Merge pull request #1666 from connortechnology/fix_whitespace
tabs to spaces
2016-11-04 12:55:14 -06:00
Isaac Connor 8a6a8fab5b Merge pull request #5 from ZoneMinder/master
merge upstream master
2016-11-04 14:35:58 -04:00
Isaac Connor 93725b3f4b fixup spacing in ConfigData 2016-11-04 14:05:51 -04:00
Kyle Johnson ae1abe99ab Merge pull request #1668 from zestysoft/Memory-Map-FAQ-Additional-Details
Add additional details to increasing mapped memory.
2016-11-04 11:24:15 -06:00
Ian b813b51f2b Revert "Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details"
This reverts commit aa74660aa4, reversing
changes made to 749a90f199.
2016-11-04 07:15:21 -07:00
Isaac Connor ad898d6ffe Merge pull request #1669 from zestysoft/UserGuide-FilteredPixelsDescription-Fix
Fix FilteredPixels Mode description
2016-11-04 09:02:03 -04:00
Ian 1f8e497ab9 Fix FilteredPixels Mode description
The FilteredPixels mode description incorrectly states that
AlarmedPixel analysis happens twice.
2016-11-03 23:24:31 -07:00
Ian aa74660aa4 Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details 2016-11-03 23:08:05 -07:00