Isaac Connor
|
f5e659f395
|
Change #zones into .zones because we may list zones for multiple monitors now
|
2020-08-31 10:10:50 -04:00 |
|
Isaac Connor
|
af8d7fc3fa
|
Style svg circle point
|
2020-08-31 10:10:21 -04:00 |
|
Isaac Connor
|
3e09840995
|
Merge branch 'master' into improve_zone_editing
|
2020-08-28 17:43:07 -04:00 |
Andrew Bauer
|
990b5bd9dc
|
monitor view - convert links to buttons
|
2020-08-28 15:22:57 -05:00 |
|
Andrew Bauer
|
9c56cd223f
|
move header right to shift pill list up
|
2020-08-28 13:32:46 -05:00 |
|
Andrew Bauer
|
47732e2469
|
right align monitor item names
|
2020-08-28 13:18:01 -05:00 |
|
Andrew Bauer
|
a919be7b2d
|
replace tabs with vert pills
|
2020-08-28 13:09:49 -05:00 |
|
Andrew Bauer
|
d69b3e7f43
|
make cancel go back to console
|
2020-08-28 10:56:09 -05:00 |
|
Isaac Connor
|
d0f1a2af80
|
Since monitor edit is no longer a popup, we need to redirect to console instead of none.
|
2020-08-28 10:22:28 -04:00 |
|
Isaac Connor
|
079d1be3b3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-28 09:52:34 -04:00 |
|
Isaac Connor
|
04b3f5d294
|
Merge branch 'master' into improve_zone_editing
|
2020-08-28 09:43:48 -04:00 |
|
Andrew Bauer
|
2b6090d8c6
|
console.js - change all createPopup to window.location.assign
|
2020-08-28 07:58:42 -05:00 |
|
Andrew Bauer
|
a288a54fbe
|
make form id unique on logout view
|
2020-08-28 07:42:33 -05:00 |
|
Andrew Bauer
|
1e78307735
|
add navigation buttons to monitor view
|
2020-08-27 16:30:49 -05:00 |
|
Isaac Connor
|
b458a7c893
|
Redirect after save so that a reload doesn't redo the post
|
2020-08-27 17:20:24 -04:00 |
|
Isaac Connor
|
f294d099c9
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-27 17:16:18 -04:00 |
|
Isaac Connor
|
3d9557c5a4
|
Implement limit on returned events. Free ram in cache if post_condition fails
|
2020-08-27 17:16:10 -04:00 |
|
Isaac Connor
|
10d0ccf0ce
|
fix use of ->value instead of ->val. Return 1 for the sql for a post-condition term
|
2020-08-27 17:15:33 -04:00 |
|
Isaac Connor
|
d0f6f8755c
|
Implement a remove_from_cache function so we can free mem for objects we are not interested in
|
2020-08-27 17:14:47 -04:00 |
|
Isaac Connor
|
a5cef3e6d1
|
Need to put a 1 in the sql for post-sql conditions due to the cnj term
|
2020-08-27 17:14:16 -04:00 |
|
Andrew Bauer
|
1f5f964ae3
|
add navbar to monitor view
|
2020-08-27 15:53:24 -05:00 |
|
Andrew Bauer
|
948836ed96
|
enable jump-to feature on frames
|
2020-08-27 14:58:21 -05:00 |
|
Isaac Connor
|
9fef228636
|
remove debug Warning
|
2020-08-27 13:38:13 -04:00 |
|
Isaac Connor
|
e9cef72d9f
|
Use ViewWdith/ViewHeight to get rotated dimensions when calculating thumbnail size
|
2020-08-27 12:44:56 -04:00 |
|
Isaac Connor
|
dc15663030
|
Fix scales after applying layout
|
2020-08-27 10:55:14 -04:00 |
|
Isaac Connor
|
ccaea26928
|
Fix logic on MonitorFlip Cookie value
|
2020-08-27 10:54:54 -04:00 |
|
Isaac Connor
|
6173890a45
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-27 10:34:00 -04:00 |
|
Isaac Connor
|
702ea365c2
|
Remove cruft and fix the filter bar toggle
|
2020-08-27 10:33:52 -04:00 |
|
Isaac Connor
|
4c1446d856
|
Fixes to scale selection and remove code that altered width&height in zms url. zms doesn't honour them. Calculate new scale and alter that parameter.
|
2020-08-27 10:33:08 -04:00 |
|
Isaac Connor
|
62eddfdf2b
|
reorganize code a bit for better logical grouping
|
2020-08-27 10:31:27 -04:00 |
|
Isaac Connor
|
c0d543cd47
|
Add code to handle monitorsfilterbar on montage
|
2020-08-27 10:31:06 -04:00 |
|
Isaac Connor
|
dd3d315964
|
A a.flip float right and put a clear:both after the contents of #header so that it has space after content has been toggled
|
2020-08-27 10:30:27 -04:00 |
|
Isaac Connor
|
11f165a99f
|
remove width and height from zms url. zms doesn't support them and having them in the url is confusing
|
2020-08-27 10:29:50 -04:00 |
|
Andrew Bauer
|
4bacb136c9
|
enable page-jump-to table extension
|
2020-08-27 07:46:52 -05:00 |
|
Andrew Bauer
|
e8a2bbf6e0
|
continue to fix corrupted merge conflict
|
2020-08-27 07:42:39 -05:00 |
|
Andrew Bauer
|
9b69eb5762
|
fix corrupted merge conflict
|
2020-08-27 07:35:05 -05:00 |
|
Isaac Connor
|
b451c323e9
|
remove debug code at Warning level
|
2020-08-26 18:40:31 -04:00 |
|
Andrew Bauer
|
367c060790
|
remove unwanted patch files
|
2020-08-26 17:07:58 -05:00 |
|
Andrew Bauer
|
280964f33f
|
reapply commit d3cc4d5
|
2020-08-26 17:06:01 -05:00 |
|
Andrew Bauer
|
8ba91db1fb
|
make logout view a modal
|
2020-08-26 16:28:11 -05:00 |
|
Andrew Bauer
|
8d202aeef0
|
eslint
|
2020-08-26 15:36:38 -05:00 |
|
Isaac Connor
|
ab68bef39a
|
Merge branch 'master' into filter_pre_post
|
2020-08-26 15:28:48 -04:00 |
|
Isaac Connor
|
99472242af
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-26 15:16:36 -04:00 |
|
Isaac Connor
|
0ced21dda7
|
Persist video volume in a cookie so that subsequent events remember the volume level.
Fixes #3013
|
2020-08-26 15:15:57 -04:00 |
|
Andrew Bauer
|
67fe9d0cb4
|
un-popup the users views
|
2020-08-26 13:52:10 -05:00 |
|
Andrew Bauer
|
8c4f89c099
|
requested dark skin changes
|
2020-08-26 13:31:58 -05:00 |
|
Isaac Connor
|
24d1ba3a00
|
fix eslint
|
2020-08-26 13:41:40 -04:00 |
|
Andrew Bauer
|
1c7bddf96e
|
monitor config no longer a popup
|
2020-08-26 12:22:19 -05:00 |
|
Andrew Bauer
|
ac7867eab3
|
make function view a modal
|
2020-08-26 11:39:48 -05:00 |
|
Isaac Connor
|
06942746d6
|
Merge branch 'release-1.34'
|
2020-08-25 12:41:33 -04:00 |