Isaac Connor
4fe6b6f8b7
set a min width so that small images or fps updates don't cause a reflow
2016-11-21 11:39:31 -05:00
Isaac Connor
c360e27b02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-17 13:13:47 -05:00
Isaac Connor
bb6b0c2d49
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
2016-11-17 12:16:49 -05:00
Kyle Johnson
4eb5ff7aff
Fix Undefined index: loginFailed. Resolves #1684
2016-11-16 19:42:04 -07:00
Isaac Connor
2bd080a6a6
Merge branch 'master' into storageareas
2016-11-15 08:41:00 -05:00
Isaac Connor
8f71971209
Show error message upon unsuccessful login. Fixes #1648 ( #1680 )
...
* Add additional post-cmake files to .gitignore
* Add bootstrap 3.3.7
* Load bootstrap css
* Restyle login page, move recaptcha js to <head>
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
* Update doctype to HTML5, add meta tags for mobile browsers
* Move inline Login css to css file
* Remove extra php tag in functions.php
* Show error message upon unsuccessful login. Fixes #1648
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
* Only load bootstrap css in specific views.
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
* Test for invalid login via session variable.
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
* Fix a few typos in login inputs
* Add new fonts directory to web CMakeLists
2016-11-14 21:24:43 -05:00
Isaac Connor
3b7723ee8f
Merge branch 'master' into storageareas
2016-11-11 22:40:00 -05:00
Andrew Bauer
49d8e35e56
Show available PATH_MAP percent on console ( #1675 )
...
* Add PATH_SWAP percent to console
* add changes to console.php
* use ZM_PATH_MAP instead of ZM_PATH_SWAP
* show the folder name PATH_MAP points to
* use a dash as the delimiter instead of fwd slash
2016-11-11 08:47:08 -05:00
Kyle Johnson
65fe07e7aa
Fix a few typos in login inputs
2016-11-10 23:36:28 -07:00
Kyle Johnson
95d00f70a3
Test for invalid login via session variable.
...
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
2016-11-10 23:29:12 -07:00
Kyle Johnson
3916b02a74
Only load bootstrap css in specific views.
...
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
2016-11-10 23:07:52 -07:00
Kyle Johnson
0800a69a57
Show error message upon unsuccessful login. Fixes #1648
...
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
2016-11-10 22:51:32 -07:00
Kyle Johnson
97fb53e95c
Remove extra php tag in functions.php
2016-11-10 21:49:57 -07:00
Kyle Johnson
227b196a2e
Move inline Login css to css file
2016-11-10 21:48:42 -07:00
Kyle Johnson
3e3956f45d
Update doctype to HTML5, add meta tags for mobile browsers
2016-11-10 21:47:53 -07:00
Kyle Johnson
eacf6cd415
Restyle login page, move recaptcha js to <head>
...
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
Kyle Johnson
1607ae1210
Load bootstrap css
2016-11-10 21:45:46 -07:00
Andrew Bauer
9f43825b92
prevent the end user from slecting an invalid configuration on the PT… ( #1676 )
...
* prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab
* change to console.php should not be in this pr
2016-11-08 22:10:51 -05:00
Kyle Johnson
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
Isaac Connor
4b3ac63a68
merge master, deprecate qqq()
2016-11-08 11:30:44 -05:00
Kyle Johnson
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
Isaac Connor
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
Isaac Connor
5c62c654ce
fix WatchScale -> EventScale
2016-11-03 16:47:22 -04:00
Isaac Connor
53166fabf5
Merge branch 'master' into storageareas
2016-11-03 14:59:06 -04:00
Isaac Connor
cb69d1a693
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2016-11-03 14:57:29 -04:00
Kyle Johnson
bd47439056
Merge pull request #1639 from connortechnology/cookie_scale
...
store the scale value for watch and event views in a cookie, differen…
2016-11-03 12:35:15 -06:00
Isaac Connor
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
Isaac Connor
0ea8461192
remove extra s
2016-11-03 09:43:38 -04:00
Isaac Connor
2f22eb5a8c
fix error when only 1 monitor is listed
2016-11-03 09:41:54 -04:00
Isaac Connor
ca69a79bed
fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist.
2016-10-27 17:05:33 -04:00
Isaac Connor
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
Isaac Connor
340b172dc4
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:46:50 -04:00
Isaac Connor
42783b68f9
float the scale control right, add css for other skins
2016-10-26 14:43:23 -04:00
Isaac Connor
4defad1352
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:04:43 -04:00
Isaac Connor
d9a31f7fb6
Merge branch 'master' into storageareas
2016-10-26 13:39:31 -04:00
Isaac Connor
c74cc54ac0
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2016-10-26 13:34:30 -04:00
Isaac Connor
98cde11e86
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2016-10-26 13:34:28 -04:00
Isaac Connor
7b1395a4ea
set default for StorageId to '0' since it can't be NULL anymore
2016-10-20 14:06:09 -04:00
Isaac Connor
f153e9b8fb
MontageReview should only be visisble to people who can view events. Fix running state
2016-10-20 13:38:12 -04:00
Isaac Connor
67e14bd12f
move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me.
2016-10-20 13:16:50 -04:00
Steve Gilvarry
0409ae5582
Merge pull request #1652 from connortechnology/fix_popup
...
handle when window.open fails
2016-10-20 05:17:44 +11:00
Isaac Connor
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
Isaac Connor
4bb9709cb2
use object methods of Event
2016-10-12 15:39:53 -04:00
Isaac Connor
dcf6a39bf6
split Event and Monitor into objects and use properties from appropriate object
2016-10-12 15:39:32 -04:00
Isaac Connor
ba7d935a85
fix border size of text below the image in montage when alerted.
2016-10-12 12:19:04 -04:00
Isaac Connor
5b8b9c5345
merge update
2016-10-12 09:24:10 -04:00
Isaac Connor
b4f065eb75
Convert event view to use Objects
2016-10-12 09:17:57 -04:00
Isaac Connor
b00588b6ff
add back montagereview
2016-10-11 17:35:41 -04:00
Isaac Connor
0903ef294f
quick for to make MontageReview work
2016-10-11 17:35:28 -04:00
Isaac Connor
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
Isaac Connor
0358476ac0
Merge branch 'fix_popup' into storageareas
2016-10-11 12:19:38 -04:00
Isaac Connor
743e8c59f9
google code style and double to single quotes
2016-10-11 12:11:59 -04:00
Isaac Connor
ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
Jeff Vogt
3801d9e43e
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
2016-10-10 11:27:36 -07:00
Isaac Connor
96b5af9021
Merge branch 'fix_onvif' into storageareas
2016-10-04 15:00:28 -04:00
Isaac Connor
ac24865647
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:51 -04:00
Isaac Connor
09c5e3012a
username and password don't actually have to be specified
2016-10-04 14:09:32 -04:00
Isaac Connor
21a94a6200
better error message
2016-10-04 10:29:37 -04:00
Isaac Connor
cf9fa78ca3
work on fixing event view
2016-09-29 09:28:48 -04:00
Isaac Connor
09f7c9ddf9
Merge pull request #1633 from bhaal2/storageareas
...
Storageareas
2016-09-28 09:43:00 -04:00
Isaac Connor
994f1d566e
fix [
2016-09-28 09:09:01 -04:00
Isaac Connor
02a196d98b
add missing ]
2016-09-28 08:30:22 -04:00
Isaac Connor
6840031ee3
fix auth timeout and user session[username] when checking auth hash for speedup
2016-09-27 11:51:55 -04:00
Isaac Connor
e04266600e
Merge branch 'fix_auth_timeout' into storageareas
2016-09-27 11:04:12 -04:00
Isaac Connor
4ce531099c
add an auth field to request=stream results to give the client a new auth hash to use
2016-09-27 11:03:12 -04:00
Isaac Connor
167214cb01
Merge branch 'cookie_scale' into storageareas
2016-09-27 10:05:16 -04:00
Isaac Connor
6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
Isaac Connor
0580ef0c88
whitespace changes
2016-09-26 20:09:09 -04:00
bhaal2
b9b1dd144c
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
2016-09-21 21:41:22 +10:00
Isaac Connor
33ab9d3098
instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
2016-09-20 12:19:44 -04:00
Isaac Connor
5ce2e95fb7
replace getDiskPercent call with code to show percent for all storageareas
2016-09-20 12:18:50 -04:00
bhaal2
c74af40ffb
Had file open with old stuff. Fixed now.
2016-09-17 02:20:17 +10:00
bhaal2
aee6ae956d
Moved '%' to getDiskPercent() where it should have been.
2016-09-17 02:13:33 +10:00
Isaac Connor
5f46b8f942
Merge pull request #1621 from connortechnology/fix_1620
...
ptzControl expects a monitor object instead of a dbrow array.
2016-09-15 10:18:26 -04:00
Isaac Connor
2c21fe80e7
Merge pull request #1626 from bhaal2/storageareas
...
Storageareas
2016-09-15 10:18:11 -04:00
bhaal2
76beaf281a
Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas.
2016-09-15 19:44:13 +10:00
Isaac Connor
37c559ba3d
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-09-14 12:49:55 -04:00
Isaac Connor
cf45feea66
quiet the logs on initial view load
2016-09-14 12:49:47 -04:00
Isaac Connor
fb8b2f2490
Merge pull request #1625 from bhaal2/storageareas
...
Storageareas
2016-09-14 12:08:55 -04:00
bhaal2
17555bf623
Added extra argument 'id' to deleteFilter function to send to delete action for deleting a filter.
2016-09-15 01:57:31 +10:00
bhaal2
67f2ddc404
Changed filter list order back to Name
...
Added extra argument 'Id' to delete button onClick call
2016-09-15 01:55:58 +10:00
bhaal2
cd626a54ee
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:29:44 +10:00
bhaal2
99a212803a
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:29:35 +10:00
Isaac Connor
a0eaea00a5
fix relative paths to jquery and bootstrap fixes #1618
2016-09-14 10:06:15 -04:00
bhaal2
cd0e6ba285
StorageId now defaults to 0 and database column now set to NOT NULL. Changed default Id in php to match
2016-09-14 23:56:05 +10:00
bhaal2
33fc47c4b1
StorageId now defaults to 0 (NOT NULL) in the Monitors table, updates to filter.php set the default Id for the default storage area to 0
2016-09-14 23:53:52 +10:00
Isaac Connor
0bc50810de
only add the development h3 if it has contents, otherwise it pushes the header size down
2016-09-13 10:25:49 -04:00
Isaac Connor
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
Isaac Connor
a80881bb98
Merge branch 'fix_1620' into storageareas
2016-09-13 10:03:02 -04:00
Isaac Connor
54db9f2e3a
ptzControl expects a monitor object instead of a dbrow array.
2016-09-12 21:36:03 -04:00
Steve Gilvarry
563f4a9d46
Merge pull request #1505 from ZoneMinder/fix_filter_actions
...
Confirmed check box status is now retained after save and changing filters.
2016-09-11 14:13:51 +10:00
corax
070051d06a
Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
...
For easy pull-requesting
2016-09-09 14:20:03 +02:00
corax
b10c79b4f7
Add translation for 'Montage Review'
2016-09-09 13:26:19 +02:00
corax
6b18184e4a
Remove confusing link to web console
2016-09-09 12:38:30 +02:00
corax
4dc6fc03b3
Add a missing translate()-call
2016-09-09 12:35:34 +02:00
Isaac Connor
10abe98e91
merge from packet queue. add monitorId to livestream div lookup
2016-09-01 10:15:12 -04:00
Isaac Connor
5f07911a63
fix spacing
2016-08-31 10:09:42 -04:00
Isaac Connor
09ebcfb7f8
only put in the development h3 tag if the value has been set
2016-08-22 11:42:44 -04:00
Andrew Bauer
ea34f3d69a
Merge pull request #1576 from ZoneMinder/show_other_zones
...
include polygons for the other zones.
2016-08-15 20:36:16 -05:00
Isaac Connor
19d46c2d09
Merge branch 'master' into storageareas
2016-08-15 10:45:50 -04:00
Isaac Connor
a0bc30d3fe
fix the order of analyse/capture being passed
2016-08-12 15:40:47 -04:00
Isaac Connor
9106675842
pass capture or analyse to getImageSrc
2016-08-12 15:17:13 -04:00
Isaac Connor
bc4923b555
use instead of for the frame object and pass to getImageSrc which expects an array
2016-08-12 13:50:18 -04:00
Isaac Connor
cc06a84a0e
increase size of onvifprobe popup
2016-08-09 13:09:47 -04:00
Isaac Connor
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -04:00
Andrew Bauer
24d471f452
Merge pull request #1503 from ZoneMinder/id_on_console
...
add option to show monitor ID on console
2016-08-06 10:59:03 -05:00
Isaac Connor
6a0c6cd4f2
Merge branch 'show_other_zones' into storageareas
2016-08-02 13:54:01 -04:00
Isaac Connor
8093470a2e
make only the editing polygon have a border. Set default for Type when creating a new zone
2016-08-02 12:19:55 -04:00
Isaac Connor
b522371080
include polygons for the other zones.
2016-08-02 12:02:07 -04:00
Isaac Connor
4c1c95e3a5
only include the state if canEdit(system) otherwise it gives an auth error
2016-07-22 16:04:42 -04:00
Isaac Connor
32f9b2755e
add more height to the logout popup
2016-07-22 16:04:18 -04:00
Isaac Connor
9262d9d14e
remove debug messages on css changing
2016-07-22 16:02:55 -04:00
Isaac Connor
3504c1d8f5
Add Id to the title for each monitor
2016-07-21 15:02:01 -04:00
Isaac Connor
8c8461a88e
Update to use Event object and object based createListThumbnail function
2016-07-20 15:20:51 -04:00
Isaac Connor
bce7369984
Merge branch 'disk_space_in_events' into storageareas
2016-07-19 17:36:15 -04:00
Isaac Connor
cd43d1fa7a
Rough in Event disk space reporting
2016-07-19 17:34:01 -04:00
Isaac Connor
4caa20821a
fix
2016-07-14 11:57:06 -04:00
Isaac Connor
eb0ddc4e32
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
2016-07-14 11:55:27 -04:00
Isaac Connor
b6c02b563b
turn off host validation
2016-07-14 10:22:09 -04:00
Isaac Connor
410e154b7f
code style
2016-07-12 10:29:40 -04:00
Andy Bauer
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
Isaac Connor
6ab2b33e95
fix merge
2016-06-27 09:10:35 -04:00
Isaac Connor
6e4c8fa224
need to set the Id when duping
2016-06-24 10:31:15 -04:00
Isaac Connor
d732d9a49a
fix merge
2016-06-24 10:02:20 -04:00
Isaac Connor
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
Isaac Connor
6a8db582ff
whitespacing updates
2016-06-21 12:21:18 -04:00
Isaac Connor
31a5252afa
apply btn and btn-primary styles to remaining buttons on console
2016-06-21 09:22:32 -04:00
Isaac Connor
1d1cedce95
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
2016-06-20 12:40:33 -04:00
Isaac Connor
26bba58c56
Merge branch 'master' into feature-h264-videostorage
2016-06-17 11:09:47 -04:00
Isaac Connor
3914e0b394
:Merge branch 'fix_zone_edit' into storageareas
2016-06-16 12:04:18 -04:00
Isaac Connor
0c82e82ae2
Don't update x in updateY and don't update y in updateX as they are not defined.
2016-06-16 12:00:00 -04:00
Isaac Connor
8e7665d397
use getStreamHTML instead of duplicated code
2016-06-14 12:40:18 -04:00
Isaac Connor
d5d48bef8a
clean out unused variables and don't scale the popup window. The contents of it won't be scaled.
2016-06-14 12:39:51 -04:00
Isaac Connor
bfa46e26ee
Use monitor Id instead of the array index. Id is unique, so just use it.
2016-06-14 12:39:15 -04:00
Isaac Connor
abad7cbf9f
Merge branch 'fix_zone_edit' into storageareas
2016-06-13 09:43:03 -04:00
Isaac Connor
83ac4cd061
change the input handler from onchange to oninput. Disable form submit when hitting enter
2016-06-13 09:40:04 -04:00
Isaac Connor
632ec38d7d
Put back in neccessary callt o updateArea
2016-06-12 16:10:24 -04:00
Isaac Connor
4f2e0edb44
remove unnecssary updateAreas
...
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
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
7277283659
rename AttrServerId to AttrServer, because that is the text that is returned
2016-05-27 10:12:46 -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
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
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
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