Isaac Connor
8837015239
remove bogus test for Filter Id
2019-02-19 13:54:25 -05:00
Isaac Connor
6d1541a4d2
Merge branch 'fix_privacy_view' into storageareas
2019-02-19 12:57:01 -05:00
Isaac Connor
97a888c0db
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again.
2019-02-19 12:54:12 -05:00
Isaac Connor
b25770a2f0
Merge branch 'master' into storageareas
2019-02-13 11:52:31 -05:00
Isaac Connor
d0745da11c
fix path to Control.php
2019-02-13 11:52:16 -05:00
Isaac Connor
a3374aa26c
Merge branch 'reload_zmfilter_on_filter_save' into storageareas
2019-02-11 13:26:53 -05:00
Isaac Connor
5695be9f32
rough in a control function in Filter object. Use it to start/stop zmfilter processes when filters are deleted or Saved.
2019-02-11 13:21:00 -05:00
Matthew Noorenberghe
cdbd59f054
bandwidth.php: Submit to the 'bandwidth' view but render the 'none' view. Fixes #2493
2019-02-10 13:22:08 -08:00
Isaac Connor
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
Matthew Noorenberghe
a97711de89
Replace or sanitize remaining uses of PHP_SELF. Fixes #2446
2019-02-09 22:12:36 -08:00
Isaac Connor
141f2afc8c
Merge branch 'master' into storageareas
2019-02-05 15:46:58 -05:00
Isaac Connor
c54fe7e89a
fix state actions
2019-02-05 12:35:06 -05:00
Isaac Connor
71f961d012
remove redirect to console on login, as it is done in javascript after Logging in message is displayed
2019-01-30 16:05:51 -05:00
Isaac Connor
9a3aa49bae
Merge branch 'fix_bandwidth' into storageareas
2019-01-30 15:18:16 -05:00
Isaac Connor
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
Isaac Connor
604dbf8776
fix state changing/etc
2019-01-30 14:36:46 -05:00
Isaac Connor
2e2404643f
Fix bandwidth due to new actions code. Update buttons on bandwidth popup
2019-01-30 13:20:24 -05:00
Isaac Connor
6eb4d7ae27
Filter improvements ( #2438 )
...
* Put back code to close the popup when view is none
* clean up and reduce depth of some logic
* Increase width of user popup
* fix code style
* Make execute_filter work on a filter Id instead of name
* rework logic to reduce code depth. Change view to events to display the results of execute.
* Change the redirect to stay on the new view. When redirecting from executing a filter, it was redirecting to filter.
* Set a form action for correctness. Change execute button to a button instead of a submit. Stay on the filter view when executing
2019-01-23 11:30:51 -05:00
Isaac Connor
cc8de69eba
Merge branch 'master' into storageareas
2019-01-22 11:44:42 -05:00
Isaac Connor
ae703c45ee
Set closePopup=true so that we don't need code in the none view to close the popup. The common code in skin.js will take care of it.
2019-01-22 09:14:33 -05:00
Isaac Connor
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
Isaac Connor
b24b930f65
After login go to postlogin, not console. the login view is in a popup so we want to close
2019-01-21 11:15:36 -05:00
Isaac Connor
552e14a971
Merge branch 'master' into storageareas
2019-01-18 10:36:59 -05:00
Isaac Connor
599769b701
rework logic of functions to be more verbose about errors. Implement javascript Nonce support when view=none
2019-01-17 08:50:33 -05:00
Isaac Connor
fc7403fe3d
Merge branch 'master' into storageareas
2019-01-13 14:53:34 -05:00
Isaac Connor
c834fbe462
the filter action should singular filter, not filters
2019-01-13 14:52:39 -05:00
Isaac Connor
b373577589
fix function view after actions cleanup
2019-01-10 12:08:25 -05:00
Isaac Connor
f3a807f1f8
Merge branch 'master' into storageareas
2019-01-07 09:21:25 -05:00
Isaac Connor
b4f8500cb5
Merge branch 'split_actions'
2019-01-05 18:33:04 -05:00
Isaac Connor
3f10553464
Fix include path to Monitors.php
2019-01-05 18:32:53 -05:00
Isaac Connor
1a75cf333e
Merge branch 'master' into storageareas
2019-01-05 11:12:38 -05:00
Isaac Connor
e34a5e972a
fix missing }
2019-01-05 11:12:26 -05:00
Isaac Connor
8eb61b1c11
Merge branch 'master' into storageareas
2019-01-05 10:16:38 -05:00
Isaac Connor
5b5905c83a
We always use markEids[] now
2019-01-04 16:29:16 -05:00
Isaac Connor
0e20666992
fix eventdetail actions being in events
2019-01-04 15:43:31 -05:00
Isaac Connor
52466c398b
Merge branch 'split_actions' into storageareas
2019-01-04 15:28:55 -05:00
Isaac Connor
e2f32ab091
Upgrade config saving
2019-01-04 09:43:36 -05:00
Isaac Connor
7ec96655c3
fix missing ! when testing for permission on editing config
2019-01-04 09:37:26 -05:00
Isaac Connor
6cad852e11
fix path to MontageLayout
2019-01-04 09:34:18 -05:00
Isaac Connor
dbe9817bc8
Split actions.php into individual files per view
2019-01-04 09:26:34 -05:00