Isaac Connor
|
2441ae2924
|
Improve event export a little bit. Add links to eventFrames and eventDetail html.
|
2020-04-03 15:34:20 -04:00 |
Isaac Connor
|
5d72e3b1b5
|
ensure no output buffering when downloading an archive.
|
2020-04-03 15:33:28 -04:00 |
Isaac Connor
|
4547332fad
|
Move more styles into export.css. Remove content from dark/export.css and classic/export.css as it is duplicated.
|
2020-04-03 15:32:22 -04:00 |
Isaac Connor
|
4e58a38317
|
use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json.
|
2020-04-03 15:21:31 -04:00 |
Isaac Connor
|
ef9fbac90c
|
Add Noscript warnings. Whitespace, improve some logic
|
2020-04-02 18:14:14 -04:00 |
Isaac Connor
|
1cc60f0857
|
fix action on cycle play button
|
2020-04-02 16:06:27 -04:00 |
Isaac Connor
|
87069b99b6
|
Fix inline-script errors on groups page referenced in #2890
|
2020-04-02 14:13:28 -04:00 |
Isaac Connor
|
3bfcd8eb33
|
Check for definition of ZM_TIMEZONE before using it. Fixes #2895
|
2020-04-02 14:00:36 -04:00 |
Isaac Connor
|
a555e09cad
|
Bump version to 1.34.8. Please note that the lack of zm-update-1.34.8.sql is intentional. It is not needed as there are no db updates
|
2020-03-27 13:15:11 -04:00 |
Isaac Connor
|
50700031b1
|
Use zm_session_start instead of session_start
|
2020-03-27 13:05:12 -04:00 |
Isaac Connor
|
1ab294e291
|
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
|
2020-03-27 12:43:21 -04:00 |
Isaac Connor
|
17fbafd7de
|
including the language files must come after auth in order to user the user's language setting
|
2020-03-27 11:41:04 -04:00 |
Isaac Connor
|
c880793fdc
|
bump version to 1.34.7
|
2020-03-26 15:34:36 -04:00 |
Isaac Connor
|
b63ec0abd7
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-03-26 15:11:56 -04:00 |
Isaac Connor
|
3e55795cad
|
Handle different command line syntax for zmcontrol.pl
|
2020-03-26 13:57:43 -04:00 |
Isaac Connor
|
b354641df3
|
fix syntax errors in triggers in monitor view
|
2020-03-26 13:57:19 -04:00 |
Isaac Connor
|
af36cc3e52
|
Fix starting and stopping zmcontrol processes across servers.
|
2020-03-26 13:57:00 -04:00 |
Isaac Connor
|
45299955a1
|
Fix SLOW FWD not working
|
2020-03-26 12:21:42 -04:00 |
Pliable Pixels
|
cf6b24b432
|
add ES status to telemetry and --show option to display what is being sent to ZM
|
2020-03-26 12:11:00 -04:00 |
hax0kartik
|
eed45ae66c
|
Fix 2892
|
2020-03-26 12:08:44 -04:00 |
Isaac Connor
|
ea7bea4c6e
|
fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int.
|
2020-03-26 12:08:21 -04:00 |
Isaac Connor
|
a5ec89ab1b
|
use bool instead of my_bool to fix #2886
|
2020-03-26 12:07:58 -04:00 |
Isaac Connor
|
188b8a7f2d
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-03-24 14:57:00 -04:00 |
Isaac Connor
|
0b5ebbbe59
|
add focal to ubuntu builds
|
2020-03-24 14:56:25 -04:00 |
Isaac Connor
|
d3df0defc9
|
Support missing openssl_random_pseudo_bytes by using alternate functions
|
2020-03-21 15:28:18 -04:00 |
Isaac Connor
|
ecaaae90f3
|
fix streamImg loading when using applet. Also don't alter actParms as it is not a global.
|
2020-03-20 11:06:01 -04:00 |
Isaac Connor
|
59bd658a96
|
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
|
2020-03-10 18:46:20 -04:00 |
Isaac Connor
|
84d719f2dd
|
Merge branch 'release-1.34' into rate_dropdown
|
2020-03-10 16:06:11 -04:00 |
Isaac Connor
|
5fe1452a1a
|
Merge pull request #2879 from pliablepixels/1.34-dev
return frame IDs of snapshot and alarm frames for a specific e…
|
2020-03-09 14:44:41 -04:00 |
Isaac Connor
|
e8553babfa
|
remove extra spaces, fix eslint
|
2020-03-09 14:43:54 -04:00 |
Isaac Connor
|
ffed88454f
|
Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877
|
2020-03-09 13:14:09 -04:00 |
Pliable Pixels
|
a261efe0a7
|
return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0
|
2020-03-09 12:04:40 -04:00 |
Pliable Pixels
|
3611d147e6
|
fix score frameID to return ID not Score
|
2020-03-09 11:25:07 -04:00 |
Pliable Pixels
|
c5e838fa33
|
return global frame IDs of snapshot and alarm frames for a specific event
|
2020-03-09 11:09:20 -04:00 |
Isaac Connor
|
e56976c800
|
Triggers cannot be null, it is '' instead
|
2020-03-08 17:23:48 -04:00 |
Isaac Connor
|
bb72e3000c
|
Merge pull request #2867 from veprbl/pr/cmake_install_full
cmake: use CMAKE_INSTALL_FULL_
|
2020-03-06 15:05:50 -05:00 |
Isaac Connor
|
6d787fd77e
|
Bump version for 1.34.6
|
2020-03-06 14:52:38 -05:00 |
Isaac Connor
|
3a129a8818
|
Merge pull request #2874 from hax0kartik/2810-libjwt
Add libjwt and remove gnutls-openssl wrapper
|
2020-03-06 14:48:45 -05:00 |
Isaac Connor
|
af2b6c435e
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-03-04 14:18:59 -05:00 |
Isaac Connor
|
424677165f
|
Use ppa:iconnor/zoneminder-master instead of ppa:iconnor/zoneminder
|
2020-03-04 14:18:50 -05:00 |
Isaac Connor
|
24f04b8551
|
Merge pull request #2871 from pliablepixels/1.34-dev
move the recommended install method before what is discouraged
|
2020-03-04 11:59:02 -05:00 |
Pliable Pixels
|
4f8745809a
|
move the recommended install method before what is discouraged
|
2020-03-04 11:42:55 -05:00 |
Isaac Connor
|
53f262a4cb
|
Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
|
2020-03-04 11:31:16 -05:00 |
Isaac Connor
|
bd59ae8856
|
Move the Basic Auth login code from skin.php to includes/auth.php
|
2020-03-02 15:00:31 -05:00 |
Isaac Connor
|
e3e9fd2bc1
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-03-02 12:08:32 -05:00 |
Isaac Connor
|
7c21f065bd
|
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
|
2020-03-02 12:07:11 -05:00 |
Isaac Connor
|
76131d1887
|
Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style.
|
2020-03-01 11:07:31 -05:00 |
Isaac Connor
|
04b78ac7e6
|
typo and punctuation fixes.
|
2020-02-27 17:56:56 -05:00 |
Isaac Connor
|
bab0b2e830
|
handle a scale value of auto
|
2020-02-27 11:35:40 -05:00 |
Isaac Connor
|
52cb2441f0
|
Bump version to 1.34.5 for release
|
2020-02-25 20:46:59 -05:00 |