Isaac Connor
|
1539e34204
|
spacing
|
2019-09-19 14:57:28 -04:00 |
|
Isaac Connor
|
b05ecd881e
|
add onchange to scale
|
2019-09-19 14:57:21 -04:00 |
|
Isaac Connor
|
2da9edf0ff
|
add onchange to scale
|
2019-09-19 14:57:17 -04:00 |
|
Isaac Connor
|
14e625b775
|
Set width of dimensions
|
2019-09-19 14:56:55 -04:00 |
|
Isaac Connor
|
daa9f646fb
|
fix error printing
|
2019-09-19 14:56:34 -04:00 |
|
Isaac Connor
|
b9b52c964e
|
Upgrade monitor saving and viewing
|
2019-09-19 14:56:16 -04:00 |
|
Isaac Connor
|
73a5a8c8c5
|
Improve changes/set/etc to handle more complex defaults
|
2019-09-19 14:55:45 -04:00 |
|
Isaac Connor
|
b41e998a3a
|
Remove Control stuff from Monitor
|
2019-09-19 14:55:27 -04:00 |
|
Isaac Connor
|
4c206c2e9a
|
Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions
|
2019-09-19 14:55:17 -04:00 |
|
Isaac Connor
|
d5ee73a9ee
|
use CaptureResolution instead of CaptureDimensions because it is already in language
|
2019-09-19 10:50:20 -04:00 |
|
Isaac Connor
|
1bd70319a9
|
Add a dimensions dropdown to ease entering monitor dimensions
|
2019-09-19 10:48:25 -04:00 |
|
Isaac Connor
|
2caca5f3ad
|
Merge branch 'master' into update_monitor_saving
|
2019-09-18 11:41:16 -04:00 |
|
Isaac Connor
|
9889311b03
|
Handle username=&password= as well in HostController::login
|
2019-09-18 11:40:55 -04:00 |
|
Isaac Connor
|
458268d866
|
Merge branch 'master' into update_monitor_saving
|
2019-09-18 11:40:09 -04:00 |
|
Isaac Connor
|
b3b7ec660b
|
Add a test for the built-in layouts. Can't edit them.
|
2019-09-18 11:19:28 -04:00 |
|
Isaac Connor
|
9e8c17dfaf
|
Merge branch 'master' into tolland-remove-extra-px
|
2019-09-18 11:17:50 -04:00 |
|
Isaac Connor
|
0eb1fff5b5
|
remove unused view=image-ffmpeg
|
2019-09-18 11:16:49 -04:00 |
|
Isaac Connor
|
f509b4c9d1
|
spacing
|
2019-09-18 11:10:40 -04:00 |
|
Isaac Connor
|
1407d849e8
|
deprecate getStreamSrc in functions.php.
|
2019-09-18 11:10:25 -04:00 |
|
Isaac Connor
|
ce1823bd29
|
spacing and fix saving
|
2019-09-17 12:46:11 -04:00 |
|
Isaac Connor
|
bcaabf4cf2
|
update buttons
|
2019-09-17 12:09:36 -04:00 |
|
Isaac Connor
|
e0074692d1
|
Remove debug
|
2019-09-17 12:07:30 -04:00 |
|
Isaac Connor
|
ad84736cb4
|
spacing
|
2019-09-17 12:07:24 -04:00 |
|
Isaac Connor
|
ff8e9fa072
|
Don't glob skins dir and css dirs unless our skin or css is invalid.
|
2019-09-17 12:07:10 -04:00 |
|
Isaac Connor
|
f0cfd674c1
|
Cleanup options skins tab. Setting the values happens in index.php. Use global and
|
2019-09-17 12:06:54 -04:00 |
|
Isaac Connor
|
deefa0754d
|
Backtick the fields when updating Monitors
|
2019-09-16 10:53:06 -04:00 |
|
Isaac Connor
|
63db128edf
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-15 17:54:29 -04:00 |
|
Isaac Connor
|
60cf4586da
|
Don't return a hostname when not in multi-server. Should prevent problems with reverse proxies
|
2019-09-15 17:54:23 -04:00 |
|
Isaac Connor
|
32a1ab58b5
|
remove use of userLogin which was removed recently
|
2019-09-15 12:19:35 -04:00 |
|
Isaac Connor
|
d141632256
|
general clean of onvif probe view. Use buttons instead of inputs and use data-on-change-this instead of inline js. Also rename username and password to Username and Password to not conflict with authentication to ZM ui.
|
2019-09-11 09:18:03 -04:00 |
Isaac Connor
|
d5aa95e45f
|
cpplint fixes
|
2019-09-09 16:13:32 -04:00 |
|
Isaac Connor
|
8103156436
|
when deleting multiple events, each event has to be it's own transaction due to locking
|
2019-09-09 09:16:52 -04:00 |
|
Isaac Connor
|
056449590a
|
Update Monitor object, using Object methods for saving monitors
|
2019-09-08 12:26:11 -04:00 |
|
Isaac Connor
|
bce1a48b66
|
Fix another Monitorid. Fixes #2699
|
2019-09-05 10:31:22 -04:00 |
|
Isaac Connor
|
25198e0eb0
|
move session_close to after auth so that whatever we do with the session in auth gets saved
|
2019-09-04 17:53:59 -04:00 |
|
Isaac Connor
|
2993e52652
|
Fix auth timing out due to cookie timing out and getting deleted.
|
2019-09-04 12:14:32 -04:00 |
|
Isaac Connor
|
f568e0da30
|
Fix event->id() to event->Id()
|
2019-09-04 10:11:16 -04:00 |
|
Isaac Connor
|
a57c5196f3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-04 10:07:31 -04:00 |
|
Isaac Connor
|
dde655950f
|
Use locking when deleting an event
|
2019-09-04 10:07:17 -04:00 |
|
Isaac Connor
|
26670c2df2
|
Add lock function to write lock an object
|
2019-09-04 10:07:08 -04:00 |
Pliable Pixels
|
be99f6a4d6
|
In production mode, debug should be 0
|
2019-09-04 08:47:09 -04:00 |
|
Isaac Connor
|
f46662a062
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-03 12:55:51 -04:00 |
|
Isaac Connor
|
16f0ad4f59
|
Fix Monitorid => MonitorId
|
2019-09-03 12:55:45 -04:00 |
|
Isaac Connor
|
92bc1791f5
|
fix accidentally removed code
|
2019-09-03 11:33:13 -04:00 |
|
Isaac Connor
|
50aa0108e5
|
Add authhash to session
|
2019-09-03 11:33:02 -04:00 |
|
Isaac Connor
|
a384e978c8
|
don't load user from session if we have already gotten it from elsewhere
|
2019-09-03 11:19:42 -04:00 |
|
Isaac Connor
|
b84d005d8f
|
Load use from session when it exists
|
2019-09-03 10:54:34 -04:00 |
|
Isaac Connor
|
99a2ddba63
|
Add listing of Secondary Storage area in events list
|
2019-08-29 11:27:06 -04:00 |
|
Isaac Connor
|
6b9e8bec69
|
Add logging of delete events
|
2019-08-29 11:26:32 -04:00 |
|
Isaac Connor
|
ef5497cba8
|
If we have an ajax request, don't do actions.
|
2019-08-29 11:26:14 -04:00 |