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
|
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
|
1ce2e597cf
|
fix body top padding
|
2016-05-12 20:00:37 -04:00 |
|
Isaac Connor
|
2144cb7de6
|
fix body padding only for console and options
|
2016-05-12 10:45:13 -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
|
e9d8b7925a
|
Merge branch 'db_reconnect' into storageareas
|
2016-05-10 11:13:09 -04:00 |
|
Isaac Connor
|
2af96237b3
|
increase filter save popup height
|
2016-05-10 10:02:07 -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
|
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
|
b03d2660cb
|
Merge pull request #1455 from ZoneMinder/api_servers
rough in Server object support
|
2016-05-10 08:00:58 +10:00 |
|
Steve Gilvarry
|
cffcbc6357
|
Merge pull request #1462 from ZoneMinder/merge_storageareas
Merge object model classes from storageareas
|
2016-05-10 07:59:25 +10:00 |
|
Isaac Connor
|
7f9c70d521
|
when value to be stored is undefined or '', then set the field=NULL
|
2016-05-09 13:39:40 -04:00 |
|
Isaac Connor
|
beebe74e7b
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-09 12:26:17 -04:00 |
Isaac Connor
|
966a9dcd8d
|
Merge pull request #1467 from ZoneMinder/api_fixes
Don't pass request data as a monitor array to daemonControl
|
2016-05-07 18:25:35 -04:00 |
|
Isaac Connor
|
e4171855bb
|
add padding for nabar to body
|
2016-05-07 18:12:31 -04:00 |
|
Isaac Connor
|
ae40dc8b1b
|
revert to fixed navbar
|
2016-05-07 18:11:58 -04:00 |
|
Isaac Connor
|
e35b0a1eb2
|
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
added alarmed frames filter
|
2016-05-07 17:06:37 -04:00 |
|
arjunrc
|
be329e1e0d
|
switched to named param format, more flexible, in line with other APIs
|
2016-05-07 16:28:25 -04:00 |
|
arjunrc
|
8347b69b09
|
added alarmed frames filter
|
2016-05-07 14:26:09 -04:00 |
|
Isaac Connor
|
6d991a1c6c
|
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
added alarm enable/disable
|
2016-05-07 11:26:49 -04:00 |
|
arjunrc
|
6f9cc0f19f
|
to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF
|
2016-05-07 11:01:03 -04:00 |
|
Isaac Connor
|
654d4d2bee
|
Merge branch 'api_fixes' into storageareas
|
2016-05-07 10:56:47 -04:00 |
|
Isaac Connor
|
15977f1a3c
|
Don't pass request data as a monitor array to daemonControl
|
2016-05-07 10:56:38 -04:00 |
|
arjunrc
|
0280ae4dd5
|
added alarm enable/disable
|
2016-05-07 10:37:42 -04:00 |
|
Isaac Connor
|
51e6372362
|
remove extra hidden fields
|
2016-05-06 18:20:05 -04:00 |
|
Isaac Connor
|
dcdefac48a
|
fix styles in header, move footer back into header
|
2016-05-06 16:08:32 -04:00 |
|
Isaac Connor
|
7219e0624b
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:56:07 -04:00 |
|
Isaac Connor
|
9756f59a2c
|
still trying to fix eventcounts
|
2016-05-06 15:56:01 -04:00 |
|
Isaac Connor
|
97a1d5a648
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:53:48 -04:00 |
|
Isaac Connor
|
52b4e98e5a
|
fixes
|
2016-05-06 15:53:19 -04:00 |
|
Isaac Connor
|
fc191dfaa5
|
fixes
|
2016-05-06 15:52:07 -04:00 |
|
Isaac Connor
|
38877f802c
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:47:48 -04:00 |
|
Isaac Connor
|
905b69a394
|
fix too many {
|
2016-05-06 15:47:29 -04:00 |
|
Isaac Connor
|
7c3a7a6fda
|
fix i to monitor_i in for loop
|
2016-05-06 15:46:47 -04:00 |
|
Isaac Connor
|
38e02db9cf
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:46:00 -04:00 |
|
Isaac Connor
|
daf10c1b84
|
make displayMonitors global
|
2016-05-06 15:44:35 -04:00 |
|
Isaac Connor
|
f8d7f9906d
|
fixup merging of Event data into the monitor array
|
2016-05-06 15:44:23 -04:00 |
|
Isaac Connor
|
2ccefdb23c
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:30:25 -04:00 |
|
Isaac Connor
|
f4df9e053d
|
port sidebar css over from classic to flat
|
2016-05-06 15:30:10 -04:00 |
|
Isaac Connor
|
fb1b8000ec
|
fix the use of when specifying a skin
|
2016-05-06 15:24:20 -04:00 |
|
Isaac Connor
|
02b5cd6b6c
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:17:10 -04:00 |