Isaac Connor
|
4f90f37f0e
|
add back request queue
|
2020-09-02 14:42:47 -04:00 |
Isaac Connor
|
9d84b8bd83
|
remove datetimepickers from static html. They get added later by javascript
|
2020-09-02 14:42:23 -04:00 |
Isaac Connor
|
e32d3ba05a
|
Move javascript includes to xhtmlFooter so they don't delay content loading
|
2020-09-02 14:38:38 -04:00 |
Isaac Connor
|
5d11644664
|
Fix various sizes and paddings to make zone editing work perfectly
|
2020-09-02 14:38:13 -04:00 |
Isaac Connor
|
a88dcfe78c
|
During start, switch from mode=single if required. Add play/stop/pause
|
2020-09-02 14:37:48 -04:00 |
Isaac Connor
|
31e8270470
|
Do not set width and height of stream based on monitor size
|
2020-09-02 14:37:28 -04:00 |
Isaac Connor
|
29ab186a7e
|
put generating the view html into an ob_start/ob_end_flush so that we can do things like re-open sessions in the middle of generating content. Only send CSP headers on html content.
|
2020-09-02 13:58:24 -04:00 |
Isaac Connor
|
c0b54ee790
|
introduce connKey method. Use it to generate a connKey if one hasn't been assigned yet.
|
2020-09-02 13:56:55 -04:00 |
Isaac Connor
|
5544057a8d
|
Merge branch 'master' into improve_zone_editing
|
2020-08-31 18:47:24 -04:00 |
Isaac Connor
|
762bea0761
|
Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot.
|
2020-08-31 18:30:05 -04:00 |
Isaac Connor
|
9b36b68ccc
|
Introduce a Group_Monitor class to ease loading this relationship
|
2020-08-31 18:28:53 -04:00 |
Isaac Connor
|
e120e21b11
|
fix off-by 1 in limiting results
|
2020-08-31 10:37:35 -04:00 |
Isaac Connor
|
73cdb510b2
|
Rough in an events ajax request for deleting events
|
2020-08-31 10:37:22 -04:00 |
Isaac Connor
|
0995708b5b
|
Use ajax request instead of webui to delete events. The reason is that the web ui will spit out the events view after performing the action. Without a filter it will try to list every event.
|
2020-08-31 10:37:03 -04:00 |
Isaac Connor
|
cce0ab1464
|
pass params when loading Objects_Indexed_By_Id
|
2020-08-31 10:16:35 -04:00 |
Isaac Connor
|
4fcece6b69
|
Fixes to generating SQL for postSQL conditions. Now we will add the AND with a value of TRUE and a comment with the attr
|
2020-08-31 10:16:10 -04:00 |
Isaac Connor
|
0b493cd85a
|
add svg circles for the points
|
2020-08-31 10:15:14 -04:00 |
Isaac Connor
|
3d5ad4902a
|
zones can now list multiple monitors
|
2020-08-31 10:14:53 -04:00 |
Isaac Connor
|
3f4f28f322
|
Move monitor class into js/MonitorStream for use elsewhere
|
2020-08-31 10:13:58 -04:00 |
Isaac Connor
|
fa18887f5c
|
zones can now list multiple monitors so populate a listof monitors with json data
|
2020-08-31 10:13:30 -04:00 |
Isaac Connor
|
f00f9ead79
|
Move monitor class into js/MonitorStream for use elsewhere
|
2020-08-31 10:12:47 -04:00 |
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
|
2e069716d0
|
remove conditions entirely since we can't seem to figure it out
|
2020-08-28 10:05:20 -04:00 |
Isaac Connor
|
6fd5578aea
|
Change condition fork=false to repo=ZoneMinder/zoneminder since the we are failing the fork test
|
2020-08-28 09:53:27 -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 |
Isaac Connor
|
065b095880
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-27 19:56:46 -04:00 |
Isaac Connor
|
0f04f9607a
|
Fixup Exists as opposed to ExistsInFileSsystem
|
2020-08-27 19:56:41 -04: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 |