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
|
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
|
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 |