mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-01 20:55:17 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,717 Commits 80 Branches 104 Tags
0da5403a3cc030d531f22f6d47dcd8575ff51bcc
Commit Graph

8580 Commits

Author SHA1 Message Date
Isaac Connor
4ab58f5f22 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-16 09:58:49 -04:00
Isaac Connor
58fedd8c35 Fix streamQuery => streamCmdQuery. Fixes #3507 2022-06-16 09:58:26 -04:00
Isaac Connor
f4339b0e9e fix eslint 2022-06-15 13:19:53 -04:00
Isaac Connor
17562671c1 fix eslint 2022-06-15 13:18:11 -04:00
Isaac Connor
f728cb15bc fix eslint 2022-06-15 13:17:01 -04:00
Isaac Connor
29d8441227 Fix janus stream not working on zones and zone views 2022-06-15 13:09:27 -04:00
Isaac Connor
4d81e3c7f8 Make video tags 100% as well as img and svg 2022-06-15 13:09:11 -04:00
Isaac Connor
2141a5dd1c Don't include 0 width in janus video tag 2022-06-15 13:08:48 -04:00
Isaac Connor
a5cbe65d70 watchdog is not available everywhere yet. comment out its use 2022-06-15 13:08:38 -04:00
Isaac Connor
cf88497c77 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-15 12:42:07 -04:00
Isaac Connor
5188346086 Institute a status timer to be used when not streaming from zms. 2022-06-15 12:34:55 -04:00
Isaac Connor
9211e72b94 Add AnalysisImage and options to MOnitor view 2022-06-15 11:33:09 -04:00
Isaac Connor
fb92207bb1 Improve map. Invalidate size on location tab so that tiles populate. Update marker position when get Current Location button is clicked. Make marker draggable. 2022-06-15 11:28:54 -04:00
Isaac Connor
c189250a61 Add AnalysisImage and options to MOnitor object 2022-06-15 11:27:48 -04:00
Isaac Connor
3299f5ed49 Handle php versions < 5.6.1 which don't have non-blocking semaphore support 2022-06-13 15:56:52 -04:00
Isaac Connor
a578370970 Add filter terms for snapshots 2022-06-09 12:13:58 -04:00
Isaac Connor
7748612391 Merge branch 'master' into linked_zones 2022-06-08 17:13:43 -04:00
Isaac Connor
0bc64ccebe split up long lines to appease debbuild 2022-06-08 17:10:23 -04:00
Isaac Connor
866ad4f5e2 Don't turn '0' into '' 2022-06-07 09:44:37 -04:00
Isaac Connor
b14dfea87c Merge pull request #3502 from iasmanis/master 
Update config.php.in
 2022-06-07 09:40:46 -04:00
Ingemārs
af2f1cc6e6 Update config.php.in 2022-06-07 12:33:41 +03:00
Nic Boet
f6fdcc2953 Fix semaphore_tries on systems without System V 
This appears to be impacting systems without php System V semaphore support
have_semaphore is not a boolean

Signed-off-by: Nic Boet <nic@boet.cc>
 2022-06-06 22:51:34 -05:00
Isaac Connor
a1e0540e6c Merge branch 'master' into linked_zones 2022-06-06 13:53:42 -04:00
Isaac Connor
3de700d888 Don't turn '0' into '' 2022-06-06 13:53:33 -04:00
Isaac Connor
d99830371a Include Zone.php and fix notation 2022-06-06 13:49:43 -04:00
Isaac Connor
4fcee995d3 Merge branch 'master' into linked_zones 2022-06-06 13:24:37 -04:00
Isaac Connor
baebdb277e Only return error messages, not a bunch of empty arrays 2022-06-06 13:09:41 -04:00
Isaac Connor
5068cf5e62 Add a progress ticker, and delete events in chunks of 10. Fixes #3444 2022-06-06 13:09:41 -04:00
Isaac Connor
1e6f5c7987 Fix eslint 2022-06-06 13:09:41 -04:00
Isaac Connor
fa4c9a37db Add Zones to LinkedMonitors list 2022-06-06 13:06:54 -04:00
Isaac Connor
d877a32500 Only include config if logged in or auth turned off. Login view doesn't require any config. 2022-06-05 11:50:56 -04:00
Isaac Connor
ba2b18f8a9 Fix eslint 2022-06-03 15:00:23 -04:00
Isaac Connor
d45f6bb7f6 fix formatter->format 2022-06-03 14:25:19 -04:00
Isaac Connor
d135be17ba Must pass time() to format() 2022-06-03 14:25:19 -04:00
Isaac Connor
7874825064 put back including config.php 2022-06-03 10:09:36 -04:00
Isaac Connor
4a6ad1f880 move dateFormatters to config. This is so that they get setup even if not using index.php. Like cakephp for example. 2022-06-02 20:13:37 -04:00
Isaac Connor
beec86fda2 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-02 20:09:33 -04:00
Isaac Connor
a480366232 Don't trim select values. In monitor selects are all well defined. Fixes not being able to multi-select groups or linked monitors 2022-06-02 16:33:32 -04:00
Isaac Connor
cce403419b use a global mode variable to determine if we are editing and disable clicking on image. disabling the onclick doesn't seem to be working. When activating edit mode and saving positions use #monitor instead of #monitorFrame which went away. 2022-06-02 15:12:09 -04:00
Isaac Connor
edfaffb88f Only set onclick if a new function is given 2022-06-02 15:11:59 -04:00
Isaac Connor
73977c518d use zm_setcookie function with will set required cookie fields so that cookie actually gets set 2022-06-02 15:11:47 -04:00
Isaac Connor
2883a78e5c Fix eslint 2022-06-02 09:22:02 -04:00
Isaac Connor
b9e16f4885 Handle ctrl-click for opening in a new window 2022-06-01 16:31:11 -04:00
Isaac Connor
dd3ee2247d Include connKey is debug line 2022-06-01 16:31:11 -04:00
Isaac Connor
52f6be7319 get rid of warning when not Connected. zms can provide that message now. 2022-06-01 16:31:11 -04:00
Isaac Connor
9582ea92dd Remove debug 2022-06-01 16:31:11 -04:00
Isaac Connor
efe2f0b0a1 Add overriding timeFormatter pattern 2022-06-01 16:20:36 -04:00
Isaac Connor
cde59e9f79 convert from strftime to date 2022-06-01 16:18:04 -04:00
Isaac Connor
038e38eb13 convert from strftime to date 2022-06-01 16:17:57 -04:00
Isaac Connor
49a744da17 replace strftime, but also fix the fact that we weren't passing a format string 2022-06-01 16:17:40 -04:00