Isaac Connor
|
c1a9b6bc61
|
Fix for undefined currnetFloorplanId
|
2023-11-28 19:18:46 -05:00 |
|
Isaac Connor
|
7563292416
|
reorg to use ZM infrastructure
|
2023-11-28 19:09:30 -05:00 |
Jonathan Bennett
|
77ff85ad6f
|
Adds Floorplan viewing page
|
2023-11-23 14:03:53 -06:00 |
|
Isaac Connor
|
e2bf8e4fba
|
Add the find command to populate Floorplans, rename Floorplan model to singular
|
2023-11-23 13:26:48 -05:00 |
|
Isaac Connor
|
ba0665856d
|
Model is singular
|
2023-11-23 13:19:00 -05:00 |
|
Isaac Connor
|
0a2d1896a5
|
FloorPlanID is unsigned
|
2023-11-23 13:16:34 -05:00 |
|
Isaac Connor
|
403ac81486
|
FloorPlanID is unsigned and fix syntax for adding foreign key
|
2023-11-23 13:16:24 -05:00 |
|
Isaac Connor
|
ef1f2c3d6d
|
Fix typos
|
2023-11-23 13:10:57 -05:00 |
|
Isaac Connor
|
535194116b
|
Merge branch 'floorplan' of github.com:ZoneMinder/zoneminder into floorplan
|
2023-11-23 13:01:55 -05:00 |
|
Isaac Connor
|
2fb0e40503
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-11-23 13:00:51 -05:00 |
|
Isaac Connor
|
164ec3667e
|
Fix eslint
|
2023-11-23 13:00:44 -05:00 |
|
Isaac Connor
|
b08c44172a
|
Add back a little padding to mfbpanel in montage
|
2023-11-23 13:00:30 -05:00 |
|
Isaac Connor
|
1fa3e18e5c
|
Remove extra padding in headers
|
2023-11-23 13:00:13 -05:00 |
|
Jonathan Bennett
|
95883fc8e8
|
Attempt to add floorplans to API
|
2023-11-22 21:24:02 -06:00 |
|
Jonathan Bennett
|
bf8ccfebba
|
Add Floorplan table to database and place to add entries
|
2023-11-22 21:21:13 -06:00 |
Isaac Connor
|
4957361278
|
Merge pull request #3788 from AmooAti/php8.3
PHP 8.3 deprecated get_class method call without argument
|
2023-11-22 09:01:28 -05:00 |
adhamiamirhossein
|
27977acdd4
|
fix: php 8.3 deprecated get_class method call without argument
|
2023-11-22 10:48:04 +03:30 |
|
Isaac Connor
|
07d4fb2099
|
Set default delay, add starting statusCmdTimer when using rtsp2web
|
2023-11-21 11:35:04 -05:00 |
|
Isaac Connor
|
23a0e561eb
|
Remove depth of nested if's by returning early.
|
2023-11-21 10:49:09 -05:00 |
|
Isaac Connor
|
edfaaf71ce
|
Convert username and password to std::string. Fix crash in zmu because we can't convert null to std::string.
|
2023-11-21 10:49:09 -05:00 |
|
Isaac Connor
|
001787d194
|
Merge pull request #3787 from d-bum/issue_3786_fix_audio_in_ctx_leak
Prevent allocation on already allocated context, fix #3786
|
2023-11-21 09:49:01 -05:00 |
d-bum
|
c4a5413e47
|
Prevent allocation on already allocated context
|
2023-11-21 13:57:29 +01:00 |
|
Isaac Connor
|
092f8df115
|
Handle scale=0 in getImageSrc
|
2023-11-20 17:23:51 -05:00 |
|
Isaac Connor
|
5be0ce5704
|
Fix eslint
|
2023-11-20 14:34:03 -05:00 |
|
Isaac Connor
|
e1b17590fa
|
Handle Config table not being updated for ZM_WEB_VIEWING_TIMEOUT
|
2023-11-20 14:29:25 -05:00 |
|
Isaac Connor
|
9a271e8960
|
Add are you still watching modal
|
2023-11-20 14:23:57 -05:00 |
|
Isaac Connor
|
5fd00ef7a5
|
Use a modal instead of confirm for are you still watching popup
|
2023-11-20 14:23:45 -05:00 |
|
Isaac Connor
|
1df3dc4c8c
|
Return the added modal
|
2023-11-20 14:23:24 -05:00 |
|
Isaac Connor
|
2c776523e9
|
Fix eslint
|
2023-11-20 14:04:03 -05:00 |
|
Isaac Connor
|
195a353bda
|
Add Viewing idle timeout code to watch.js and montage.js
|
2023-11-20 13:42:19 -05:00 |
|
Isaac Connor
|
d3cb7774b0
|
Add ZM_WEB_VIEWING_TIMEOUT, and remove quotes around config integer values so that they are integers instead of strings.
|
2023-11-20 13:38:22 -05:00 |
|
Isaac Connor
|
3ce96005af
|
Load Type when loading Config
|
2023-11-20 13:26:28 -05:00 |
|
Isaac Connor
|
c7bd2adb11
|
add ZM_WEB_VIEWING_TIMEOUT
|
2023-11-20 13:25:53 -05:00 |
|
Isaac Connor
|
3627a4e97d
|
Add ZM_WEB_VIEWING_TIMEOUT config setting for each bw profile.
|
2023-11-20 13:25:26 -05:00 |
|
Isaac Connor
|
d06264624a
|
Refresh events list when filters at top change or close in the case of datetimepicker
|
2023-11-17 12:06:03 -05:00 |
|
Isaac Connor
|
936cefb41a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-11-17 09:33:22 -05:00 |
|
Isaac Connor
|
56095bec9d
|
Must use MIN_STREAMING_PORT in monitor Url because 80/443 might not go to the same host as MIN_STREAMING_PORT (think reverse proxy)
|
2023-11-17 09:33:17 -05:00 |
|
Isaac Connor
|
6232cfb8b1
|
Remove 100 limit on response to events index. Handle there not being a next or prev neighbour.
|
2023-11-16 18:00:30 -05:00 |
|
Isaac Connor
|
d62779b1e8
|
Include command that failed in Error.
|
2023-11-16 13:06:52 -05:00 |
|
Isaac Connor
|
939db57fa9
|
When command fails, log at Warning instead of Debug.
|
2023-11-16 13:06:29 -05:00 |
|
Isaac Connor
|
0d6df970d3
|
Enforce max length of 64k for log entries. Use HTTP_X_FORWARDED_FOR in logging so we log actual remote addr
|
2023-11-16 10:34:44 -05:00 |
|
Isaac Connor
|
afb594aa19
|
Don't load Servers, they are loaded globally in config. Enforce int instead of string for range because fseek can't handle strings
|
2023-11-16 10:34:44 -05:00 |
|
Isaac Connor
|
a1693c34b9
|
Add HTTP_FRONT_END_HTTPS as a signal to use https in urls. Mainly for when using a reverse proxy
|
2023-11-16 10:34:44 -05:00 |
|
Isaac Connor
|
ee0ef4b6e4
|
Handle when there are no cueFrames populated
|
2023-11-16 10:34:43 -05:00 |
|
Isaac Connor
|
d9ae4f8e04
|
Do not need to make servers global in this context. They are by default.|
|
2023-11-16 10:34:43 -05:00 |
|
Isaac Connor
|
40975184e0
|
Return the found term instead of true in has_term.
|
2023-11-16 10:34:43 -05:00 |
|
Isaac Connor
|
8e0793f5e7
|
Do not format StartDateTime and EndDateTime in ajax events results. Do the formatting in js.
|
2023-11-16 10:34:43 -05:00 |
|
Isaac Connor
|
c23ee28fe6
|
Take expires setting off setCookie so it defaults to 2038 like everywhere else.
|
2023-11-15 11:34:05 -05:00 |
|
Isaac Connor
|
a243263d70
|
Merge pull request #3785 from efranzwa/fix-monitor-tabs
Fix Monitor Source Tab Rendering
|
2023-11-15 09:28:03 -05:00 |
efranzwa
|
cf906e86c8
|
Added missing table tags
|
2023-11-15 04:55:18 -08:00 |