Isaac Connor
|
624006022c
|
Use a redirect to get rid of post on reload
|
2020-10-07 11:59:11 -04:00 |
|
Isaac Connor
|
b683d5326a
|
Test for empty array in htmlOPtions when notifying about not selecting a value
|
2020-10-07 11:22:42 -04:00 |
|
Isaac Connor
|
efd56a2e09
|
spacing
|
2020-10-07 11:16:02 -04:00 |
Andrew Bauer
|
87fd316e5b
|
makePopupButton removed, use makeButton instead
|
2020-10-05 16:40:14 -05:00 |
|
Andrew Bauer
|
2852d14ca6
|
use data-on-change-this instead of inline js
|
2020-10-04 08:04:11 -05:00 |
|
Andrew Bauer
|
1ef1b48c71
|
remove warnings used for testing
|
2020-10-03 07:08:04 -05:00 |
Andrew Bauer
|
a97e526298
|
fix save button in controlpreset modal
|
2020-10-02 16:10:32 -05:00 |
|
Andrew Bauer
|
802e439cb5
|
convert controlpreset view to a modal
|
2020-10-02 15:46:28 -05:00 |
|
Isaac Connor
|
e9d120f032
|
remove debug
|
2020-10-02 15:56:56 -04:00 |
|
Isaac Connor
|
bc5002515e
|
remove debug
|
2020-10-02 15:56:50 -04:00 |
|
Isaac Connor
|
5d20dde85c
|
Implement a Session class that takes over session functions and stores in the database
|
2020-10-02 14:50:22 -04:00 |
|
Andrew Bauer
|
186b8ac947
|
convert x10 device view to a modal
|
2020-10-01 15:52:33 -05:00 |
|
Andrew Bauer
|
928fa67fce
|
redirect to previous view after user perm changes
|
2020-10-01 10:45:44 -05:00 |
|
Andrew Bauer
|
b8d95dfa05
|
fix array to string php warning
|
2020-10-01 09:13:50 -05:00 |
|
Isaac Connor
|
aa7ba44ed9
|
Use ->zmaControl instead of invalid zmaControl(). the old zmaControl takes a mid, not a monitor object
|
2020-09-29 16:48:22 -04:00 |
|
Isaac Connor
|
24d8b99eea
|
test for property_exists to quiet errors
|
2020-09-29 16:47:49 -04:00 |
|
Isaac Connor
|
ecac5e051a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-28 09:34:14 -04:00 |
|
Isaac Connor
|
0a4a144bbc
|
Merge branch 'location'
|
2020-09-28 09:33:28 -04:00 |
|
Andrew Bauer
|
3b46ebacae
|
remove warning used for testing
|
2020-09-27 12:20:09 -05:00 |
|
Andrew Bauer
|
c1a0afef95
|
make group view into a modal
|
2020-09-27 12:12:01 -05:00 |
|
Andrew Bauer
|
2d8349073d
|
redirect to controlcaps after saving a control
|
2020-09-26 14:31:59 -05:00 |
|
Andrew Bauer
|
ae9139b00c
|
unpopup zone view
|
2020-09-25 10:52:13 -05:00 |
|
Isaac Connor
|
386f991364
|
Merge branch 'master' into location
|
2020-09-24 19:28:57 -04:00 |
|
Isaac Connor
|
8bd958e91c
|
pass querySep to querystring
|
2020-09-24 12:12:06 -04:00 |
|
Isaac Connor
|
e47fa48a8e
|
move parseFilterToTree from timeline_functions to Filter->tree(). Fix passing separator in querystring
|
2020-09-24 12:11:45 -04:00 |
|
Isaac Connor
|
624bcdcde0
|
Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them
|
2020-09-24 09:01:30 -04:00 |
|
Isaac Connor
|
ed6d5a55a5
|
put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button
|
2020-09-22 14:33:26 -04:00 |
|
Isaac Connor
|
0aa0452b7e
|
Use a redirect instead of just changing the view on monitor save. This fixes the reload issue
|
2020-09-22 14:05:37 -04:00 |
|
Isaac Connor
|
3e3af0bca5
|
Fix zmcontrol.pl command line to not use = to match with usage elsewhere
|
2020-09-21 11:24:17 -04:00 |
|
Isaac Connor
|
861ebedcae
|
Implement a crude view for a failed db connection with a 30 second reload interval.
|
2020-09-21 11:15:34 -04:00 |
|
Andrew Bauer
|
ec20fdf3ad
|
convert function modal to ajax request
|
2020-09-19 10:18:59 -05:00 |
|
Andrew Bauer
|
d2963fe28f
|
convert donate modal to ajax request
|
2020-09-19 08:55:08 -05:00 |
|
Andrew Bauer
|
2757b74957
|
convert servermodal function to php file
|
2020-09-18 10:34:33 -05:00 |
|
Isaac Connor
|
29880cdab3
|
handle width options['width'] and options['height'] aren't set
|
2020-09-17 20:57:14 -04:00 |
|
Isaac Connor
|
006cc079c4
|
Rework action to use Zone class and just take a list of Zid's so that technically we can delete zones from multiple monitors at once.
|
2020-09-17 20:56:56 -04:00 |
|
Isaac Connor
|
1701089211
|
Add MonitorId to Zone fields and add Monitor() method
|
2020-09-17 20:56:21 -04:00 |
|
Isaac Connor
|
42dc4e46b1
|
add canEdit method to Monitor object
|
2020-09-17 20:56:04 -04:00 |
|
Isaac Connor
|
4a6743be3f
|
turn off debug
|
2020-09-17 15:15:13 -04:00 |
|
Isaac Connor
|
123b2a4747
|
Change Event Diskspace case to not interfere with Filesystem DiskSpace
|
2020-09-17 15:14:54 -04:00 |
|
Isaac Connor
|
d39beb5714
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-15 10:22:36 -04:00 |
|
Andrew Bauer
|
accfd1191f
|
update eventdetail modal
|
2020-09-15 09:20:38 -05:00 |
|
Isaac Connor
|
fa1ade6b7b
|
Fix obr getting cbr value
|
2020-09-15 10:11:07 -04:00 |
|
Isaac Connor
|
ad0f8d674d
|
sort_asc is a boolean. ZM_WEB_EVENT_SORT_ORDER is asc|desc
|
2020-09-14 15:13:41 -04:00 |
|
Isaac Connor
|
ab8e2d2e6c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-14 14:05:02 -04:00 |
|
Isaac Connor
|
77fb533e48
|
Fix default value for AutoExecuteCmd
|
2020-09-14 14:04:36 -04:00 |
|
Andrew Bauer
|
d2bc39f65f
|
replace storage popup with modal
|
2020-09-14 09:50:04 -05:00 |
|
Andrew Bauer
|
aa6bf31cbd
|
pass OLANG as a function parm
|
2020-09-11 07:51:00 -05:00 |
Isaac Connor
|
3b7bde755e
|
Merge pull request #3041 from mnoorenberghe/unsafe_inline_backcompat
Drop support for CSP 1 browsers (with no nonce-* support)
|
2020-09-10 18:09:44 -04:00 |
|
Andrew Bauer
|
46d4f55b80
|
add makeHelpLink helper function
|
2020-09-10 17:06:27 -05:00 |
Matthew Noorenberghe
|
f031ce9934
|
Drop support for CSP 1 browsers (with no nonce-* support)
This gets rid of console spew in modern browsers.
|
2020-09-10 16:25:43 -04:00 |
|
Isaac Connor
|
c5e4a964cd
|
quotes, spacing fix some functions that clearly no one uses
|
2020-09-05 12:49:14 -04:00 |
|
Isaac Connor
|
240f4ceabd
|
Fix code warning if no value is selected in htmlSelect
|
2020-09-03 18:21:38 -04:00 |
|
Isaac Connor
|
47971bb8f5
|
Update function action to use Monitor object
|
2020-09-03 18:21:08 -04:00 |
|
Isaac Connor
|
6f5acece66
|
FIx Record Entry
|
2020-09-03 18:20:51 -04:00 |
|
Isaac Connor
|
c934dee233
|
Do not allow the deleting of Archived Events
|
2020-09-03 17:02:48 -04:00 |
|
Isaac Connor
|
94c7708df5
|
Warn when the specified selected value isn't in the passed options. Don't default to adding id in htmlSelect. Shouldbe passed in behaviours
|
2020-09-03 10:42:33 -04:00 |
|
Isaac Connor
|
fb9129a4d3
|
Add missing Mocord option
|
2020-09-03 10:40:10 -04:00 |
|
Isaac Connor
|
b1d4115df8
|
Handle case where IN operator is used with 1 value
|
2020-09-02 17:55:06 -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
|
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
|
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
|
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
|
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
|
b458a7c893
|
Redirect after save so that a reload doesn't redo the post
|
2020-08-27 17:20:24 -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 |
|
Isaac Connor
|
9fef228636
|
remove debug Warning
|
2020-08-27 13:38:13 -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 |
|
Isaac Connor
|
b451c323e9
|
remove debug code at Warning level
|
2020-08-26 18:40:31 -04:00 |
|
Andrew Bauer
|
8ba91db1fb
|
make logout view a modal
|
2020-08-26 16:28:11 -05:00 |
|
Isaac Connor
|
ab68bef39a
|
Merge branch 'master' into filter_pre_post
|
2020-08-26 15:28:48 -04:00 |
|
Isaac Connor
|
06942746d6
|
Merge branch 'release-1.34'
|
2020-08-25 12:41:33 -04:00 |
|
Isaac Connor
|
98dce06d6b
|
Introduce get_auth_relay to return an auth string to use in urls.
|
2020-08-25 12:38:31 -04:00 |
|
Isaac Connor
|
3d3dde22c4
|
Use zm_session_start
|
2020-08-25 11:31:06 -04:00 |
|
Isaac Connor
|
3c29228df5
|
Use zm_session_start
|
2020-08-25 11:30:22 -04:00 |
|
Isaac Connor
|
2d05fbda8d
|
simplify debug line
|
2020-08-24 14:36:36 -04:00 |
|
Isaac Connor
|
3c1651d98f
|
in getStreamSrc if scale isn't set figure it out from width and height if passed
|
2020-08-24 14:35:59 -04:00 |
|
Isaac Connor
|
0f27243007
|
Merge branch 'master' into filter_pre_post
|
2020-08-24 09:23:24 -04:00 |
|
Isaac Connor
|
fe425302ad
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-21 10:46:13 -04:00 |
|
Isaac Connor
|
63ef15d247
|
spacing and quotes
|
2020-08-21 10:46:10 -04:00 |
|
Isaac Connor
|
80a6608733
|
Make values in conf.d files override values in db. Also handle the fact that they would already be defined in this case.
|
2020-08-21 10:36:49 -04:00 |
|
Isaac Connor
|
0a3ad719cd
|
Merge branch 'master' into filter_pre_post
|
2020-08-17 18:30:44 -04:00 |
|
Isaac Connor
|
5078a69c81
|
move pre and post condition testing into the Filter class so we can use it everywhere
|
2020-08-17 17:40:58 -04:00 |
|
Isaac Connor
|
479768a2a4
|
implement disk_used_blocks in Storage. Also use Type() instead of ->{Type} to get default value.
|
2020-08-17 16:57:53 -04:00 |
|
Isaac Connor
|
72cad5f6d6
|
Move more code from parseFilter to Filter object.
|
2020-08-17 16:57:14 -04:00 |
|
Isaac Connor
|
e9b0c4fbf5
|
add ->filter to FilterTerm so that we can access other terms in testing pre and post conditions. rename hidden_fields_string to hidden_fields. Add in DiskPercent DiskBlocks, SystemLoad Pre and Post conditions
|
2020-08-17 16:56:54 -04:00 |
|
Isaac Connor
|
d2b7aa3e90
|
Populate Scheme of default Storage Area when event Storage is not valid
|
2020-08-17 16:55:29 -04:00 |
|
Isaac Connor
|
ae91e9c58f
|
add functions to Filter class to build up the sql, hidden_fields and query_string from the list of terms
|
2020-08-17 16:55:05 -04:00 |
|
Isaac Connor
|
e4425d7565
|
Merge branch 'master' into filter_pre_post
|
2020-08-17 12:56:20 -04:00 |
|
Isaac Connor
|
d1126b3007
|
Move term logic from parseFilter to FilterTerm class
|
2020-08-16 13:02:34 -04:00 |
|
Isaac Connor
|
82a1670d80
|
Rough in FilterTerm class, stealing code from functions.php and adapting it.
|
2020-08-15 17:49:59 -04:00 |
|
Isaac Connor
|
8a170f2841
|
Remove Debug
|
2020-08-15 17:49:26 -04:00 |
|
Isaac Connor
|
4fee59208d
|
Use str_replace and ltrim instead of preg_replace for efficiency
|
2020-08-13 12:14:18 -04:00 |
|
Isaac Connor
|
d42424d6d8
|
Merge branch 'release-1.34'
|
2020-08-11 11:41:11 -04:00 |
|
Isaac Connor
|
63da7f0074
|
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
|
2020-08-10 14:02:25 -04:00 |
|
Isaac Connor
|
81b55589db
|
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
|
2020-08-10 13:59:47 -04:00 |