fad919adec
Fix incorrect fix for dealing with bulk frames. prev and next fid should just be +/- 1, so that we show the actual capture frame as opposed to the non-existent db frame record. Fix is by specifying the EventId as well
2019-05-24 14:59:33 -04:00
0c00752ab4
fix nextFid and prevFid when using bulk frames. Disable buttons instead of removing them entirely.
2019-05-24 14:51:08 -04:00
e2d56597bf
Don't use an onlick inline js to show the caution text
2019-05-24 12:40:02 -04:00
2eebdb094c
move chosen setup to initPage
2019-05-24 11:54:14 -04:00
b6747e9b1f
spacing
2019-05-24 11:49:59 -04:00
f9004443cf
Merge branch 'master' into storageareas
2019-05-24 09:37:03 -04:00
2fc7b3cf4d
Don't allow deleting of in-progress recording
2019-05-24 09:31:48 -04:00
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
a4eff3e8e0
fixed html typo
2019-05-17 09:44:22 -04:00
923f798e69
css classess for text that disappear
2019-05-17 09:32:23 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
96f578f1bd
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup. ( #2604 )
2019-05-16 15:37:37 -04:00
1855ee441a
Fix #2609 invalid value horz instead of hori in orientations enumeration
2019-05-15 19:35:19 -04:00
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
74d9f4f1aa
Spelling and grammar fixes in help ( #2603 )
...
* Edit Help array to make it match others below. This should not affect the results
* Misc. grammer and spelling fixes along with removing some duplicated words. This should not affect compilation.
* More grammer and spelling errors
* Replace Javascript with ZoneMinder because it did not make sense there.
* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
adb01c4d0e
added password_compat for PHP >=5.3 <5.5
2019-05-12 13:57:25 -04:00
91dd6630b5
enable API options only if API enabled
2019-05-12 12:34:55 -04:00
c1891e35b9
moved API enable back to system
2019-05-12 12:15:08 -04:00
a9d601e5ae
add ability to revoke tokens and enable/disable APIs per user
2019-05-12 10:56:17 -04:00
88d50ec9ca
added revoke all tokens code, removed test code
2019-05-11 15:47:57 -04:00
2ee466f5e4
display user table in api
2019-05-11 14:08:49 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
e6b7af4583
initial baby step for api tab
2019-05-10 15:11:35 -04:00
1ca5eee53a
spacing
2019-05-06 10:45:40 -04:00
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
a0dbb70af6
filter the form submit on enter to only affect input elements, not textareas
2019-04-26 10:40:11 -04:00
735a996e41
dsiable form submit on enter on the monitor view
2019-04-26 10:26:16 -04:00
8195c4e395
Fixing video export view ( #2585 )
2019-04-20 11:19:27 -04:00
f0af0619e4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-04-12 14:58:24 -04:00
3f3ae748f0
Merge branch 'add_shutdown_capability' into storageareas
2019-04-12 14:58:11 -04:00
160f5c7bd9
Merge branch 'master' into storageareas
2019-04-12 14:57:54 -04:00
d59f058956
basic update of optionhelp view
2019-04-12 14:57:11 -04:00
1a1c2db15f
add the shutdown view and actions
2019-04-12 14:55:56 -04:00
37b7c32465
fix errors when no filter specified
2019-04-09 09:45:28 -04:00
5ad9219609
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-09 09:39:39 -04:00
50dd63c21d
fix eslint
2019-04-08 19:58:18 -05:00
8af96e3c00
fix eslint errors
2019-04-08 18:40:52 -05:00
3abf263e7a
fixup half-merged changes to filter to view in montagereview
2019-04-08 16:57:41 -04:00
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
501324d778
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-04-01 22:09:57 -04:00
d5402e9cba
Correct Storaage Server name in list
2019-04-01 22:09:47 -04:00
e97751558f
eslint fix
2019-03-30 10:41:04 -05:00
90e97ff135
Merge branch 'master' into storageareas
2019-03-28 11:20:29 -04:00
49e3f0a68e
eslint fixes
2019-03-28 09:43:31 -04:00
ee4b452e42
Update monitor edit to not use inline js
2019-03-25 16:25:09 -04:00
052a2ef1fd
fix eventserver => eventnotification
2019-03-25 12:20:21 -04:00
7565e171b4
spacing
2019-03-25 12:18:15 -04:00
7e62ccca3c
Handle div by zero when TotalMem is not known for Server
2019-03-25 12:08:56 -04:00
f311fcc9e0
change to a button
2019-03-22 17:28:23 -04:00
16467595d4
Fix clicking in montage
2019-03-21 17:00:51 -04:00
65fab1b032
add px to width and height of event img
2019-03-21 14:14:45 -04:00
f5dfa0d740
Spacing and fix clone monitor by setting the Id to 0 instead of nextId, so that when we go to save it, we use an insert instead of an update
2019-03-20 15:03:20 -04:00
10a972f2a0
fixes to download video
2019-03-20 14:51:59 -04:00
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
a5366d522d
Fixup exporting
2019-03-20 14:29:05 -04:00
ae7391689b
Add some code doc
2019-03-20 14:28:19 -04:00
52e66adc99
Fix namespace
2019-03-20 14:25:12 -04:00
71cd024fda
spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown
2019-03-19 12:16:31 -04:00
3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
428f7e8e8f
create setup_onclick and disable_onclick in the monitor object. Use it to setup and disable the click event when editing/cancelling layout editing
2019-03-19 10:24:30 -04:00
ad5f6a8729
Camera reboot function ( #2554 )
...
* Adding a button for camera reboot function
This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.
* Adding reboot function option to contorl configuration
This patch adds a reboot option to the camera control configuration
view.
* Adding Reboot field to Controls table
This patch adds a Reboot field to the Controls table to support
a camera reboot control option.
* Correcting button value to match reset
* Updating language files
I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.
* Add missing forward slash
2019-03-18 14:49:05 -04:00
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
ac547e0d5d
Don't scroll to the top of the page when force/cancel alarm is clicked
2019-03-10 20:58:24 -07:00
e6220e9d07
Fix eslint issues in cycle.js
2019-03-10 20:56:08 -07:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
fa124eb29a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-03-05 14:35:15 -05:00
f0f2b6a17c
implement click_automove and submitToMontrageReview for onclick handlers
2019-03-05 14:35:02 -05:00
5a66969fd1
change buttons from inputs to buttons. Add submit to montagereview. get rid of onclick handlers
2019-03-05 14:34:34 -05:00
e59eb510e3
update and fix the donate popup
2019-03-05 13:10:04 -05:00
73ae3f49ed
Merge branch 'master' into storageareas
2019-03-05 11:35:55 -05:00
36b00d09e3
fix destination view on the monitors view
2019-03-05 11:02:58 -05:00
8053f61a08
fix eslint missing {}
2019-03-05 11:02:09 -05:00
76ee31bf68
fix eslint missing {}
2019-03-05 11:01:58 -05:00
778707c8df
Merge branch 'master' into storageareas
2019-03-04 14:33:28 -05:00
7cee8356bd
Fix setting frame width when changing from fixed width to scaled
2019-03-04 13:43:03 -05:00
96e29c0299
fix up remaining issues with cycle updates
2019-03-04 13:35:40 -05:00
466c379e94
Merge branch 'master' into storageareas
2019-03-01 14:03:49 -05:00
675b4975b0
Fix control presets
2019-03-01 13:37:34 -05:00
af9c87a112
Merge branch 'master' into storageareas
2019-02-27 10:53:19 -05:00
804c384b4c
add Event Notification support to server
2019-02-27 09:29:11 -05:00
5da51d51bc
Merge branch 'master' into storageareas
2019-02-26 10:55:51 -05:00
53c0fae688
Merge fix from storageareas for archive/delete in events list
2019-02-26 10:22:58 -05:00
627e9f74cf
fix spacing
2019-02-25 15:24:25 -05:00
cbd8ee80f8
add namespace for Monitor
2019-02-24 12:40:40 -05:00
3b06f3015a
redirect to console of successfullogin takes us to login
2019-02-24 10:07:42 -05:00
dd590aa729
remove warning when QUERY_STRING is not set
2019-02-24 10:05:45 -05:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
45778384a6
Merge branch 'release-1.32'
2019-02-22 11:24:23 -05:00
9a2dd06e1d
Fix use of empty which isn't supported in old php. Remove the code entirely as I think it was just cutnpasted from somewhere else. We don't care if it is a new server or not in the validate code.
...
Fixes #2540
2019-02-22 11:22:44 -05:00
410cb70ddb
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again. ( #2534 )
2019-02-22 09:20:54 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
e087522203
remove debug
2019-02-21 14:15:10 -05:00
6d1541a4d2
Merge branch 'fix_privacy_view' into storageareas
2019-02-19 12:57:01 -05:00
97a888c0db
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again.
2019-02-19 12:54:12 -05:00
fbdb5bcb62
Merge branch 'master' into storageareas
2019-02-19 12:06:32 -05:00
87988185e5
remove data-on-click-this from markEids[] because we have an onclick bind in initPage
2019-02-19 09:58:03 -05:00
d1b3b23c09
Merge branch 'master' into storageareas
2019-02-13 09:42:03 -05:00
Isaac Connor
Pliable Pixels
Isaac Connor
Jonathan Meredith
Javier González Calleja
Andrew Bauer
Andrew Bauer
Chris
Matthew Noorenberghe