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
|
3d993eef80
|
Fix triggers code
|
2020-03-09 14:39:57 -04:00 |
|
Isaac Connor
|
a0bd602339
|
Use === when testing for empty value and setting defaults
|
2020-03-09 14:39:22 -04:00 |
|
Isaac Connor
|
d055d40bfb
|
Merge branch 'release-1.34'
|
2020-03-09 13:15:16 -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
|
f056f787c5
|
Merge branch 'release-1.34'
|
2020-03-08 17:24:06 -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
|
b482993d33
|
Merge branch 'release-1.34'
|
2020-03-06 15:04:48 -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
|
f0791c8118
|
silence warning when no language is set
|
2020-03-05 22:13:32 -05:00 |
|
Isaac Connor
|
8300b94382
|
bump version to 1.35.1
|
2020-03-05 15:50:02 -05:00 |
|
Isaac Connor
|
4c52df24d3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-03-05 15:48:53 -05:00 |
|
Isaac Connor
|
f003daa791
|
Merge branch 'add_enabled_to_storage'
|
2020-03-05 15:48:43 -05:00 |
|
Isaac Connor
|
835966eb24
|
Merge pull request #2874 from hax0kartik/2810-libjwt
Add libjwt and remove gnutls-openssl wrapper
|
2020-03-05 15:30:27 -05:00 |
|
Isaac Connor
|
d30480e31e
|
add passive to addEventListener
|
2020-03-05 14:10:35 -05:00 |
hax0kartik
|
a53f67cd31
|
Remove a extra file added by mistake
|
2020-03-05 09:53:07 -08:00 |
|
hax0kartik
|
15aec7b109
|
Add libjwt
|
2020-03-05 09:51:33 -08:00 |
|
hax0kartik
|
2091ad8c92
|
Add libjwt and remove gnutls-openssl wrapper
|
2020-03-05 09:29:27 -08: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
|
b78acd7b95
|
google code style
|
2020-03-04 14:14:38 -05:00 |
|
Isaac Connor
|
6d4ed20745
|
Drop lock around openFile so that we don't hang
|
2020-03-04 14:14:28 -05:00 |
|
Isaac Connor
|
2882693791
|
If can't connect to db, bail instead of loading config
|
2020-03-04 14:13:44 -05:00 |
|
Isaac Connor
|
06f480acf8
|
Merge pull request #2872 from ZoneMinder/revert-2844-2810-libjwt
Revert "Add libjwt as a optional library"
|
2020-03-04 13:57:40 -05:00 |
|
Isaac Connor
|
444c6fd372
|
Revert "Add libjwt as a optional library"
|
2020-03-04 13:57:27 -05:00 |
|
Isaac Connor
|
641b191c34
|
Merge pull request #2867 from veprbl/pr/cmake_install_full
cmake: use CMAKE_INSTALL_FULL_
|
2020-03-04 12:00:11 -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 |
|
Isaac Connor
|
5443e6385b
|
Merge pull request #2844 from hax0kartik/2810-libjwt
Add libjwt as a optional library
|
2020-03-04 11:58:27 -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
|
d60e1a783f
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-03-04 11:22:15 -05:00 |
|
Isaac Connor
|
55f63e8e9d
|
Merge branch 'fix_auth_timeouts'
|
2020-03-04 11:22:08 -05:00 |
|
Isaac Connor
|
4dae0c4609
|
Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
|
2020-03-04 11:21:48 -05:00 |
|
Isaac Connor
|
a9e3d0691f
|
quotes, fix status ajax call using old auth_hash
|
2020-03-04 11:17:48 -05:00 |
|
Isaac Connor
|
8eee5cc222
|
Add global array so that we only do it once.
|
2020-03-04 11:03:30 -05:00 |
|
Isaac Connor
|
d24069e3d0
|
Look for global array so we don't load all Servers multiple times. Add all servers to allowed script-src in CSPHeaders
|
2020-03-04 11:03:07 -05:00 |
|
Isaac Connor
|
4c7178b78b
|
fix cpplint complaints and remove casts that are unnecessary. Micro-optimisation by using fputs for date_string instead of fprintf
|
2020-03-04 11:02:21 -05:00 |
|
Pliable Pixels
|
1381cb194e
|
#2866 - fixes incorrect token type comparison
|
2020-03-04 10:50:59 -05:00 |
|
Isaac Connor
|
9f696186a8
|
Increase height of storage popup for Enabled
|
2020-03-04 10:48:02 -05:00 |
|
Isaac Connor
|
ac00ca0ad8
|
Only list enabled Storage Areas
|
2020-03-04 10:46:59 -05:00 |
|
Isaac Connor
|
077b8888f9
|
Use Storage object and add Enabled
|
2020-03-04 10:46:32 -05:00 |
|
Isaac Connor
|
0b267fbdee
|
Add Enabled to Storage
|
2020-03-04 10:46:16 -05:00 |
|
Isaac Connor
|
d59bc4ca6d
|
add Enabled to Storage
|
2020-03-04 10:15:44 -05:00 |
|
Isaac Connor
|
2f48c442cc
|
add Enabled to Storage
|
2020-03-04 10:15:35 -05:00 |