Isaac Connor
|
435a1f7a2e
|
remove duplicated locking code created by bind_fixes
|
2016-05-17 09:11:52 -04:00 |
|
Isaac Connor
|
20c4d07a00
|
Merge branch 'master' into hide_rtspdescribe
|
2016-05-16 14:40:04 -04:00 |
|
Isaac Connor
|
0faa28d058
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-05-16 14:38:49 -04:00 |
|
Isaac Connor
|
6084e2d00f
|
improve error message. The unrecognized action error happens above, so this error should just mention permissions
|
2016-05-16 14:38:40 -04:00 |
|
Isaac Connor
|
5e419e85d7
|
move logger down, as thisURL gets set in the skin.js and comment out overlay.js
|
2016-05-16 14:37:35 -04:00 |
|
Isaac Connor
|
710ecd5b19
|
Put rotation metadata in the video stream metadata where it belongs
|
2016-05-16 14:36:09 -04:00 |
Andrew Bauer
|
46039a1887
|
Merge pull request #1472 from ZoneMinder/v4l1_compat
V4l1 compat
|
2016-05-16 13:02:27 -05:00 |
|
Andrew Bauer
|
b3d261e8d9
|
Merge pull request #1476 from connortechnology/whitespace
whitespace/google code style
|
2016-05-16 12:59:24 -05:00 |
|
Isaac Connor
|
e28cb5b412
|
fix body padding
|
2016-05-16 13:29:13 -04:00 |
|
Isaac Connor
|
9601b30972
|
Add Width, Height and alt to frame
|
2016-05-16 13:26:44 -04:00 |
|
Isaac Connor
|
647e45de1b
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-16 12:24:36 -04:00 |
|
Isaac Connor
|
d93e747cc2
|
Merge branch 'storageareas' of ../ZoneMinder.connortechnology into storageareas
|
2016-05-16 12:24:18 -04:00 |
|
Isaac Connor
|
0b00659f26
|
Merge branch 'update_zmupdate' into storageareas
|
2016-05-16 12:24:14 -04:00 |
|
Isaac Connor
|
e4566f2e8e
|
Merge branch 'update_image_view' into storageareas
|
2016-05-16 12:23:19 -04:00 |
|
Andrew Bauer
|
b3c6382e6c
|
Merge pull request #1484 from ZoneMinder/update_zmupdate
Update zmupdate
|
2016-05-16 09:55:00 -05:00 |
Isaac Connor
|
df8964c1f9
|
use eid= & fid= instead of path to frame image. The use of view=image also provides more security.
|
2016-05-16 10:33:21 -04:00 |
|
Isaac Connor
|
235095ed5f
|
fix URL to image view
|
2016-05-16 10:32:43 -04:00 |
|
Isaac Connor
|
b53a0a564d
|
Don't need the extra use ZoneMinder::Config
|
2016-05-16 10:07:24 -04:00 |
|
Isaac Connor
|
dd24c35afa
|
revert bogus optimisation
|
2016-05-16 10:05:12 -04:00 |
|
Isaac Connor
|
3780f8a2e6
|
move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module
|
2016-05-16 09:31:54 -04:00 |
Isaac Connor
|
b15120643d
|
Merge pull request #1480 from connortechnology/storageareas
Storageareas
|
2016-05-13 15:20:08 -04:00 |
|
Isaac Connor
|
c11a92efdd
|
implement 180,270 rorations and cleanup
|
2016-05-13 15:11:17 -04:00 |
|
Isaac Connor
|
943a4cef73
|
Merge branch 'storageareas' into rotate_video
|
2016-05-13 15:00:50 -04:00 |
|
Isaac Connor
|
71e9553648
|
add rotation to video
|
2016-05-13 14:51:26 -04:00 |
|
Isaac Connor
|
5df85770cd
|
zmupdate.pl.in
|
2016-05-13 13:52:34 -04:00 |
|
Isaac Connor
|
9a1b0b79b9
|
don't use a dropdown for montage, etc
|
2016-05-13 11:43:38 -04:00 |
|
Isaac Connor
|
a61dade6df
|
Merge branch 'fix_montage_server_refs' into storageareas
|
2016-05-13 11:11:27 -04:00 |
|
Isaac Connor
|
3ed6014f61
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-13 11:11:19 -04:00 |
|
Isaac Connor
|
8cb2692bbb
|
pass in the server url into the monitor object to use instead of the portal url
|
2016-05-13 11:09:12 -04:00 |
|
Isaac Connor
|
e301eaf6e4
|
use instead of $ to reference jquery
|
2016-05-13 11:08:04 -04:00 |
Isaac Connor
|
660ce5bf8c
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-13 10:12:51 -04:00 |
|
Isaac Connor
|
24cdbddc76
|
force db reconnect after fork
|
2016-05-13 09:45:46 -04:00 |
|
Isaac Connor
|
85f950d80a
|
put jquery into no conflict mode so it doesn't overwite mootools use of $
|
2016-05-13 09:45:24 -04:00 |
|
Isaac Connor
|
3a0aa09c2f
|
Force reconnect to the db after fork.
|
2016-05-13 09:09:49 -04:00 |
|
Isaac Connor
|
1ce2e597cf
|
fix body top padding
|
2016-05-12 20:00:37 -04:00 |
|
Isaac Connor
|
ed3e975e5a
|
take fid and eid as alternate parameters
|
2016-05-12 11:55:48 -04:00 |
|
Isaac Connor
|
2144cb7de6
|
fix body padding only for console and options
|
2016-05-12 10:45:13 -04:00 |
|
Isaac Connor
|
1530096560
|
whitespace/google code style
|
2016-05-12 10:17:41 -04:00 |
|
Isaac Connor
|
4cd510c438
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-05-12 09:31:02 -04:00 |
|
Isaac Connor
|
4843cb094e
|
more debug
|
2016-05-11 11:59:41 -04:00 |
|
Isaac Connor
|
532dc98e9e
|
fix zms
|
2016-05-11 11:38:53 -04:00 |
|
Isaac Connor
|
958cf6f3c7
|
fix merge problem causing duplicated lock
|
2016-05-11 11:35:38 -04:00 |
|
Isaac Connor
|
b44cee4a81
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-11 09:16:20 -04:00 |
|
Isaac Connor
|
9377dca44f
|
Merge pull request #1474 from pliablepixels/api-alarm-getstate
added status command to retrieve alarmed status of monitor in additio…
|
2016-05-10 23:48:32 -04:00 |
arjunrc
|
b513bcef82
|
icon's gonna kill me
|
2016-05-10 20:09:41 -04:00 |
|
arjunrc
|
af3cae578e
|
fixed verbose handling bug for status command on zmu
|
2016-05-10 20:07:28 -04:00 |
|
arjunrc
|
8d5f2a8e5d
|
added iconnor's change back
|
2016-05-10 19:17:09 -04:00 |
|
arjunrc
|
df830a5190
|
resolved merge conflicts
|
2016-05-10 19:15:00 -04:00 |
|
arjunrc
|
2888142e68
|
added status command to retrieve alarmed status of monitor in addition to on/of
|
2016-05-10 16:55:43 -04:00 |
|
Isaac Connor
|
e804cfbc16
|
Merge pull request #1 from josh4trunks/patch-1
Support user defined MySQL Port/Socket in API
|
2016-05-10 14:13:51 -04:00 |