cae6ffd5a3
use HTTP_HOST instead of SERVER_NAME
2018-12-01 13:27:08 -06:00
9bb4f1804e
Merge branch 'server_path_prefix'
2018-11-30 14:46:20 -05:00
8c626c984b
Need to pass port through all Url functions
2018-11-30 14:45:58 -05:00
945770c819
Merge branch 'server_path_prefix'
2018-11-29 15:53:35 -05:00
3bd5774ea1
Default to PathToIndex should have the index.php in it
2018-11-29 15:53:19 -05:00
17551eacee
Merge branch 'server_path_prefix'
2018-11-29 14:27:32 -05:00
1c17f334d3
fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well
2018-11-29 14:26:30 -05:00
d83fb2e985
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-29 14:08:03 -05:00
5e0d742e26
Use history.go(-1) which works on safari
2018-11-29 14:04:35 -05:00
a74a9ae292
Merge pull request #2328 from pliablepixels/login-auth-relay
...
returns user=&pass= in credentials for auth_relay plain and none #2327
2018-11-29 09:59:09 -06:00
5a88cbcddb
Merge pull request #2329 from connortechnology/fix_2319
...
Fix rate resetting
2018-11-29 09:57:13 -06:00
be07e4413f
Merge pull request #2152 from connortechnology/server_path_prefix
...
Server path prefix
2018-11-29 09:56:25 -06:00
605397b565
Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319
2018-11-29 09:43:21 -05:00
e6b8a7bc66
resolves #2327
2018-11-29 09:21:10 -05:00
1e915e9567
Merge branch 'master' into server_path_prefix
2018-11-28 10:45:36 -05:00
a89dd83565
Update to use object instead of db row
2018-11-28 09:55:34 -05:00
cd13dda294
fix use of instead of
2018-11-28 09:54:22 -05:00
2b48b09ef5
Add entries for PathToIndex and PathToZMS
2018-11-28 09:53:35 -05:00
94d8e043ce
Fix unreadable input text when OS theme dark ( #2324 )
...
* Update skin.css
* Update skin.css
2018-11-27 18:25:05 -05:00
f8b2ff5c77
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
2018-11-27 17:35:25 -05:00
10ce55c396
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-26 16:20:22 -05:00
17c1933913
remove an extra l
2018-11-26 16:20:15 -05:00
6128d2a4d9
fix #2317 by updating the url encoding of a filter to match events for that monitor
2018-11-23 15:34:23 -05:00
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
d8d9544497
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-17 10:39:52 -05:00
87140ecdb5
white space and quiet warning
2018-11-17 10:39:42 -05:00
5c2e5d89ed
fix gpl mailing address
...
This makes rpmlint & lintian complain less
2018-11-15 19:53:45 -06:00
415d43fafb
Include Server Name when testing for CORS. Also be case insensitive.
2018-11-15 12:23:52 -05:00
f72651da5a
Add auth hash to ajax fps and status calls in zone edit
2018-11-15 12:22:35 -05:00
aa8ac9c31c
spaces and quotes
2018-11-14 15:54:45 -05:00
3a409b26aa
Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons
2018-11-14 15:54:34 -05:00
3be31020b7
Automatically add width to frames view when thumbnails are turned on.
2018-11-14 15:54:01 -05:00
abeafe9ba6
fix log export. minTime and maxTime were being cleared by the regexp to detect sub second time. Also use ZM_DIR_EXPORTS instead of ZM_PATH_SWAP
2018-11-12 15:43:03 -05:00
d76d6bb9d1
include overlay.js when viewing the log, so that export works
2018-11-12 15:09:15 -05:00
246765ced9
Add tooltip for sorting monitors
2018-11-11 16:23:19 -05:00
82abd04f36
Add type=button to buttons so they don't act like submit buttons
2018-11-07 13:19:42 -05:00
ec09a71ba0
Include defaults for all the missing Monitor Columns
2018-11-07 13:18:53 -05:00
a066968aca
fix dbError and cause it to return the error string instead of just logging it. Add error logging of db errors that don't throw exceptions.
2018-11-07 12:33:18 -05:00
6360b84e15
Merge pull request #2288 from connortechnology/add_monitor_status_to_api
...
rough in adding Monitor_Status to Monitors
2018-11-03 20:46:11 -05:00
0e6fbe2213
Merge pull request #2286 from ratmole/api-php-notice-fix
...
API - Disable E_NOTICE from php error reporting in cake debug
2018-11-03 20:41:52 -05:00
a50c2bae35
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
...
Audio only with ffmpeg
2018-11-03 20:39:18 -05:00
fb25c0c4eb
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-31 11:56:19 -04:00
bdb50567df
fix disk_event_space to event_disk_space
2018-10-31 11:56:08 -04:00
589b6f3eef
add further note about needing h264 passthrough
2018-10-31 11:35:06 -04:00
69f7d36729
Make it clear that audio recording is only for ffmpeg input type
2018-10-31 11:34:30 -04:00
e87ded35f1
rough in adding Monitor_Status to Monitors
2018-10-31 11:08:44 -04:00
2b0df3e4e2
API - Disable E_NOTICE from php error reporting in cake debug
...
Using zmNinja, the API reports E_NOTICE errors
Notice (8): compact(): Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact '>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact '>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact '>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
and zmNinja will not work...
there is a better way, but i think disabling E_NOTICE error is way easier
see: https://github.com/ZoneMinder/zoneminder/pull/2269
2018-10-31 10:17:36 +02:00
f790eacc92
Merge pull request #2273 from connortechnology/fix_rce
...
use json_encode/decode instead of serialize/unserialize to pass onvif…
2018-10-30 07:06:45 -05:00
073193e410
Merge pull request #2281 from connortechnology/fix_2279_delete_camera_through_api
...
Fix 2279 delete camera through api
2018-10-30 07:06:14 -05:00
39061038fb
Don't include related models in Storage index
2018-10-29 14:40:05 -04:00
Andrew Bauer
Isaac Connor
Andrew Bauer
Pliable Pixels
Elmar Pruesse
Isaac Connor
Andrew Bauer
ratmole