23f1b68e8a
Merge branch 'continuous' into cont_mast
2021-04-16 11:28:10 -04:00
f3ea08c4a1
Merge branch 'continuous' into cont_mast
2021-04-16 11:27:48 -04:00
3d1b0e2724
Apply onmouseup/down to other ptz buttons
2021-04-16 11:27:08 -04:00
d7fa28142f
Use on-mousedown and on-mouseup if doing continuous
2021-04-16 10:15:07 -04:00
f59a72a638
Use Snapshots permission instead of Events permission for Snapshots
2021-04-12 15:59:31 -04:00
80e5076d2a
cache bust jquery and bootstrap
2021-03-31 18:27:43 -04:00
16b33536ed
Turn off second Log in header
2021-03-22 17:49:59 -04:00
9d33688f89
Honour various permissions on what's in the navbar.
2021-03-12 11:40:46 -05:00
6682ec7da5
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
2021-03-12 09:26:23 -05:00
3fb1054093
bstable export requires tableExport plugin
2021-02-18 20:22:19 -06:00
927d11a6a4
Fix tags not allowed under ul
2021-01-29 20:37:34 -05:00
4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
68819a86a0
remove mootools from zoneminder
2021-01-18 07:31:43 -06:00
ef2f126eaa
Merge branch 'master' into zma_to_thread
2021-01-12 14:37:25 -05:00
81acf4bf69
Fix ul nesting. Add navbar-nav to collapsed nav elements to fix spacing.
2021-01-12 14:29:53 -05:00
0a9681636f
rename getAcct to getAccount
2021-01-12 14:20:05 -05:00
cf10ce010c
tableExport plugin is no longer used
2021-01-11 13:46:50 -05:00
aeec7b025d
remove js files that define popupSizes
2021-01-11 13:46:50 -05:00
5c6e093b13
old overlay code is no longer used
2021-01-11 13:46:50 -05:00
ebbd2888f0
tableExport plugin is no longer used
2021-01-04 15:40:53 -06:00
bd18904bf4
remove js files that define popupSizes
2021-01-04 15:33:26 -06:00
51132cb5e1
old overlay code is no longer used
2021-01-04 13:51:03 -06:00
8d52baeee2
Merge branch 'master' into rtsp_server
...
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1. 0 means no error but also no success.
Debugging and braces improvements in local_camera.
2020-12-17 10:16:54 -05:00
191e213337
upgrade to jquery 3.5.1, use minified javascripts
2020-12-14 10:02:43 -06:00
5665eb14f5
fix bw select again
2020-12-03 19:33:10 -06:00
1c10cc492b
Fix StartTime to StartDateTime
2020-12-02 13:15:32 -05:00
aac47ed361
fixes to export functions
2020-12-02 12:02:24 -06:00
b0da7f5920
fix navbar bandwidth dropdown
2020-12-01 10:27:08 -06:00
442fadb585
link bstable locale to zoneminder's
2020-10-17 07:28:14 -05:00
4044d60412
update bstable to 9fa4c82, add bstable locale extenstion
2020-10-17 07:23:26 -05:00
c5cd617204
Load logoutModal on click instead of always
2020-10-16 14:51:47 -04:00
12b75e93b8
Merge branch 'release-1.34'
2020-10-15 17:19:56 -04:00
7bb227283d
Update rates in includes/config.php
2020-10-15 17:15:54 -04:00
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
ed5f6b2625
convert shutdown popup to modal
2020-10-12 12:16:52 -05:00
802e439cb5
convert controlpreset view to a modal
2020-10-02 15:46:28 -05:00
e26e36606f
update version check logic in navbar
2020-10-01 08:46:58 -05:00
58902c70d6
use output_script_if_exists to cache_bust most of the js
2020-09-28 09:49:07 -04:00
a109d7bba0
leaflet can't be cache busted so update output_link_if_exists and output_script_if_exists to take a cache_bust flag
2020-09-24 20:21:38 -04:00
386f991364
Merge branch 'master' into location
2020-09-24 19:28:57 -04:00
cdc07715b7
remove parseFilterToTre and fix filter['query'] to filter['querystring']
2020-09-24 12:12:37 -04:00
9c7bbd4aa7
introduce output_script_if_exists, use it to link leaflet.js if it exists
2020-09-24 09:13:25 -04:00
d2ba9c5234
load bs-table toolbar & autorefresh
2020-09-22 14:23:25 -05:00
c75f5c68c1
unpopup the log view
2020-09-19 12:59:15 -05:00
a3c0e160a2
convert state modal to ajax request
2020-09-19 12:36:04 -05:00
7c1ec4f957
convert logout modal to ajax request
2020-09-19 10:44:05 -05:00
467e75a11c
convert eventdetail function to php file
2020-09-18 11:03:20 -05:00
2757b74957
convert servermodal function to php file
2020-09-18 10:34:33 -05:00
10119dc609
convert storage function to php file
2020-09-18 10:02:02 -05:00
1b2f0514b9
convert delconfirm function to php file
2020-09-18 09:43:29 -05:00
root
Isaac Connor
Andrew Bauer
Andrew Bauer
Isaac Connor