Isaac Connor
|
284b9f963f
|
Merge branch 'master' into zma_to_thread
|
2020-12-29 12:18:26 -05:00 |
|
Isaac Connor
|
a1917d83d0
|
Merge branch 'master' into zma_to_thread
|
2020-12-22 19:52:09 -05:00 |
|
Isaac Connor
|
381cc30e5d
|
Set default value for DefaultScale to 0 which is ScaleToFit
|
2020-12-18 10:54:08 -05:00 |
|
Isaac Connor
|
0702b64cc4
|
Merge branch 'master' into zma_to_thread
|
2020-12-15 10:51:40 -05:00 |
|
Isaac Connor
|
bfd16db34b
|
add format padding so that right align file size strings will line up nicely.
|
2020-12-11 09:33:36 -05:00 |
|
Isaac Connor
|
f89da79c27
|
Fix comparing empty arrays. explode on an empty string returns an array with a single element '' instead of an empty array
|
2020-12-10 16:25:24 -05:00 |
|
Isaac Connor
|
da8d96ddda
|
Don't pass types to changes, it doesn't do anything. Add DecodingEnabled to request
|
2020-12-10 16:24:09 -05:00 |
|
Isaac Connor
|
ced396e437
|
Add DecodingEnabled to Monitors
|
2020-12-10 14:06:26 -05:00 |
|
Isaac Connor
|
5482d3b3d5
|
Quiet error when calling logout when already logged out
|
2020-12-09 17:56:27 -05:00 |
|
Isaac Connor
|
eb4b7f248d
|
handle sort_field and limit not existing in _REQUEST
|
2020-12-09 17:56:27 -05:00 |
|
Isaac Connor
|
63e36340c6
|
Remove extra }
|
2020-12-08 11:26:52 -05:00 |
|
Isaac Connor
|
bfe5bb0249
|
Include code to handle when we are already logged in but trying to auth with a mismatched auth_hash
|
2020-12-08 11:19:22 -05:00 |
|
Isaac Connor
|
b261fbb397
|
Merge branch 'master' into zma_to_thread
|
2020-12-07 16:26:26 -05:00 |
|
Isaac Connor
|
4d33667a85
|
Merge branch 'release-1.34'
|
2020-12-05 16:51:42 -05:00 |
|
Isaac Connor
|
fdbca4760f
|
dbFetchAll should always return an array. Not null on error
|
2020-12-05 16:38:25 -05:00 |
|
Isaac Connor
|
3a7571dd63
|
undo bogus cache use in Object constructor
|
2020-12-04 15:16:43 -05:00 |
|
Isaac Connor
|
8397ec3b9d
|
Merge branch 'release-1.34'
|
2020-12-01 14:28:10 -05:00 |
|
Isaac Connor
|
baeb1dbd5b
|
Take an optional debug param in dbQuery
|
2020-12-01 14:07:23 -05:00 |
|
Isaac Connor
|
cf08010ebe
|
Fix redirect on zone editing
|
2020-11-18 13:04:56 -05:00 |
Andrew Bauer
|
0ffb5e153c
|
modify FilterTerm to support Frames view searches
|
2020-11-14 17:33:18 -06:00 |
|
Isaac Connor
|
3cf31435a7
|
fix next/prev buttons by correcting the sort_field when it is StartTime or EndTime
|
2020-11-13 09:51:54 -05:00 |
|
Isaac Connor
|
df783f4835
|
Merge branch 'master' into zma_to_thread
|
2020-11-12 12:53:55 -05:00 |
|
Isaac Connor
|
fe733fe1e6
|
Must use & instead of & in filter redirect
|
2020-11-11 17:39:37 -05:00 |
|
Isaac Connor
|
73e8c04b6f
|
Fix encoding of = in filter['Id']. Fixes redirect after saving
|
2020-11-11 17:39:20 -05:00 |
|
Isaac Connor
|
b4aacde5bf
|
Remove debug. Auth is pretty solid these days
|
2020-11-10 13:15:46 -05:00 |
|
Isaac Connor
|
5b10fff2a0
|
Use cached objects when using new instead of only find_one
|
2020-11-10 13:14:36 -05:00 |
Isaac Connor
|
59403dc11b
|
Move event stat totals to Monitor_Status.
|
2020-11-06 14:00:18 -05:00 |
|
Isaac Connor
|
8029f59eac
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:52:50 -05:00 |
|
Isaac Connor
|
2d33dd5386
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:52:32 -05:00 |
|
Isaac Connor
|
e67532ef76
|
implement is_valid_attr. Fix incorrect EventDiskspace vs FS DiskSpace. FS DiskSpace isn't implemented. DiskPercent is.
|
2020-11-04 12:40:43 -05:00 |
|
Isaac Connor
|
387b2b1fc2
|
add attr validation to addTerm. Add addTerms
|
2020-11-04 12:39:42 -05:00 |
|
Isaac Connor
|
dda1decfb1
|
When redirecting after execute, redirect to the full filter querystring, as it may not have an Id and may have additional changes
|
2020-11-03 11:45:22 -05:00 |
|
Isaac Connor
|
f7c9a0e03d
|
Must urlencode [Id]=
|
2020-11-03 11:44:54 -05:00 |
Matt N
|
6e3eb922e0
|
Use relative symlinks for monitor event directories
This way the link continues to work from backups and after the user moves ZM data to a new directory.
|
2020-11-01 14:55:08 -08:00 |
|
Isaac Connor
|
858674c0b2
|
Merge branch 'master' into filter_locking
|
2020-10-28 12:52:52 -04:00 |
|
Isaac Connor
|
b3a28b2ba2
|
fix confusion in syslog reporting web_php when the error was actually web_js
|
2020-10-28 12:49:03 -04:00 |
|
Isaac Connor
|
a2596505e9
|
add LockRows to Filters
|
2020-10-26 18:47:17 -04:00 |
|
Isaac Connor
|
90c5f63d6d
|
Fix session.gc SQL issue. Don't need a * when deleting
|
2020-10-24 09:05:39 -04:00 |
|
Isaac Connor
|
2178da387d
|
pass desired object name into querystring()
|
2020-10-23 17:56:38 -04:00 |
|
Isaac Connor
|
b6004012e9
|
implement passing the object name to use when constructing the querystring
|
2020-10-23 17:56:05 -04:00 |
|
Isaac Connor
|
8f8526c2f1
|
add some debug to session garbage collection
|
2020-10-21 10:38:42 -04:00 |
|
Isaac Connor
|
946a59ce8b
|
add special case for sort_field being StartDateTime. This is not an event column and must be corrected to StartTime
|
2020-10-21 10:37:39 -04:00 |
|
Isaac Connor
|
1c5e161909
|
quotes
|
2020-10-21 10:37:06 -04:00 |
|
Isaac Connor
|
1dfebc24b0
|
Fix ZM\
|
2020-10-21 10:36:58 -04:00 |
|
Isaac Connor
|
34ce3a1498
|
Use Filter::parse instead of parseFilter. Use Filter->addTerm to limit to User's monitor restrictions. Return early with better logging in the event of error. Introduce Filter->addTerm
|
2020-10-21 10:36:40 -04:00 |
|
Isaac Connor
|
2eda49333f
|
Merge branch 'master' into zma_to_thread
|
2020-10-20 16:20:29 -04:00 |
|
Andrew Bauer
|
442fadb585
|
link bstable locale to zoneminder's
|
2020-10-17 07:28:14 -05:00 |
|
Isaac Connor
|
4f56f9d82b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-15 17:20:10 -04:00 |
|
Isaac Connor
|
12b75e93b8
|
Merge branch 'release-1.34'
|
2020-10-15 17:19:56 -04:00 |
|
Isaac Connor
|
3c5dc8e8b3
|
Add line breaks in select options
|
2020-10-15 17:16:14 -04:00 |
|
Isaac Connor
|
57a1a383ad
|
Merge branch 'release-1.34'
|
2020-10-14 11:32:50 -04:00 |
|
Isaac Connor
|
e9fb150880
|
Improve error message when a row doesn't exist in the Monitor_Status table
|
2020-10-14 11:32:33 -04:00 |
|
Andrew Bauer
|
c3a98c1f44
|
replace shutdown form submit with ajax
|
2020-10-14 10:03:33 -05:00 |
|
Isaac Connor
|
10c0a6617c
|
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
|
2020-10-14 10:39:25 -04:00 |
|
Isaac Connor
|
cd2e96eaec
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-13 08:42:28 -04:00 |
|
Isaac Connor
|
908c20e959
|
add ZM prefix to Warning
|
2020-10-13 08:42:22 -04:00 |
|
Andrew Bauer
|
1db31ba574
|
remove makePopupLink function. Use makeLink instead
|
2020-10-12 12:20:21 -05:00 |
|
Andrew Bauer
|
0f263407a5
|
make redirect conditional on previous view
|
2020-10-12 10:32:25 -05:00 |
|
Isaac Connor
|
046124fe0e
|
Add AutoUnarchive column, also add Id to querystring if this is a saved Filter
|
2020-10-12 10:54:22 -04:00 |
|
Isaac Connor
|
630d9011f3
|
Fix redirect when saving users
|
2020-10-10 09:48:09 -04:00 |
|
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
|
a39a656373
|
Merge branch 'master' into zma_to_thread
|
2020-09-29 11:02:40 -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 |