Isaac Connor
|
c3043c1487
|
cleanups, remove unneccessary updateArea calls
|
2016-06-07 21:22:22 -04:00 |
|
Isaac Connor
|
b2dfdea66e
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-06-07 11:45:50 -04:00 |
|
Isaac Connor
|
593fe2b0c5
|
update area when points move
|
2016-06-07 11:40:53 -04:00 |
|
Isaac Connor
|
bb6adc3012
|
fix missing space
|
2016-06-07 09:37:05 -04:00 |
|
Isaac Connor
|
f0ec2a65ee
|
Merge branch 'fix_errors_when_event_not_found' into storageareas
|
2016-06-03 10:47:47 -04:00 |
|
Isaac Connor
|
380b86614f
|
put quotes around integer values that will be empty strings if the event is not found
|
2016-06-03 10:46:21 -04:00 |
|
Isaac Connor
|
b8c406f969
|
Merge branch 'master' into storageareas
|
2016-06-03 09:32:55 -04:00 |
Isaac Connor
|
060988c05c
|
set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding
|
2016-05-31 16:02:37 -04:00 |
Andrew Bauer
|
a57a3d3186
|
Merge pull request #1501 from ZoneMinder/fix_zone_edit
Fix zone edit
|
2016-05-31 10:33:31 -05:00 |
|
Isaac Connor
|
1add5a954a
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-29 11:37:08 -04:00 |
|
Isaac Connor
|
9f6f5100fe
|
also copy Name from the request on update and only show delete button if it has a name
|
2016-05-29 11:32:18 -04:00 |
|
Isaac Connor
|
7725109917
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-27 12:47:32 -04:00 |
|
Isaac Connor
|
101c93d422
|
When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object
|
2016-05-27 12:45:36 -04:00 |
|
Isaac Connor
|
c4e5299943
|
sync up auto to Auto
|
2016-05-27 12:45:04 -04:00 |
|
Isaac Connor
|
c25b680799
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-27 11:12:18 -04:00 |
|
Isaac Connor
|
65e33d6c19
|
synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter
|
2016-05-27 11:11:30 -04:00 |
|
Isaac Connor
|
d52a6f9a95
|
Merge branch 'improve_filter' into storageareas
|
2016-05-27 09:57:05 -04:00 |
|
Isaac Connor
|
3058dd9463
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 12:19:33 -04:00 |
|
Isaac Connor
|
f461bc1e80
|
get rid of extra )
|
2016-05-26 12:18:58 -04:00 |
|
Isaac Connor
|
05709f3084
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 11:17:41 -04:00 |
|
Isaac Connor
|
f969186abb
|
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
|
2016-05-26 11:15:13 -04:00 |
Andrew Bauer
|
730abc9789
|
make zones unclickable when zm is not running
|
2016-05-26 09:35:36 -05:00 |
|
Andrew Bauer
|
1972c4116b
|
Merge pull request #1486 from connortechnology/update_image_view
Update image view
|
2016-05-26 09:05:14 -05:00 |
|
Isaac Connor
|
7a08d4620f
|
Merge branch 'master' into storageareas
|
2016-05-25 10:17:46 -04:00 |
|
Andrew Bauer
|
575f8ec265
|
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
Hide rtspdescribe
|
2016-05-25 08:44:17 -05:00 |
|
Isaac Connor
|
8f1596d683
|
use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr
|
2016-05-25 09:08:28 -04:00 |
Isaac Connor
|
7cfa2a5eaa
|
Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone
|
2016-05-24 16:46:34 -04:00 |
|
Isaac Connor
|
8fabeb78d3
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-05-24 15:55:49 -04:00 |
|
Isaac Connor
|
a8e407172a
|
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
|
2016-05-24 15:50:22 -04:00 |
|
Isaac Connor
|
89f58daf89
|
Merge branch 'master' into fix_zone_edit
|
2016-05-24 15:30:56 -04:00 |
|
Andrew Bauer
|
0052bb080c
|
unlink only if file exists
|
2016-05-24 12:13:17 -05:00 |
|
Isaac Connor
|
00abd36af8
|
fix the other case of the wrong case of rtsp
|
2016-05-24 12:19:31 -04:00 |
|
Isaac Connor
|
056eed6df9
|
fix to show RTSP describe option when switching back to rtsp
|
2016-05-24 12:15:59 -04:00 |
|
Isaac Connor
|
bc49aa6aa6
|
add missing ; and remove extra )
|
2016-05-24 09:34:36 -04:00 |
|
Isaac Connor
|
5eac0559e2
|
Merge branch 'master' into hide_rtspdescribe
|
2016-05-24 09:32:41 -04:00 |
|
Isaac Connor
|
fff54e4086
|
update export to use event object, which automatically fixes storage path issues. Include mp4's in the list of video files to include
|
2016-05-18 09:02:14 -04:00 |
|
Isaac Connor
|
20c4d07a00
|
Merge branch 'master' into hide_rtspdescribe
|
2016-05-16 14:40:04 -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
|
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
|
e4566f2e8e
|
Merge branch 'update_image_view' into storageareas
|
2016-05-16 12:23:19 -04: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
|
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 |