Isaac Connor
|
9b713a489d
|
fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing.
handle infinite fps
|
2019-03-06 14:50:36 -05:00 |
|
Isaac Connor
|
6c8eac1ac8
|
Merge branch 'storageareas' into h265
|
2019-03-06 11:10:01 -05:00 |
|
Isaac Connor
|
abfb5642c8
|
cleanup and document updateFrameRate
|
2019-03-06 09:46:28 -05:00 |
|
Isaac Connor
|
24665264a2
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2019-03-05 20:16:05 -05:00 |
Isaac Connor
|
fa124eb29a
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-03-05 14:35:15 -05:00 |
|
Isaac Connor
|
f0f2b6a17c
|
implement click_automove and submitToMontrageReview for onclick handlers
|
2019-03-05 14:35:02 -05:00 |
|
Isaac Connor
|
5a66969fd1
|
change buttons from inputs to buttons. Add submit to montagereview. get rid of onclick handlers
|
2019-03-05 14:34:34 -05:00 |
|
Isaac Connor
|
7b7a58b2f1
|
remove old xhtml-isms
|
2019-03-05 14:33:03 -05:00 |
|
Isaac Connor
|
0022dbfb76
|
add a newline to improve readability
|
2019-03-05 14:31:39 -05:00 |
|
Isaac Connor
|
e59eb510e3
|
update and fix the donate popup
|
2019-03-05 13:10:04 -05:00 |
|
Isaac Connor
|
73ae3f49ed
|
Merge branch 'master' into storageareas
|
2019-03-05 11:35:55 -05:00 |
|
Isaac Connor
|
b1838de701
|
test turning off frag_custom
|
2019-03-05 11:35:16 -05:00 |
|
Isaac Connor
|
991727a728
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-03-05 11:03:10 -05:00 |
|
Isaac Connor
|
36b00d09e3
|
fix destination view on the monitors view
|
2019-03-05 11:02:58 -05:00 |
|
Isaac Connor
|
7779edb485
|
Fix saving multiple monitors at once by moving the relevant code to includes/actions/monitors.php
|
2019-03-05 11:02:37 -05:00 |
|
Isaac Connor
|
8053f61a08
|
fix eslint missing {}
|
2019-03-05 11:02:09 -05:00 |
|
Isaac Connor
|
76ee31bf68
|
fix eslint missing {}
|
2019-03-05 11:01:58 -05:00 |
|
Isaac Connor
|
49a1954f96
|
fix typo and remove deprecated DefaultView
|
2019-03-05 11:01:39 -05:00 |
|
Isaac Connor
|
8b29c5f54c
|
Fix typo: Ineterval to Interval
|
2019-03-05 10:58:23 -05:00 |
|
Isaac Connor
|
f446e73ff7
|
Typo: AnalysisUpdateDelete to AnalysisUpdateDelay
|
2019-03-05 10:55:27 -05:00 |
rpdrewes
|
0bf001be3c
|
Fix for file and curl camera sources (#2545)
|
2019-03-05 09:59:36 -05:00 |
|
Isaac Connor
|
778707c8df
|
Merge branch 'master' into storageareas
|
2019-03-04 14:33:28 -05:00 |
|
Isaac Connor
|
7cee8356bd
|
Fix setting frame width when changing from fixed width to scaled
|
2019-03-04 13:43:03 -05:00 |
|
Isaac Connor
|
96e29c0299
|
fix up remaining issues with cycle updates
|
2019-03-04 13:35:40 -05:00 |
|
Isaac Connor
|
903f5af1ef
|
invalid parameters should be a debug not a warning
|
2019-03-04 13:35:36 -05:00 |
|
Isaac Connor
|
e9a6eee2bb
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2019-03-01 17:47:50 -05:00 |
|
Isaac Connor
|
190142b24c
|
Merge branch 'master' into storageareas
|
2019-03-01 17:47:07 -05:00 |
|
Isaac Connor
|
ff8c5c5db8
|
remove debug
|
2019-03-01 17:28:00 -05:00 |
|
Isaac Connor
|
78513e22fd
|
When doing an OPTIONS just do CORS and exit. if xmlHttpRequest don't do a redirect login. Do a failed auth header and quit
|
2019-03-01 17:27:08 -05:00 |
|
Isaac Connor
|
7703661cb1
|
Don't use streaming port in UrlToIndex because xmlHttpRequest won't send cookies to a different port
|
2019-03-01 17:25:17 -05:00 |
|
Isaac Connor
|
520bd4e7a7
|
Add ZM namespace to Logger
|
2019-03-01 14:42:05 -05:00 |
|
Isaac Connor
|
05bc57e245
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2019-03-01 14:27:30 -05:00 |
|
Isaac Connor
|
466c379e94
|
Merge branch 'master' into storageareas
|
2019-03-01 14:03:49 -05:00 |
|
Isaac Connor
|
675b4975b0
|
Fix control presets
|
2019-03-01 13:37:34 -05:00 |
Isaac Connor
|
016fda22ce
|
reduce duplicated db code from Config. Use fully namespace'd variables so we can use require instead of use
|
2019-03-01 12:31:41 -05:00 |
|
Isaac Connor
|
1828ea2d6f
|
small cleanup of zmstats
|
2019-03-01 10:26:55 -05:00 |
|
Isaac Connor
|
2d75ab50af
|
Implement deleting from Logs based on line count instead of interval
|
2019-02-28 16:12:34 -05:00 |
|
Isaac Connor
|
20fe502ca4
|
Add ZM to ErrorHandler. Spacing and quotes
|
2019-02-27 12:02:40 -05:00 |
|
Isaac Connor
|
2db030265b
|
Merge branch 'master' into storageareas
|
2019-02-27 11:08:04 -05:00 |
|
Isaac Connor
|
a1f1c19c0f
|
fix missing ZM namepsace
|
2019-02-27 11:07:52 -05:00 |
|
Isaac Connor
|
af9c87a112
|
Merge branch 'master' into storageareas
|
2019-02-27 10:53:19 -05:00 |
|
Isaac Connor
|
6e4444099b
|
Only populate session with user info on successful login. Use parameters in sql when loading users in getAuthUser. Fixes #2542
|
2019-02-27 09:57:50 -05:00 |
|
Isaac Connor
|
92ded81e26
|
bump version
|
2019-02-27 09:29:27 -05:00 |
|
Isaac Connor
|
804c384b4c
|
add Event Notification support to server
|
2019-02-27 09:29:11 -05:00 |
|
Isaac Connor
|
a7ca75758b
|
add Event Notification label
|
2019-02-27 09:29:00 -05:00 |
|
Isaac Connor
|
c0ae7820bb
|
add zmeventnotification to Server object
|
2019-02-27 09:28:36 -05:00 |
|
Isaac Connor
|
849442502c
|
add support for server based zmeventnotification
|
2019-02-27 09:28:15 -05:00 |
|
Isaac Connor
|
053289c4a0
|
rename eventserver to eventnotification
|
2019-02-27 09:27:50 -05:00 |
|
Isaac Connor
|
4c35f2910c
|
fix ZM namespace
|
2019-02-26 18:09:18 -05:00 |
|
Isaac Connor
|
df3e11d83c
|
Fix authentication in api because we no longer store the user object in the session
|
2019-02-26 17:01:45 -05:00 |