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
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
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
97fb53e95c
Remove extra php tag in functions.php
2016-11-10 21:49:57 -07:00
227b196a2e
Move inline Login css to css file
2016-11-10 21:48:42 -07:00
3e3956f45d
Update doctype to HTML5, add meta tags for mobile browsers
2016-11-10 21:47:53 -07:00
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
1607ae1210
Load bootstrap css
2016-11-10 21:45:46 -07:00
2c93f61622
Add bootstrap 3.3.7
2016-11-10 21:45:18 -07:00
bbb1e5b6ec
Add additional post-cmake files to .gitignore
2016-11-10 21:45:04 -07:00
a94b865781
Merge ../ZoneMinder.master
2016-11-08 22:12:06 -05:00
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
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
1be6c57aee
fix extra semi colon
2016-11-08 13:11:10 -05:00
5f0c1c0e26
fix layout in a complex map
2016-11-08 12:55:07 -05:00
6361f14387
Rremove Index from options to prevent directory listings
2016-11-08 09:30:24 -05:00
21f38f85ec
Merge ../ZoneMinder.master
2016-11-08 09:22:09 -05:00
29e48da3b9
fix sftp xfers in zmfilter ( #1677 )
2016-11-07 16:08:43 -05:00
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
4be668f838
Add HikVision ptz control sciprt
2016-11-06 08:03:43 -06:00
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
0dbde8e290
correct a lot of braces
2016-11-04 15:53:14 -04:00
4613e5390d
Merge ../ZoneMinder.master
2016-11-04 15:23:05 -04:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
ae0afaed0c
Merge pull request #1666 from connortechnology/fix_whitespace
...
tabs to spaces
2016-11-04 12:55:14 -06:00
8a6a8fab5b
Merge pull request #5 from ZoneMinder/master
...
merge upstream master
2016-11-04 14:35:58 -04:00
93725b3f4b
fixup spacing in ConfigData
2016-11-04 14:05:51 -04:00
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
b813b51f2b
Revert "Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details"
...
This reverts commit aa74660aa4749a90f199
2016-11-04 07:15:21 -07:00
ad898d6ffe
Merge pull request #1669 from zestysoft/UserGuide-FilteredPixelsDescription-Fix
...
Fix FilteredPixels Mode description
2016-11-04 09:02:03 -04:00
1f8e497ab9
Fix FilteredPixels Mode description
...
The FilteredPixels mode description incorrectly states that
AlarmedPixel analysis happens twice.
2016-11-03 23:24:31 -07:00
aa74660aa4
Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details
2016-11-03 23:08:05 -07:00
749a90f199
Add additional details to increasing mapped memory.
...
Other distro’s do not use /run/shm as the memory mapped path, so added
information to cover this case.
Also filtered the output of df to focus our attention on the only mount
points that matter here.
2016-11-03 22:43:07 -07:00
60794fab1e
Change CREATE_ANALYSIS_IMAGES Help text
...
The existing help text didn’t fully explain how blobs play a part in
this functionality.
2016-11-03 15:58:16 -07:00
ebd2d050bf
Merge branch 'master' into fix_whitespace
2016-11-03 14:42:18 -04:00
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
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
3d17067276
change tabs to spaces
2016-11-03 14:30:23 -04:00
68c8178648
remove some extra spaces
2016-11-03 14:21:07 -04:00
bb371612c3
tabs to spaces
2016-11-03 14:18:03 -04:00
1bdcd39a50
add quotes to handle values with spaces
2016-10-31 20:37:58 -05:00
9f84aaa537
surround variables w/quotes to process data with spaces
2016-10-31 08:46:05 -05:00
d504043a9e
Update ru_ru.php
...
Remote extra line
2016-11-01 00:32:46 +11:00
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
1422f9d679
Merge pull request #1657 from knnniggett/fast_delete
...
change fast_delete to off
2016-10-20 10:18:30 -04:00
191efed8e3
change fast_delete to off - fixes #1597
2016-10-19 14:10:28 -05:00
b723e08b17
Merge pull request #1646 from connortechnology/fix_zm_image_memleak
...
move jpeg context freeing to a Deinitialise function instead of ~Image
2016-10-20 05:33:01 +11:00
3994de1b91
Merge pull request #1583 from zhuykovkb/fix_wrong_doc_root
...
fixed wrong doc root
2016-10-20 05:31:21 +11:00
0409ae5582
Merge pull request #1652 from connortechnology/fix_popup
...
handle when window.open fails
2016-10-20 05:17:44 +11:00
11cc73f55d
Merge pull request #1651 from connortechnology/fix_disable_monitor
...
Fix logic when disabling a monitor
2016-10-20 05:16:22 +11:00
Kyle Johnson
Isaac Connor
Andrew Bauer
Isaac Connor
Ian
Andrew Bauer
Steve Gilvarry