Commit Graph

6518 Commits

Author SHA1 Message Date
Isaac Connor 7c84e2417d remove extra ? 2016-12-08 15:53:38 -05:00
Isaac Connor c8009baf3f fix missing ; and test for integer string in limit 2016-12-08 15:46:42 -05:00
Isaac Connor d600eb0e8b Merge branch 'master' into fix_sql_injection 2016-12-08 13:39:04 -05:00
Isaac Connor e7d0861530 check limit for a valid integer and complain if not. 2016-12-08 13:37:23 -05:00
Isaac Connor 587fd16aa6 Add testing for limit, sortField and all the filters to ensure that they are valid. 2016-12-08 13:31:44 -05:00
Isaac Connor 75b8c35059 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-12-08 11:13:33 -05:00
Isaac Connor 2c0a868eea fix typo 2016-12-08 11:02:59 -05:00
Isaac Connor 857b4e8345 Merge branch 'master' into improve_filter 2016-12-06 11:58:41 -05:00
Isaac Connor fbc47359eb Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-12-06 11:55:26 -05:00
Andrew Bauer ecbaaef59a Merge pull request #1670 from connortechnology/fix_braces
Fix braces
2016-12-06 08:39:43 -06:00
Isaac Connor 0b3ba0a06d fix detection of LIBSWRESAMPLE 2016-12-06 09:38:06 -05:00
Andrew Bauer 5180f325be Merge pull request #1700 from bajansen/update-nl_NL-translation
Update nl_NL translation
2016-12-06 08:35:32 -06:00
Isaac Connor e33245c092 Merge pull request #1702 from knnniggett/travis
Fix Travis
2016-12-06 08:53:33 -05:00
Andy Bauer 653c9324f9 use Travis builtin mysql service 2016-12-06 07:12:36 -06:00
Isaac Connor 42eeb2bb15 Merge pull request #1689 from knnniggett/zmswap
Restore former zmswap path behaviour
2016-12-05 21:49:10 -05:00
Andy Bauer 1dee6ffda3 Travis - show output from apt-get 2016-12-05 20:42:48 -06:00
Bernardus Jansen 986567839e
Additional minor changes 2016-12-02 10:08:49 +01:00
Bernardus Jansen e27639f599
Updated dutch translation 2016-12-02 09:49:50 +01:00
Andy Bauer 9a694541ba repm specfile maintenance: retire fc23, add fc25 2016-11-26 08:20:03 -06:00
Kyle Johnson 49620d51b9 Merge pull request #1692 from ZoneMinder/small_fixes
Small fixes
2016-11-24 20:42:45 -07:00
Andy Bauer bf85791e4c improvements to fedora nginx rpm support 2016-11-22 13:02:02 -06:00
Isaac Connor f712f577a2 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-11-22 13:48:19 -05:00
Andy Bauer c2b1638a3e rpm changes - set TZ var in systemd service file 2016-11-22 12:43:56 -06:00
Andy Bauer a96ab604ec rpm changes - set TZ var in systemd service file 2016-11-22 12:42:48 -06:00
Andrew Bauer 71898df756 Merge pull request #1697 from connortechnology/apache_indexes
Apache indexes
2016-11-22 12:33:55 -06:00
Isaac Connor aa0a4d1f5a put back mizzing F 2016-11-22 13:13:09 -05:00
Andrew Bauer c5bee3c8e1 Merge pull request #1693 from connortechnology/fix_zmwatch_stealing_dev_shm_space
add a zmMemInvalidate at the beginning of the while loop
2016-11-22 10:50:08 -06:00
Isaac Connor af746e2154 Merge ../ZoneMinder.master.bad into disk_space_in_events 2016-11-22 11:06:35 -05:00
Isaac Connor 406a7ebdec Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2016-11-22 11:04:37 -05:00
Isaac Connor 9e8404516b add a zmMemInvalidate at the beginning of the while loop to catch unreleased mmap files 2016-11-22 11:02:38 -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
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
Isaac Connor bb6b0c2d49 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter 2016-11-17 12:16:49 -05: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