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 |
|
Isaac Connor
|
e9d8b7925a
|
Merge branch 'db_reconnect' into storageareas
|
2016-05-10 11:13:09 -04:00 |
|
Isaac Connor
|
aaa4b3a824
|
check for db connection before assuming that dbh is valid
|
2016-05-10 11:11:45 -04:00 |
|
Isaac Connor
|
a5ba4759bf
|
fix new config entry
|
2016-05-10 10:54:40 -04:00 |
|
Isaac Connor
|
17f4f5789e
|
Merge branch 'master' into v4l1_compat
|
2016-05-10 10:10:48 -04:00 |
|
Isaac Connor
|
aebfa5c237
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-05-10 10:02:59 -04:00 |
|
Isaac Connor
|
2af96237b3
|
increase filter save popup height
|
2016-05-10 10:02:07 -04:00 |
|
Isaac Connor
|
56e0e4e3c6
|
Use Event->getPath instead of something wrong
|
2016-05-10 09:07:09 -04:00 |
|
Isaac Connor
|
a012320a3e
|
Whitespace and code style changes. Change Event->getEventPath to Event->getPath to sync with PHP version
|
2016-05-10 09:06:49 -04:00 |
|
Isaac Connor
|
cfd986de44
|
Merge branch 'master' into storageareas
|
2016-05-10 08:43:46 -04:00 |
|
Isaac Connor
|
4d20d35f8d
|
add back missing depends for perl modules which are needed both for building and installing
|
2016-05-10 08:43:38 -04:00 |
Steve Gilvarry
|
c0d3d69bec
|
Merge pull request #1420 from connortechnology/fix_event_menubars
remove set height on the menu bars, fixing flow issues
|
2016-05-10 16:55:06 +10:00 |
|
Isaac Connor
|
90253e20de
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-09 21:34:42 -04:00 |
|
Isaac Connor
|
f609b838cd
|
Merge branch 'master' into storageareas
|
2016-05-09 21:34:25 -04:00 |
|
Isaac Connor
|
5566d1881d
|
add perl dbd mysql to build depends. Seems to need it.
|
2016-05-09 21:34:12 -04:00 |
|
Isaac Connor
|
566f18c9ae
|
bump
|
2016-05-09 21:09:43 -04:00 |
|
Isaac Connor
|
add4992dea
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-09 21:08:13 -04:00 |
|
Isaac Connor
|
b88861e145
|
add back ffmpeg libs
|
2016-05-09 19:42:14 -04:00 |
|
Isaac Connor
|
a8de0bff71
|
Merge branch 'master' into storageareas
|
2016-05-09 19:30:02 -04:00 |
|
Isaac Connor
|
35783f7dc0
|
Merge branch 'mysql_fixes' into storageareas
|
2016-05-09 19:27:42 -04:00 |
|
Steve Gilvarry
|
fa91c50046
|
Merge pull request #1458 from ZoneMinder/merge_db_connects
Merge db connects
|
2016-05-10 08:02:02 +10:00 |
|
Steve Gilvarry
|
b03d2660cb
|
Merge pull request #1455 from ZoneMinder/api_servers
rough in Server object support
|
2016-05-10 08:00:58 +10:00 |