Isaac Connor
dea64320f0
Fix a + that should be a .
2019-01-04 15:52:14 -05:00
Isaac Connor
0e20666992
fix eventdetail actions being in events
2019-01-04 15:43:31 -05:00
Isaac Connor
ab198bfd75
remove master version of actions.php
2019-01-04 15:29:21 -05:00
Isaac Connor
52466c398b
Merge branch 'split_actions' into storageareas
2019-01-04 15:28:55 -05:00
Isaac Connor
b8d065275b
Merge branch 'master' into storageareas
2019-01-04 15:22:18 -05:00
Isaac Connor
e2f32ab091
Upgrade config saving
2019-01-04 09:43:36 -05:00
Isaac Connor
7ec96655c3
fix missing ! when testing for permission on editing config
2019-01-04 09:37:26 -05:00
Isaac Connor
5b9bf48945
Merge branch 'master' into split_actions
2019-01-04 09:35:54 -05:00
Isaac Connor
46adcbb66b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-04 09:34:51 -05:00
Isaac Connor
edeaa07c12
Fix no quotes around Id
2019-01-04 09:34:42 -05:00
Isaac Connor
6cad852e11
fix path to MontageLayout
2019-01-04 09:34:18 -05:00
Isaac Connor
dbe9817bc8
Split actions.php into individual files per view
2019-01-04 09:26:34 -05:00
Andrew Bauer
225fca08e3
Merge pull request #2379 from connortechnology/improve_config_efficiency
...
Improve config efficiency
2019-01-02 19:34:34 -06:00
Isaac Connor
874930d8fc
Merge branch 'master' into improve_config_efficiency
2019-01-02 13:07:53 -05:00
Isaac Connor
99471836b7
Use monitor's serverId when loading server object so that images load from recording server.
2019-01-02 11:28:12 -05:00
Isaac Connor
8a1707a615
Add monitorServerId array to provide server info for each monitor so that we can load images from the recording server.
2019-01-02 11:27:46 -05:00
Isaac Connor
79113a6869
Add a default Server object to handle non-multi-server case
2019-01-02 10:56:40 -05:00
Isaac Connor
5060358870
Merge branch 'master' into storageareas
2018-12-29 09:56:53 -05:00
Andrew Bauer
d14e9ecf74
force overloadframes and ExtendAlarmFrames to int ( #2373 )
2018-12-29 09:53:31 -05:00
Andrew Bauer
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
Isaac Connor
1a1231fdaa
Merge branch 'master' into storageareas
2018-12-28 10:47:27 -05:00
Andrew Bauer
a029909972
fix path to thumb and anal images ( #2367 )
2018-12-28 10:46:13 -05:00
Andrew Bauer
fb37fc48e1
update viewImagePatch ( #2370 )
2018-12-28 10:38:39 -05:00
Isaac Connor
101f24feb5
Update area when editing x and y coords ( #2366 )
2018-12-27 14:28:14 -05:00
Isaac Connor
3e06bbcef8
Merge branch 'master' into storageareas
2018-12-27 13:50:29 -05:00
Andrew Bauer
5f9a113da1
redirect to montage rather than montagereview
2018-12-26 10:34:01 -06:00
Andrew Bauer
27dd8166ea
Merge pull request #2362 from connortechnology/small_groups_fixes
...
Small groups fixes
2018-12-24 11:30:57 -06:00
Isaac Connor
e0a9c4a21e
fix event popup detection
2018-12-24 11:23:58 -05:00
Isaac Connor
2b8fa653ed
Merge branch 'small_groups_fixes' into storageareas
2018-12-24 09:48:36 -05:00
Isaac Connor
27826b4aca
Merge branch 'master' into storageareas
2018-12-24 09:48:29 -05:00
Isaac Connor
68adc289fe
Fix colspan count now that depth is zero-based
2018-12-24 09:40:23 -05:00
Isaac Connor
e0cae5709f
Group::find is now more powerful so we can just use it to return all Groups to be deleted
2018-12-24 09:39:40 -05:00
Isaac Connor
63199289ad
Change depth function to be 0-based.
2018-12-24 09:38:55 -05:00
Isaac Connor
0cce0a642b
Update chosen library to 1.8.7
2018-12-24 09:37:49 -05:00
Andrew Bauer
153877b9c0
Merge pull request #2359 from connortechnology/fix_2353
...
Update permissions checking for Groups to not use session. Fixes #2353
2018-12-21 15:16:49 -06:00
Isaac Connor
1130d6650a
Fix spacing and pass popup to previous/next event so that popups stay as popups
2018-12-21 10:50:19 -05:00
Isaac Connor
47465260d1
Update permissions checking for Groups to not use session. Fixes #2353
2018-12-21 10:01:48 -05:00
Isaac Connor
7a8beffdcc
Merge branch 'master' into storageareas
2018-12-20 15:10:52 -05:00
Isaac Connor
a277f697e9
whitespace
2018-12-20 14:58:38 -05:00
Isaac Connor
e626049f6b
Merge branch 'swresample' into storageareas
2018-12-20 14:08:40 -05:00
Isaac Connor
d4fb85a9aa
Merge branch 'master' into swresample
2018-12-20 09:16:27 -05:00
Isaac Connor
3a068ae6a3
Merge branch 'master' into swresample
2018-12-16 16:15:28 -05:00
Pliable Pixels
622c17f628
make sure auth is regenerated each time we call this API ( #2347 )
2018-12-16 11:02:07 -05:00
Isaac Connor
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
Mike Rosack
567b60ffa7
support for forwarded proto/port in Server.php ( #2343 )
2018-12-13 10:24:32 -05:00
Andrew Bauer
8d74354fcb
Merge pull request #2242 from connortechnology/cleanup_auth
...
Cleanup auth
2018-12-12 20:53:24 -06:00
Isaac Connor
eba8b3327d
Merge branch 'master' into cleanup_auth
2018-12-11 16:04:42 -05:00
Andrew Bauer
21a98f3653
Merge branch 'remove_default_view' of https://github.com/connortechnology/ZoneMinder into connortechnology-remove_default_view
2018-12-11 09:44:13 -06:00
Isaac Connor
278abbc201
Merge branch 'master' into remove_default_view
2018-12-11 10:37:26 -05:00
Andrew Bauer
3cf6bf1786
Merge pull request #2243 from connortechnology/add_archive_filter_to_montagereview
...
Rough in an archived status filter in montagereview.
2018-12-11 09:36:35 -06:00
Andrew Bauer
fe5cb4bfdc
Merge pull request #2283 from connortechnology/warn_colour_when_disabled
...
Use a warning colour when motion detection is disabled.
2018-12-11 09:36:07 -06:00
Andrew Bauer
4d7e98475f
Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML
...
Introduce get body top html
2018-12-11 09:35:54 -06:00
Andrew Bauer
22460f580b
Merge pull request #2305 from pliablepixels/save-first-alarm
...
Save first alarm
2018-12-11 09:35:40 -06:00
Andrew Bauer
c530337c50
Merge pull request #2331 from connortechnology/fix_ios9
...
Fix ios9
2018-12-11 09:29:50 -06:00
Isaac Connor
c8c34d3f95
Merge branch 'master' into storageareas
2018-12-11 10:21:22 -05:00
Isaac Connor
b3bed9a28a
fix whitespace
2018-12-11 10:20:02 -05:00
Isaac Connor
e1ecd47bff
Fix missing use of UrlToApi
2018-12-11 09:40:40 -05:00
Isaac Connor
1e8c4276bb
fix #2319 some more. This is fixing rate sticking across gapless events and reload
2018-12-10 17:32:17 -05:00
Isaac Connor
a1141d2dc4
remove second use of HTTP_HOST and use a better method of stripping off port from HTTP_HOST
2018-12-07 08:39:23 -05:00
Isaac Connor
757e538550
strip port from HTTP_HOST
2018-12-06 17:12:03 -05:00
Isaac Connor
50017057de
Merge branch 'master' into storageareas
2018-12-05 09:05:27 -05:00
Isaac Connor
9ffd77428a
fix paths to jquery-ui-theme components, thereby upgrading them to the proper version. This fixes the datetime filters not being shown on skins that don't specify a custom theme for jquery-ui
2018-12-05 09:05:10 -05:00
Isaac Connor
bc5f8d0d8d
rework pts/dts of audio stream. Spacing. Fix crash
2018-12-04 18:23:08 -05:00
Isaac Connor
a9290759a5
Merge branch 'fix_ios9' into storageareas
2018-12-03 16:25:34 -05:00
Isaac Connor
18ce7c9ea0
Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead.
2018-12-03 15:17:16 -05:00
Isaac Connor
27d4ba9e5f
use output of babeljs.io to provide code that works on older browsers. The nice class notation is ES6 upwards.. Safari on IOS9 doesn't like it
2018-12-03 15:16:47 -05:00
Isaac Connor
2df6d74a3e
Merge branch 'master' into storageareas
2018-12-02 17:15:12 -05:00
Andrew Bauer
e327ad100e
fix WebSite camera startup issue
2018-12-01 17:03:50 -06:00
Andrew Bauer
cae6ffd5a3
use HTTP_HOST instead of SERVER_NAME
2018-12-01 13:27:08 -06:00
Isaac Connor
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
Isaac Connor
7d90a56561
Merge branch 'master' into storageareas
2018-11-30 14:46:42 -05:00
Isaac Connor
9bb4f1804e
Merge branch 'server_path_prefix'
2018-11-30 14:46:20 -05:00
Isaac Connor
8c626c984b
Need to pass port through all Url functions
2018-11-30 14:45:58 -05:00
Isaac Connor
fe45e83bb4
Fix PathToIndex
2018-11-29 15:54:25 -05:00
Isaac Connor
4cf7ff7fe4
Merge branch 'server_path_prefix' into storageareas
2018-11-29 15:53:58 -05:00
Isaac Connor
945770c819
Merge branch 'server_path_prefix'
2018-11-29 15:53:35 -05:00
Isaac Connor
3bd5774ea1
Default to PathToIndex should have the index.php in it
2018-11-29 15:53:19 -05:00
Isaac Connor
af2bb992e9
Merge branch 'server_path_prefix' into storageareas
2018-11-29 14:33:46 -05:00
Isaac Connor
17551eacee
Merge branch 'server_path_prefix'
2018-11-29 14:27:32 -05:00
Isaac Connor
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
Isaac Connor
d83fb2e985
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-29 14:08:03 -05:00
Isaac Connor
5e0d742e26
Use history.go(-1) which works on safari
2018-11-29 14:04:35 -05:00
Andrew Bauer
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
Andrew Bauer
5a88cbcddb
Merge pull request #2329 from connortechnology/fix_2319
...
Fix rate resetting
2018-11-29 09:57:13 -06:00
Andrew Bauer
be07e4413f
Merge pull request #2152 from connortechnology/server_path_prefix
...
Server path prefix
2018-11-29 09:56:25 -06:00
Isaac Connor
df0b600431
Merge branch 'master' into storageareas
2018-11-29 10:49:06 -05:00
Isaac Connor
c0a9fae01f
Merge branch 'fix_2319' into storageareas
2018-11-29 09:57:41 -05:00
Isaac Connor
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
Pliable Pixels
e6b8a7bc66
resolves #2327
2018-11-29 09:21:10 -05:00
Isaac Connor
4625f7c879
Merge branch 'master' into storageareas
2018-11-28 10:46:49 -05:00
Isaac Connor
1e915e9567
Merge branch 'master' into server_path_prefix
2018-11-28 10:45:36 -05:00
Isaac Connor
57acb2aac6
Merge branch 'server_path_prefix' into storageareas
2018-11-28 10:41:11 -05:00
Isaac Connor
a89dd83565
Update to use object instead of db row
2018-11-28 09:55:34 -05:00
Isaac Connor
cd13dda294
fix use of instead of
2018-11-28 09:54:22 -05:00
Isaac Connor
2b48b09ef5
Add entries for PathToIndex and PathToZMS
2018-11-28 09:53:35 -05:00
Isaac Connor
f5328265ef
fix missing daemons definition
2018-11-28 09:12:22 -05:00
Elmar Pruesse
94d8e043ce
Fix unreadable input text when OS theme dark ( #2324 )
...
* Update skin.css
* Update skin.css
2018-11-27 18:25:05 -05:00
Isaac Connor
f8b2ff5c77
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
2018-11-27 17:35:25 -05:00
Isaac Connor
10ce55c396
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-26 16:20:22 -05:00
Isaac Connor
17c1933913
remove an extra l
2018-11-26 16:20:15 -05:00
Isaac Connor
b5430a1927
Merge branch 'fix_2317' into storageareas
2018-11-23 15:35:55 -05:00
Isaac Connor
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
Isaac Connor
19f3cce41f
Dont auto-guess pathPrefix
2018-11-23 13:54:14 -05:00
Isaac Connor
7ad19be0d7
Merge branch 'server_path_prefix' into storageareas
2018-11-23 13:29:01 -05:00
Isaac Connor
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
Isaac Connor
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
Isaac Connor
62e511cfd1
Merge branch 'master' into h265
2018-11-17 10:41:20 -05:00
Isaac Connor
d8d9544497
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-17 10:39:52 -05:00
Isaac Connor
87140ecdb5
white space and quiet warning
2018-11-17 10:39:42 -05:00
Andrew Bauer
5c2e5d89ed
fix gpl mailing address
...
This makes rpmlint & lintian complain less
2018-11-15 19:53:45 -06:00
Isaac Connor
415d43fafb
Include Server Name when testing for CORS. Also be case insensitive.
2018-11-15 12:23:52 -05:00
Isaac Connor
f72651da5a
Add auth hash to ajax fps and status calls in zone edit
2018-11-15 12:22:35 -05:00
Isaac Connor
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
Isaac Connor
d89c0bc737
Merge branch 'master' into storageareas
2018-11-14 15:55:00 -05:00
Isaac Connor
aa8ac9c31c
spaces and quotes
2018-11-14 15:54:45 -05:00
Isaac Connor
3a409b26aa
Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons
2018-11-14 15:54:34 -05:00
Isaac Connor
3be31020b7
Automatically add width to frames view when thumbnails are turned on.
2018-11-14 15:54:01 -05:00
Isaac Connor
9d5772b517
Merge branch 'fix_multiserver_daemon_restarting' into storageareas
2018-11-14 13:02:30 -05:00
Isaac Connor
786ca5b22a
implement remove service restart for zma. Use daemonControl instead of saving the monitor when restarting zmc
2018-11-14 13:00:19 -05:00
Isaac Connor
51d8c0ea73
add back daemon parameter, but make it actually work
2018-11-14 12:59:44 -05:00
Isaac Connor
9d8f0fef0c
add templates for daemonControl to api
2018-11-14 12:54:40 -05:00
Isaac Connor
d671761a35
simplify params to daemonControl since they really aren't being used anyways. Return the status text
2018-11-14 12:54:10 -05:00
Isaac Connor
490fb40917
DefaultView in the past was used to control whether the watch view starts up with ptz controls visible or the events list. Isaac changed the watch view to always have the controls visible... so this setting is no longer useful.
2018-11-14 09:22:38 -05:00
Isaac Connor
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
Isaac Connor
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
Isaac Connor
d76d6bb9d1
include overlay.js when viewing the log, so that export works
2018-11-12 15:09:15 -05:00
Pliable Pixels
01a57222d3
keep track if we have written alarmed frame incase savejpeg is off
2018-11-12 12:43:20 -05:00
Isaac Connor
246765ced9
Add tooltip for sorting monitors
2018-11-11 16:23:19 -05:00
Isaac Connor
82abd04f36
Add type=button to buttons so they don't act like submit buttons
2018-11-07 13:19:42 -05:00
Isaac Connor
ec09a71ba0
Include defaults for all the missing Monitor Columns
2018-11-07 13:18:53 -05:00
Isaac Connor
702143e51b
Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top.
...
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.
This is a pretty quick, crude implementation.
2018-11-07 12:33:54 -05:00
Isaac Connor
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
Andrew Bauer
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
Andrew Bauer
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
Andrew Bauer
a50c2bae35
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
...
Audio only with ffmpeg
2018-11-03 20:39:18 -05:00
Isaac Connor
89c3de432f
fix crud version
2018-11-01 17:50:51 -04:00
Isaac Connor
1dac088000
Merge branch 'audio_only_with_ffmpeg' into storageareas
2018-10-31 14:48:24 -04:00
Isaac Connor
48c9c2b6c0
Merge branch 'add_monitor_status_to_api' into storageareas
2018-10-31 14:47:52 -04:00
Isaac Connor
eb6d978927
Merge branch 'master' into storageareas
2018-10-31 14:47:43 -04:00
Isaac Connor
fb25c0c4eb
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-31 11:56:19 -04:00
Isaac Connor
bdb50567df
fix disk_event_space to event_disk_space
2018-10-31 11:56:08 -04:00
Isaac Connor
589b6f3eef
add further note about needing h264 passthrough
2018-10-31 11:35:06 -04:00
Isaac Connor
69f7d36729
Make it clear that audio recording is only for ffmpeg input type
2018-10-31 11:34:30 -04:00
Isaac Connor
e87ded35f1
rough in adding Monitor_Status to Monitors
2018-10-31 11:08:44 -04:00
ratmole
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
Isaac Connor
80cfb02570
Merge branch 'warn_colour_when_disabled' into storageareas
2018-10-30 12:05:47 -04:00
Isaac Connor
f95379742b
Use a warning colour when motion detection is disabled.
2018-10-30 12:04:05 -04:00
Andrew Bauer
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
Andrew Bauer
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
Isaac Connor
39061038fb
Don't include related models in Storage index
2018-10-29 14:40:05 -04:00
Isaac Connor
34d6ec40a1
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-10-29 12:52:40 -04:00
Isaac Connor
bc4fada34c
Merge branch 'fix_2279_delete_camera_through_api' into storageareas
2018-10-29 12:52:27 -04:00
Isaac Connor
461ce3c1f8
Merge branch 'master' into storageareas
2018-10-29 12:52:06 -04:00
Isaac Connor
6691b5fb52
Include CORS headers when there is a Server defined, instead of requiring there to be more than 1
2018-10-29 12:50:50 -04:00
Isaac Connor
9a2d58adce
We don't store all the permissions in the session anymore. We just use the global user object
2018-10-29 11:03:03 -04:00
Isaac Connor
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
Isaac Connor
33235a19ba
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:11:32 -04:00
Isaac Connor
9e999294df
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:09:32 -04:00
Isaac Connor
91d83a89fa
include semaphore function replacements
2018-10-25 15:40:12 -04:00
Isaac Connor
d025adab6d
Need to load Config Categories in options save
2018-10-25 09:13:07 -04:00
Damir Merdan
d0080684b8
Bosnian translation ( #2266 )
...
* Zoneminder bosnian translation
Hi,
this is a bosnian translation for zoneminder, but it can be used as croatian and serbian translation too
* Delete BA_ba.php
* Bosnian translation
80% translated, tested on my Zoneminder v1.30.4 installation and is looking good. ZmNinja also translated into Bosnian lagnuage.
2018-10-24 13:52:32 -04:00
Isaac Connor
9148d3f7c4
Merge branch 'zone_point_buttons' into storageareas
2018-10-24 12:44:21 -04:00
Isaac Connor
9cf31eafa0
Use a button element instead of an anchor tag for plus and minus point buttons. Cleanup dead code
2018-10-24 12:43:43 -04:00
Isaac Connor
875bc3caf9
Merge branch 'master' into storageareas
2018-10-24 10:17:27 -04:00
Isaac Connor
ca8770bd5a
Merge branch 'fix_rce' into storageareas
2018-10-24 10:17:16 -04:00
Isaac Connor
6488122862
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-24 10:03:11 -04:00
Isaac Connor
115141bf9f
add caching to Group::find
2018-10-24 10:02:42 -04:00
Isaac Connor
2024df4393
use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272
2018-10-24 09:49:56 -04:00
raTmole
18850d8779
API getVersion Fix -> Undefined variable: eTagMatches... ( #2268 )
...
see https://github.com/cakephp/cakephp/issues/12536
2018-10-23 07:58:07 -04:00
Isaac Connor
86b0e4ea18
fix auth_hash. Should use generateAuthHash instead of accessing session directly
2018-10-22 18:32:39 -04:00
Isaac Connor
9938346752
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
2018-10-22 16:14:36 -04:00
Isaac Connor
7b69bc4292
Merge branch 'master' of github.com:/connortechnology/ZoneMinder
2018-10-22 16:13:55 -04:00
Isaac Connor
f4ddc0fe9b
ob_clcean and flush break outputting the image
2018-10-22 16:13:12 -04:00
Isaac Connor
ccd64b0fae
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-22 14:21:34 -04:00
Isaac Connor
7e4c54fec0
Use proper buttons and remove extra bootstrap styles from buttons so that they aren't all jammed together
2018-10-22 13:54:27 -04:00
Isaac Connor
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
Isaac Connor
559f34a838
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:33:09 -04:00
Isaac Connor
069f67a10f
Break some long lines
2018-10-20 14:32:58 -04:00
Isaac Connor
c9c46aa12d
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:32:25 -04:00
Isaac Connor
f5eca2da1e
No longer need to add thisUrl to monitorUrl
2018-10-20 11:37:36 -04:00
Isaac Connor
3237a10d0a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-10-20 11:36:45 -04:00
Isaac Connor
8878397622
fix spacing
2018-10-20 11:36:25 -04:00
Isaac Connor
c47b4a5a04
Merge branch 'improve_config_efficiency' into storageareas
2018-10-19 15:03:00 -04:00
Isaac Connor
530a53f138
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-19 15:02:31 -04:00
Isaac Connor
3723f7acb3
comment out redundatn code increasing load on server
2018-10-19 15:02:10 -04:00
Isaac Connor
4c7fe8741b
Load the complete config info only for options
2018-10-19 15:00:47 -04:00
Isaac Connor
e30b100e8e
Don't load & process categories in initial config loading
2018-10-19 15:00:30 -04:00
Isaac Connor
17a5519dd6
Include the remoteAddr in the session authhash cache, so that a change of ip won't allow the same useless auth hash. ( #2264 )
2018-10-19 13:39:37 -04:00
Isaac Connor
98579fc02a
Merge branch 'master' into storageareas
2018-10-19 11:27:43 -04:00
Isaac Connor
f9b1453705
Include SERVER_PORT when not doing multi-server or multi-port but are running on a port other than 80.
2018-10-19 10:59:16 -04:00
Isaac Connor
23fd5db5c8
fix #2265 extra graphics in url
2018-10-19 10:06:51 -04:00
Isaac Connor
e7ec2faccd
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
2018-10-18 20:33:50 -04:00
Isaac Connor
4fdac25ae1
remove blank last line
2018-10-18 09:20:15 -04:00
Isaac Connor
37a48550e5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-18 08:57:29 -04:00
Isaac Connor
b0078fb1d9
whitespace, get rid of redundant ajax startup
2018-10-16 17:20:10 -04:00
Pliable Pixels
f7de3a87e2
show event notes in same event view ( #2259 )
2018-10-16 12:11:25 -04:00
Isaac Connor
c2af380e29
Merge branch 'master' into storageareas
2018-10-16 11:39:26 -04:00
Isaac Connor
1b9b2811b3
remove ? from streamCmdParms. Mootools adds it in so this gives us a double ?
2018-10-16 11:39:16 -04:00
Isaac Connor
37065d15ac
fix url to api in monitor restart.
2018-10-16 09:47:24 -04:00
Isaac Connor
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
Isaac Connor
d1bef49d0b
Don't reload on a timeout when refreshing the navbar
2018-10-11 11:30:30 -04:00
Pliable Pixels
a76e33bd48
rough in for alarmed frame retrieval ( #2248 )
...
* rough in for alarmed frame retrieval
* add sorting
2018-10-11 10:07:56 -04:00
Isaac Connor
f2b38f175d
Update Frame::find_one so that we can specify an ordering for find_one and so that semantics match other objects find methods
2018-10-11 09:14:40 -04:00
Isaac Connor
c4c8a728f2
Handle no controls found more gracefully
2018-10-10 19:04:00 -04:00
Isaac Connor
be78cb1b34
correct falsepi=> false
2018-10-10 16:08:48 -04:00
Isaac Connor
8e053aa04b
Merge branch 'master' into storageareas
2018-10-10 14:51:52 -04:00
Andrew Bauer
4d5b0ca864
Merge pull request #2247 from connortechnology/turn_off_navbar
...
Turn off navbar
2018-10-10 13:21:46 -05:00
Isaac Connor
2881d2af3f
Merge branch 'master' into storageareas
2018-10-10 14:13:27 -04:00
Isaac Connor
bf3e783c42
remove link to zones_overview that I never got around to creating
2018-10-10 14:13:12 -04:00
Isaac Connor
c58f043998
Add a mouseover tooltip saying Toggle Filters on up arrow
2018-10-10 14:12:16 -04:00
Isaac Connor
031c96c71d
Merge branch 'master' into turn_off_navbar
2018-10-10 14:04:29 -04:00
Isaac Connor
a46c9a8a7a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-10 14:03:35 -04:00
Isaac Connor
63a5211789
use url instead of server_url in Monitor object
2018-10-10 14:03:27 -04:00
Isaac Connor
a1ab0855db
if navbar=0 is given in the url, don't output the navbar
2018-10-10 14:02:46 -04:00
Isaac Connor
6ed146b4dd
Use Hostname instead of Url in test for CORS access.
2018-10-10 14:01:36 -04:00
Isaac Connor
48e805c09f
Make header flips perisisent based on cookie
2018-10-10 13:11:27 -04:00
Isaac Connor
229315fc92
Merge branch 'add_archive_filter_to_montagereview' into storageareas
2018-10-09 11:10:27 -04:00
Isaac Connor
ff00f15b58
add missing ;
2018-10-09 11:10:09 -04:00
Isaac Connor
90ea6aa076
remove : from labels on monitor filters. They can be put back in css
2018-10-09 11:09:42 -04:00
Isaac Connor
217d1e44ba
Rough in an archived status filter in montagereview.
2018-10-09 11:06:54 -04:00
Isaac Connor
e268264761
Merge branch 'cleanup_auth' into storageareas
2018-10-09 10:24:32 -04:00
Isaac Connor
1958351a13
Merge branch 'master' into storageareas
2018-10-09 10:24:24 -04:00
Isaac Connor
cbc26e0cec
cleanup trailing whitespace
2018-10-09 10:07:40 -04:00
Isaac Connor
a3d0cb42ea
Move GOOGLE RECAPCHA to includes/auth.php, clean login actions.
2018-10-09 10:05:50 -04:00
Isaac Connor
918d5fd469
move utility functions for doing get/post requests into functions.php from actions.php
2018-10-09 09:39:04 -04:00
Pliable Pixels
4d626dfb4e
allow username&password even if AUTH_HASH is enabled ( #2231 )
2018-10-08 17:28:03 -04:00
Isaac Connor
52b1439d51
fix the lack of /zm/index.php in url in Server->Url() and multiport
2018-10-08 09:55:47 -04:00
Isaac Connor
1eb8e9ed9e
Include PHP_SELF in url to Server. This will assume that all servers in a multi-server setup use the same path
2018-10-08 09:45:03 -04:00
Andrew Bauer
409fd6aa6f
Merge pull request #2232 from connortechnology/fix_2229_getDiskPercent
...
Fix 2229 get disk percent
2018-10-03 18:11:28 -05:00
Isaac Connor
04c06d0893
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-03 11:23:01 -04:00
Isaac Connor
66221e39ab
rough in a StorageController for api
2018-10-03 11:22:51 -04:00
Isaac Connor
12bed9b6ac
Use alternate, working test for relative ZM_DIR_EVENTS. Don't use human output from du when specifying mid to be consistent.
2018-10-03 11:11:33 -04:00
Isaac Connor
03f09bdc48
Use defined CONFIG constants instead of looking up config from db
2018-10-03 10:56:02 -04:00
Dhanika Bulathsinhala
e7790ebeef
Documentation Improvements + Fixes ( #2230 )
...
* get
* get
2018-10-03 10:29:10 -04:00
Isaac Connor
efda26121b
allow login by username&password in request
2018-10-02 16:59:05 -04:00
Isaac Connor
015890a509
Merge branch 'master' into storageareas
2018-10-02 15:27:12 -04:00
Isaac Connor
c9423aa902
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-01 10:40:20 -04:00
Isaac Connor
592f55a550
do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out.
2018-10-01 10:39:00 -04:00
Andrew Bauer
1978882825
dim x264 encode when on arm ( #2227 )
2018-10-01 09:17:22 -04:00
Isaac Connor
613d885930
!= E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than !=
2018-09-30 10:15:04 -04:00
Isaac Connor
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
Isaac Connor
c88dc690a6
Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order.
2018-09-28 13:24:50 -04:00
Isaac Connor
c481fc868f
be more robust when curFrames is empty.
2018-09-28 11:25:19 -04:00
Andrew Bauer
4b97fc9480
Merge pull request #2221 from pliablepixels/font-license
...
added license
2018-09-27 16:45:34 -05:00
Isaac Connor
da6a142d12
Merge branch 'master' into storageareas
2018-09-27 14:21:43 -04:00
Isaac Connor
c5c01d56be
fix unsetting fixed width/height/layout. Since they are actually controlled by cookies, the session will overwrite when we try to unset the cookie. Also fix some missing ;'s
2018-09-27 14:20:41 -04:00
Isaac Connor
e0dc8a5f6b
Merge branch 'master' into storageareas
2018-09-27 13:54:53 -04:00
Isaac Connor
7ffb46302f
When events have the same starttime, sort secondly by Id
2018-09-26 14:10:49 -04:00
Isaac Connor
2399615a0a
When events have the same starttime, sort secondly by Id
2018-09-26 14:10:21 -04:00
Pliable Pixels
d1f93d752b
wrap again
2018-09-26 10:10:07 -04:00
Pliable Pixels
e27bd11f79
wrap
2018-09-26 10:08:08 -04:00
Pliable Pixels
8afb3d8650
formatting
2018-09-26 10:05:54 -04:00
Pliable Pixels
f1db5446d1
added license
2018-09-26 10:02:39 -04:00
Isaac Connor
438b582d35
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 16:11:19 -04:00
Isaac Connor
700b3c33a0
fix command line when using .zip
2018-09-25 16:09:50 -04:00
Isaac Connor
53f4276cb7
add thumbnails and an mp4 download in the events list
2018-09-25 16:00:01 -04:00
Isaac Connor
6aaa0fe39f
Merge branch 'add_export_to_filter' of github.com:/connortechnology/ZoneMinder into add_export_to_filter
2018-09-25 14:57:13 -04:00
Isaac Connor
01f1ffb591
Merge branch 'master' into add_export_to_filter
2018-09-25 14:54:06 -04:00
Isaac Connor
5615bfec40
some buttons need to be submit buttons. Correct Reset button and remove extra space in Delete button value
2018-09-25 14:47:23 -04:00
Isaac Connor
9c437b0303
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 14:35:19 -04:00
Isaac Connor
8f6db1c279
Merge branch 'master' into storageareas
2018-09-25 13:54:44 -04:00
Isaac Connor
bf9ff8461c
Add WebSite to the Monitor type enumeration
2018-09-24 13:20:19 -04:00
Isaac Connor
772c74243c
Merge branch 'master' into storageareas
2018-09-23 12:25:17 -04:00
Isaac Connor
c8c533ca2f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-23 10:51:56 -04:00
Isaac Connor
c5b23807a4
put back overlay.js for log view.
2018-09-23 10:51:46 -04:00
Andrew Bauer
b8a2e71bb6
use base64_encode for monitor probe
...
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
2018-09-21 12:00:03 -05:00
Isaac Connor
5dba17e1fc
Merge branch 'master' into storageareas
2018-09-21 10:50:10 -04:00
Andrew Bauer
347c0d2ae4
fix whitespace
2018-09-20 13:41:13 -05:00
Andrew Bauer
ac9129b632
fix corrupted export downloads
2018-09-20 13:36:52 -05:00
Isaac Connor
999e4c6c43
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-20 13:37:46 -04:00
Isaac Connor
90d1d79e9a
Add missing AutoUpload field to Filter
2018-09-20 13:37:36 -04:00
Andy Bauer
f53533e61e
fix populating onvif probe data
2018-09-20 10:30:23 -05:00
Isaac Connor
7fe2749de6
Merge branch 'master' into storageareas
2018-09-20 10:58:36 -04:00
Isaac Connor
ba4878d2b5
fix use of instead of ['limit']
2018-09-20 10:11:55 -04:00
Isaac Connor
503b40cb62
Need to cache the object not the row
2018-09-20 10:07:15 -04:00
Isaac Connor
520d1bb7bf
Merge branch 'master' into storageareas
2018-09-20 09:08:29 -04:00
Isaac Connor
6181e52c47
gracefully handle non-existence of imageFeed
2018-09-20 09:07:28 -04:00
Isaac Connor
c6e953c4a9
if Monitor is not found, return empty Monitor instead of null
2018-09-20 09:02:20 -04:00
Isaac Connor
c4108a2610
Fix missing quotes inc Event::Monitor
2018-09-20 08:59:15 -04:00
Isaac Connor
7abe4c40d5
Merge branch 'fix_2213' into storageareas
2018-09-19 20:02:27 -04:00
Isaac Connor
8a5c989cac
fix warning when editing users after a monitor has been deleted
2018-09-18 08:52:43 -04:00
Isaac Connor
7f98277571
Merge updated Monitor.php that does caching
2018-09-15 09:52:08 -04:00
Isaac Connor
b0c555599c
Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209
2018-09-15 09:42:59 -04:00
Isaac Connor
5dc852132e
Add defaults to Server, getting rid of error log when loading the default non existent storage area
2018-09-15 09:39:40 -04:00
Isaac Connor
246b50be9c
add caching to Server
2018-09-15 09:39:04 -04:00
Isaac Connor
02403c4c30
add caching to Monitor
2018-09-15 09:38:52 -04:00
Isaac Connor
27bc9d0a50
fix $limit should be $options['limit']
2018-09-15 09:38:36 -04:00
Isaac Connor
1db59283e3
use find_one when loading Monitor to take advantage of caching
2018-09-15 09:38:09 -04:00
Isaac Connor
2b66b28689
fix $limit should be $options['limit']
2018-09-15 09:37:44 -04:00
Isaac Connor
fa55cec12c
fix error when scale is auto
2018-09-14 16:57:28 -04:00
Isaac Connor
328b804465
spacing and quotes
2018-09-14 16:20:00 -04:00
Isaac Connor
870300ed93
remove debug line
2018-09-14 16:19:41 -04:00
Isaac Connor
77edb8f74b
Add test for auto scale and don't rescale. Use find_one when loading StorageArea so as to use caching
2018-09-14 16:19:29 -04:00
Isaac Connor
34c7ee32ee
Merge branch 'master' into storageareas
2018-09-14 15:13:57 -04:00
Isaac Connor
f1442eba90
once we have found a match for our origin, break out of loop
2018-09-14 14:56:26 -04:00
Isaac Connor
d9b1d3ec11
fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port
2018-09-14 14:52:33 -04:00
Isaac Connor
b5b71edbf6
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
2018-09-14 14:26:45 -04:00
Isaac Connor
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
Isaac Connor
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
Andrew Bauer
b3565fb983
remove file that should not be there
2018-09-12 07:02:57 -05:00
Andrew Bauer
c66dd25ebb
implement collapsible headers ( #2203 )
2018-09-11 17:39:40 -04:00
Isaac Connor
eef928a742
fix find_all => find
2018-09-11 14:31:03 -04:00
Isaac Connor
684f48979a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-11 14:30:19 -04:00
Isaac Connor
6fcf65459f
show video tag version if codec set to auto and DefaultVIdeo exists
2018-09-11 08:43:42 -04:00
Isaac Connor
8608fc97be
fix trms=>terms
2018-09-10 15:11:57 -04:00
Isaac Connor
0ee261fae3
get rid of code that hid the close/back button on events if there was no history.
2018-09-10 15:11:41 -04:00
Isaac Connor
93bec93d4a
Fix DefaultCodec in monitor
2018-09-10 15:09:27 -04:00
Isaac Connor
884ba078c7
Store codec in session for monitor
2018-09-10 15:09:08 -04:00
Isaac Connor
03f769eacc
Rough in codec specification for Events
2018-09-10 12:22:55 -04:00
Isaac Connor
978e332e3a
Merge branch 'master' into storageareas
2018-09-09 16:36:31 -04:00
Isaac Connor
534aebb21f
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
2018-09-09 16:36:09 -04:00
Isaac Connor
5eec7e00c5
Merge branch 'master' into storageareas
2018-09-09 14:09:52 -04:00
Isaac Connor
55dcb161ae
find should always return an array
2018-09-09 13:59:10 -04:00
Isaac Connor
b4f80fbe11
Always return an array from find
2018-09-09 13:56:29 -04:00
Isaac Connor
b8f6617db3
fix another instance of find_all
2018-09-09 12:15:06 -04:00
Isaac Connor
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
Isaac Connor
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
Isaac Connor
40292f3dad
Add Compression flag
2018-09-07 09:08:33 -04:00
Isaac Connor
e21a7a769b
add ExportCompress
2018-09-05 11:13:32 -04:00
Isaac Connor
d5cab088d6
Merge branch 'master' into add_export_to_filter
2018-09-05 10:33:10 -04:00
Isaac Connor
c9b4f14171
fix deleting events
2018-09-04 09:57:32 -04:00
Isaac Connor
8245d193e2
Merge branch 'master' into storageareas
2018-09-04 09:48:47 -04:00
Isaac Connor
f4c2d8adea
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-03 12:29:09 -04:00
Andrew Bauer
e5a2581dcc
optionhelp - support links markdown style ( #2198 )
2018-09-03 09:56:52 -04:00
Isaac Connor
14b5fc3660
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-31 18:43:29 -04:00
Isaac Connor
2858564155
Merge branch 'master' into storageareas
2018-08-31 16:06:13 -04:00
Isaac Connor
9ec415b30a
Just reload the event view instead of dynamically updating the stream. Fixes #2196
2018-08-31 15:56:21 -04:00
Isaac Connor
798aab84f3
whitespace changes
2018-08-31 11:58:33 -04:00
Isaac Connor
623d31edae
Don't do csrf for view=image
2018-08-31 11:58:17 -04:00
Isaac Connor
7ee80e7cca
Debug lines should be debug, not warning
2018-08-31 11:58:03 -04:00
Isaac Connor
57d5e28870
clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output
2018-08-31 11:57:47 -04:00
Isaac Connor
0823b28712
whitespace changes. Make Privacy test an else so that PRIVACY checks don't happen if not logged in
2018-08-31 10:37:11 -04:00
Isaac Connor
4b30ea7877
cleanup, whitespace
2018-08-31 10:35:23 -04:00
Isaac Connor
799b34eee8
handle xhr errors like when auth is no longer valid. Do a page refresh when this happens
2018-08-31 10:34:54 -04:00
Isaac Connor
b1fe80a0bd
Add JSON/MaybeXS to dependencies, replacing JSON/Any
2018-08-30 18:30:33 -04:00
Isaac Connor
df3da6dd93
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-08-30 14:53:39 -04:00
Isaac Connor
4e32089a48
Merge branch 'master' into storageareas
2018-08-30 14:51:27 -04:00
Andrew Bauer
8f0fb0843a
Add Privacy Statement ( #2194 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* create and load default.php
* fix typos
* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
Isaac Connor
b7c86ef3d4
remove escapes that mess up the quoting
2018-08-30 12:26:18 -04:00
Isaac Connor
d3e089e3ce
remove an escape that messed up the quoting
2018-08-30 11:18:48 -04:00
Isaac Connor
f2d4739838
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-24 17:11:39 -04:00
Isaac Connor
4be2a0501c
Merge branch 'master' into storageareas
2018-08-22 17:22:54 -04:00
Isaac Connor
21d193294f
Log errors shouldn't be fatal
2018-08-22 17:22:40 -04:00
Isaac Connor
6e5472d305
Merge branch 'master' into server_path_prefix
2018-08-22 12:57:16 -04:00
Isaac Connor
24f8d63b69
comment out a debug line
2018-08-20 11:13:38 -04:00
Isaac Connor
871e3807e6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-17 12:57:27 -04:00
Isaac Connor
40cd27e68a
when refreshing because ajax failed, reload the current view, not just index.php
2018-08-15 17:21:54 -04:00
Isaac Connor
d768f5f7fc
Merge branch 'master' into storageareas
2018-08-13 15:35:55 -04:00
Isaac Connor
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
.
2018-08-13 15:33:43 -04:00
Isaac Connor
026390ccd8
Merge branch 'master' into storageareas
2018-08-13 15:26:29 -04:00