Isaac Connor
|
4922861d1d
|
Merge branch 'master' into fix_token_auth_sessions
|
2019-08-12 13:59:11 -04:00 |
|
Isaac Connor
|
38a09bbd18
|
Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas
|
2019-08-08 15:34:07 -04:00 |
|
Isaac Connor
|
5f77634aca
|
Update Group object to use shared code in Object.php. Should fix #2659
|
2019-08-08 13:51:56 -04:00 |
|
Isaac Connor
|
702cb65d2a
|
Merge branch 'storageareas'
|
2019-08-08 13:38:36 -04:00 |
|
Isaac Connor
|
45b970fb09
|
fix spacing
|
2019-08-08 13:34:28 -04:00 |
|
Isaac Connor
|
df285006d2
|
change sortHeader to include eid if it is in the request
|
2019-08-08 13:34:10 -04:00 |
|
Isaac Connor
|
a9de537e01
|
Merge branch 'master' into storageareas
|
2019-08-08 09:27:27 -04:00 |
|
Isaac Connor
|
1892528679
|
quotes
|
2019-08-08 09:26:15 -04:00 |
|
Isaac Connor
|
5b0509e000
|
When invalid operator terms, use print_r on the term instead of just the operator
|
2019-08-08 09:26:00 -04:00 |
|
Isaac Connor
|
3a142df14f
|
Only send zmdc.pl commands for filters to running servers
|
2019-08-07 15:51:01 -04:00 |
|
Isaac Connor
|
fb414b3f19
|
remove debug statements
|
2019-08-07 15:34:45 -04:00 |
|
Isaac Connor
|
fb7ab993b5
|
Have to include the --daemon param when telling zmdc.pl what to do with zmfilter.pl
|
2019-08-07 15:34:30 -04:00 |
|
Isaac Connor
|
d4b59211cd
|
Merge branch 'master' into storageareas
|
2019-08-07 11:21:19 -04:00 |
|
Isaac Connor
|
962049fa31
|
Merge branch 'master' into filter_add_copy
|
2019-08-06 20:17:21 -04:00 |
|
Isaac Connor
|
7e6b0058d2
|
Update Zone buttons. Fix double submit. Fixes #2671
|
2019-08-02 08:04:38 -04:00 |
|
Isaac Connor
|
6a425b6988
|
If token is present do token based auth and do not do anything with session
|
2019-08-01 10:02:31 -04:00 |
|
Isaac Connor
|
7f19831e0c
|
Use isset when testing for existence of authash in session
|
2019-07-29 14:54:55 -04:00 |
|
Isaac Connor
|
8167ff2143
|
fix eslint
|
2019-07-26 12:28:02 -04:00 |
Isaac Connor
|
547e80b1a9
|
Fix download and export button from events list. Fixes #2668 (#2670)
|
2019-07-24 12:31:43 -04:00 |
|
Isaac Connor
|
a6a2239e5b
|
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists (#2662)
|
2019-07-24 11:39:21 -04:00 |
|
Isaac Connor
|
39262d55f5
|
Also show secondary storage area when viewing event
|
2019-07-24 11:26:07 -04:00 |
|
Isaac Connor
|
2d46f2adab
|
add Secondary Storage Area options.
|
2019-07-24 11:25:51 -04:00 |
|
Isaac Connor
|
1a0beab703
|
add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key
|
2019-07-24 11:25:38 -04:00 |
|
Isaac Connor
|
1254e8ab67
|
Add AttrSecondaryStorageArea to lang
|
2019-07-24 11:24:50 -04:00 |
|
Isaac Connor
|
45afc2a534
|
introduce array_recursive_diff which we use to compare two arrays in Object::changes
|
2019-07-24 11:24:37 -04:00 |
|
Isaac Connor
|
e3a9d5d488
|
Rewrite changes to run through the keys of the passed in new values array, and handle object methods as well as basic values
|
2019-07-24 11:24:14 -04:00 |
|
Isaac Connor
|
341f4adbdf
|
Functions that change the Query must reset Query_json as well
|
2019-07-24 11:23:38 -04:00 |
|
Isaac Connor
|
58851d23d2
|
Add Secondary Storage support to the Event object
|
2019-07-24 11:22:55 -04:00 |
|
Isaac Connor
|
a4a144d2fa
|
Merge branch 'master' into filter_add_copy
|
2019-07-23 10:04:23 -04:00 |
|
Isaac Connor
|
88beb46c3e
|
Add FilterCopyEvents
|
2019-07-23 10:04:15 -04:00 |
|
Isaac Connor
|
df0aef89af
|
gracefully handle when window[fnName] doesn't exist
|
2019-07-23 10:03:28 -04:00 |
|
Isaac Connor
|
0e040fc2fc
|
Add click_autocopy function
|
2019-07-23 10:00:05 -04:00 |
|
Isaac Connor
|
346933126d
|
Update filter view to use Filter::find
|
2019-07-23 09:59:49 -04:00 |
|
Isaac Connor
|
9b6dedb35d
|
Update Filter saving action to use object set/save etc
|
2019-07-23 09:58:28 -04:00 |
|
Isaac Connor
|
35ec60ca03
|
Change Storage object to extend ZM_Object
|
2019-07-23 09:58:05 -04:00 |
|
Isaac Connor
|
7c52f8a4ae
|
Fixes and add Objects_Indexed_By_Id
|
2019-07-23 09:57:44 -04:00 |
|
Isaac Connor
|
b05aff1d5d
|
Update Filter Object to extend ZM_Object. Rename Query to Query_json and implement a Query function to parse Query_json
|
2019-07-23 09:57:16 -04:00 |
|
Isaac Connor
|
fe71a9abaa
|
php_errormsg is deprecated
|
2019-07-19 16:32:40 -04:00 |
Pliable Pixels
|
a9d01ba3d2
|
Alarm api (#2665)
* fixed alarm api to use tokens if present
* clearer debug logs for tokens
* space
|
2019-07-17 20:38:58 -04:00 |
|
Isaac Connor
|
d244aadee6
|
Fix #2655
|
2019-07-08 14:27:49 -04:00 |
|
Isaac Connor
|
df8c46f0f0
|
Fix #2657
|
2019-07-08 14:22:46 -04:00 |
|
Isaac Connor
|
da5e8d19b8
|
Fix #2656
|
2019-07-07 17:54:45 -04:00 |
|
Isaac Connor
|
b84e3499f4
|
Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message
|
2019-07-07 17:25:49 -04:00 |
|
Isaac Connor
|
4b41655dc5
|
fix
|
2019-07-07 16:10:53 -04:00 |
|
Isaac Connor
|
3c1cd1e750
|
rename var from nevents to nFrames because that's what they are. Fix an error when page=0
|
2019-07-07 16:03:54 -04:00 |
|
Isaac Connor
|
256a0aa679
|
google code style
|
2019-07-04 09:04:43 -04:00 |
|
Isaac Connor
|
2470c09b20
|
Honour thumbnail width when bringing up frames popup for frames and alarm frames
|
2019-07-03 17:19:10 -04:00 |
|
Isaac Connor
|
268bc2264b
|
Merge branch 'storageareas'
|
2019-07-02 10:19:03 -04:00 |
|
Isaac Connor
|
1161c251fc
|
Add a warning when the monitor is not capturing in live view
|
2019-06-28 10:28:53 -04:00 |
|
Isaac Connor
|
d972ab6006
|
add min_section_length test to alarmed events that go unalarmed
|
2019-06-27 21:50:12 -04:00 |