Isaac Connor
|
37cc323078
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-06-10 12:58:18 -04:00 |
|
Isaac Connor
|
ebc9a77c9d
|
When saving jpegs, do a db write on the first frame. Fix test for writing frame info to db. Because we increment frames, it is essentially 1-based. So the test needs to be ==1 instead of !
|
2019-06-10 12:57:57 -04:00 |
Isaac Connor
|
2e624522c7
|
fixes #2294 (#2637)
|
2019-06-10 09:43:56 -04:00 |
|
Isaac Connor
|
b9ea9ce0ae
|
Merge branch 'master' into storageareas
|
2019-06-07 14:40:43 -04:00 |
|
Isaac Connor
|
9b507734b2
|
spacing
|
2019-06-06 13:49:24 -04:00 |
|
Isaac Connor
|
a16d29740c
|
Fix final frame of event having same id as the second last
|
2019-06-06 13:49:01 -04:00 |
|
Isaac Connor
|
41714c676d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-06-06 13:40:09 -04:00 |
|
Isaac Connor
|
dfc60baf85
|
fix eslint spacing
|
2019-06-06 13:40:00 -04:00 |
fri.K
|
b254e1e392
|
For column name title field should be taken instead of array name (#2635)
|
2019-06-06 12:58:33 -04:00 |
Isaac Connor
|
4879249d77
|
V4LMultiBuffer has a string value so testing against an integer fails.
|
2019-06-06 12:53:25 -04:00 |
fri.K
|
43d24cda8e
|
Completed Polish translation (#2634)
* Completed Polish translation
* Changing translation to be simillar with other lines
|
2019-06-05 17:07:32 -04:00 |
|
Isaac Connor
|
08cc4e0383
|
add null value to set() function
|
2019-06-05 10:22:20 -04:00 |
|
Isaac Connor
|
4b8a2a94e3
|
reduce frame send time too slow to a warning instead of error
|
2019-06-05 10:12:56 -04:00 |
|
Isaac Connor
|
5346f82de9
|
Fix unable to login when ZM_AUTH_RELAY != hashed and fix setting the password in session when ZM_AUTH_RELAY==plain
|
2019-06-05 09:23:34 -04:00 |
|
Isaac Connor
|
83b00c2cd1
|
Merge branch 'master' into storageareas
|
2019-06-04 16:43:43 -04:00 |
|
Isaac Connor
|
4b9b2015cb
|
write a note why regnerateAuthHash doesn't work when saving config
|
2019-06-04 16:30:57 -04:00 |
|
Isaac Connor
|
cc269378cf
|
regenerate auth_hash in session because we might have changed an auth hash setting
|
2019-06-04 16:27:25 -04:00 |
|
Isaac Connor
|
168aa35461
|
force regeneration of auth_hash on login. Fix failed auth_hash verification not logging you out by returning null instead of false. Update session with new auth_hash when forcing regeneration
|
2019-06-04 16:26:29 -04:00 |
|
Isaac Connor
|
86ad96b788
|
increase height of donate popup to hold all content
|
2019-06-04 12:08:08 -04:00 |
|
Isaac Connor
|
ace56a09d5
|
Merge branch 'master' into storageareas
|
2019-06-04 10:47:50 -04:00 |
|
Isaac Connor
|
7649f5d6b9
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-06-04 10:33:14 -04:00 |
|
Isaac Connor
|
9d6091e271
|
better fix for #2453. Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS
|
2019-06-04 10:32:54 -04:00 |
|
Isaac Connor
|
bc58879c61
|
better fix for #2453. Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS
|
2019-06-04 10:32:29 -04:00 |
Tom Hodder
|
a6f3303859
|
add options help to linked monitors option (#2633)
* add options help to linked monitors option
* fix typo and clarify instructions for new widget
|
2019-06-04 10:05:08 -04:00 |
|
Isaac Connor
|
ecc1c6e272
|
Merge branch 'master' into storageareas
|
2019-06-03 09:47:52 -04:00 |
|
Isaac Connor
|
983da41c7a
|
Reduce log level for filter execution from Info to Debug
|
2019-06-03 09:46:28 -04:00 |
|
Isaac Connor
|
0699b21017
|
Remove libjson-any-perl as a dependency. Fixes #2630
|
2019-06-03 09:45:50 -04:00 |
Gleb Popov
|
1d132b5923
|
When writing MP4 sample, save buffer.size() into a temporary variable before calling buffer.extract(). (#2628)
|
2019-06-01 16:43:29 -04:00 |
|
Isaac Connor
|
7445f5588f
|
show storage when there are 4 areas. Used to only do it for < 4
|
2019-05-31 11:01:09 -04:00 |
|
Isaac Connor
|
aefd735abb
|
quotes
|
2019-05-31 11:00:30 -04:00 |
|
Isaac Connor
|
ac4a7597eb
|
Merge branch 'master' into storageareas
|
2019-05-31 10:36:21 -04:00 |
|
Isaac Connor
|
eaa1939f6b
|
comment out debug lines
|
2019-05-31 10:35:54 -04:00 |
|
Isaac Connor
|
274737d1b1
|
Fix moocord to mocord.
|
2019-05-31 10:35:18 -04:00 |
|
Isaac Connor
|
b0869a0b13
|
spaces and quotes
|
2019-05-31 10:34:53 -04:00 |
|
Isaac Connor
|
75ec4818a6
|
WHen saving a monitor, only start zmc and zma if appropriate
|
2019-05-31 10:15:02 -04:00 |
|
Isaac Connor
|
ba96f0709c
|
fix saving user using password_hash
|
2019-05-30 09:58:54 -04:00 |
|
Isaac Connor
|
f684ba55a7
|
Merge branch 'master' into storageareas
|
2019-05-29 10:36:05 -04:00 |
|
Isaac Connor
|
628760d5b9
|
Spacing and braces cleanup from asker's code
|
2019-05-29 10:29:03 -04:00 |
|
Isaac Connor
|
8e0f828aa1
|
Add APIEnabled to translations
|
2019-05-29 10:28:42 -04:00 |
|
Isaac Connor
|
ee0c21d587
|
Add API Enabled to User edit
|
2019-05-29 10:28:25 -04:00 |
|
Isaac Connor
|
722411475d
|
Fix +/- buttons on new line in filter not having onclick events bound
|
2019-05-29 09:23:56 -04:00 |
|
Isaac Connor
|
21761a35ad
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-05-29 08:40:52 -04:00 |
|
Isaac Connor
|
07d4310466
|
Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path
|
2019-05-29 08:40:48 -04:00 |
|
Isaac Connor
|
c79e9ddff7
|
Merge branch 'master' into storageareas
|
2019-05-28 16:16:46 -04:00 |
Pliable Pixels
|
bc0565858b
|
check for API disabled only when auth is on (#2624)
|
2019-05-28 13:44:06 -04:00 |
|
Isaac Connor
|
2934aa5f69
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-05-28 11:00:36 -04:00 |
|
Isaac Connor
|
df19e98f28
|
Add auto dput when interactive==no
|
2019-05-28 10:59:58 -04:00 |
Kirill Zhuykov
|
a244af49ad
|
fix #2622 (#2623)
|
2019-05-28 10:57:01 -04:00 |
|
Isaac Connor
|
5ade389b63
|
Merge branch 'master' into storageareas
|
2019-05-27 17:16:59 -04:00 |
|
Isaac Connor
|
7b06f58559
|
Limit Connection error logs to every 10 minutes instead of every 10 seconds. Connection attempts still happen at 10 second intervals
|
2019-05-27 17:16:23 -04:00 |