Daniel Rodriguez
7a614fcf48
Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop'
...
Ent 6354 bug de creacion de dashboard con permisos no all
See merge request artica/pandorafms!3780
2021-01-25 10:02:41 +01:00
alejandro-campos
731d486455
changed behavior of All group and fixed acl vulnerability
2021-01-20 18:22:43 +01:00
Daniel Maya
adf4c988ec
Added warning
2021-01-19 16:03:34 +01:00
Jose Gonzalez
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
fbsanchez
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
fbsanchez
f69166bd53
Updates style width group selector
2020-09-28 18:04:46 +02:00
Daniel Rodriguez
0d19f500b1
Merge branch 'ent-6153-AADCM-Reset-counter-for-non-sustained-alerts' into 'develop'
...
checkd option by default on creation
See merge request artica/pandorafms!3454
2020-09-18 09:27:22 +02:00
Jose Gonzalez
0e3c10a698
Merge
2020-09-17 10:35:18 +02:00
alejandro-campos
5bd208a95c
checkd option by default on creation
2020-09-14 13:43:18 +02:00
José González
85d8e1f796
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql
# pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
daniel
f3ad52e0fa
Ent 5532 edicion creacion de templates acciones comandos modo centralizado
2020-07-13 12:23:46 +02:00
Jose Gonzalez
5e039adb26
Solve the issue for alerts, os names and tags
2020-07-07 11:05:19 +02:00
marcos
40c0d4ea09
fixed error
2020-06-18 17:09:22 +02:00
Manuel Montes
611291c217
Ent 5428 revision total de ayudas hint wiki
2020-05-29 11:37:06 +02:00
Daniel Maya
c7e6f9fd34
Added disable event in alert template
2020-03-23 11:34:37 +01:00
Jose Gonzalez
d181d5357b
Created function for initialize TinyMCE
2019-11-26 13:19:28 +01:00
manuel
b89751e647
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
2019-05-14 11:50:07 +02:00
manuel
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
manuel
c075d5caad
Added condition type not normal in alert templates
...
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
artica
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es
61a3d147af
Added descriptive error messages - #2858
2018-10-03 16:41:58 +02:00
Alejandro Gallardo Escobar
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar
fac3e21829
Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone
2018-06-11 16:40:10 +02:00
fermin831
358847ecef
[Rebranding] Open godmode/<others>
2018-05-10 15:43:46 +02:00
danielmaya
e4f24b2452
Fixed json in audit log
2018-04-05 16:57:26 +02:00
m-lopez-f
fcf3da2acf
Remove temporality links to help. And in future chenge this help
2017-04-20 12:10:52 +02:00
Arturo Gonzalez
83776e46d1
Changed some texts in pandora. Ticket #347
2017-02-22 12:36:30 +01:00
Arturo Gonzalez
3e0b0f231b
Added more fields to alert macro fields. Ticket #233
2017-02-06 16:20:39 +01:00
daniel
e48e1ddd7e
ticket: 4069 add actions for defect in templates html #4069
2016-09-29 14:30:07 +02:00
Junichi Satoh
e2ad075152
Added a new feature to the alert template.
...
It allows to reset minimum number of alert when the alert status is not
continuously.
2016-03-09 11:33:01 +09:00
m-lopez-f
13b480ec92
Fixed width of field in alerts template. Tiquet: #2951
...
(cherry picked from commit 005da0e3e2
)
2015-11-04 11:12:51 +01:00
m-lopez-f
be7e8aa567
Change form of search data in orcle
2015-09-11 12:58:13 +02:00
m-lopez-f
09f6b7a29a
Fixed styles metaconsole
2015-07-07 13:57:47 +02:00
m-lopez-f
5b4214277b
Changed of visual
2015-06-25 10:07:53 +02:00
m-lopez-f
ff1186ee57
Changed visual of console
2015-06-16 16:09:50 +02:00
mdtrooper
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
mdtrooper
f84863540f
Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs).
2015-04-10 00:58:24 +02:00
m-lopez-f
58722a5891
Changed visual of metaconsole
2015-03-06 12:28:05 +01:00
mdtrooper
d01b82bc3b
Fixed the english message of my last commit. Thanks Sancho.
2014-09-10 18:04:59 +02:00
mdtrooper
5655a7d16f
Fixed the templates with equal min and max as 0. TICKETS #1245
2014-09-10 16:33:19 +02:00
mdtrooper
a6197fccb2
2014-07-31 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions_networkmap.php, include/functions_graph.php,
include/db/postgresql.php, include/db/oracle.php,
include/functions_api.php, extensions/agents_alerts.php,
operation/search_main.php, operation/search_agents.getdata.php,
operation/agentes/status_monitor.php,
operation/agentes/networkmap.topology.php,
operation/agentes/ver_agente.php,
operation/search_modules.getdata.php, operation/search_results.php,
operation/events/events_list.php,
godmode/alerts/alert_list.builder.php,
godmode/alerts/configure_alert_template.php,
godmode/modules/manage_network_components_form.php,
godmode/reporting/reporting_builder.php,
godmode/reporting/map_builder.php: tiny fixes for the improve the
support of postgreSQL databases.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-31 14:27:43 +00:00
mdtrooper
ab110f04ad
2014-06-02 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/alerts/configure_alert_template.php,
godmode/reporting/reporting_builder.item_editor.php,
godmode/agentes/planned_downtime.editor.php, godmode/setup/news.php,
include/ajax/module.php, include/functions.php,
include/functions_ui.php, extensions/insert_data.php,
operation/netflow/nf_live_view.php,
operation/reporting/reporting_viewer.php,
operation/reporting/graph_viewer.php, operation/tree.php,
operation/agentes/datos_agente.php,
operation/agentes/estado_monitores.php: fixed the i18n of the
timepicker.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10076 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-02 15:57:36 +00:00
alexhigh
5f7feb75aa
2014-05-07 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* godmode/agentes/planned_downtime.editor.php,
godmode/alerts/configure_alert_template.php,
godmode/reporting/reporting_builder.item_editor.php,
operation/netflow/nf_live_view.php: Changed the maximum
character length of the time inputs from 7 to 8.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9878 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-07 14:14:23 +00:00
zarzuelo
db9b118bdb
2014-03-05 Sergio Martin <sergio.martin@artica.es>
...
* include/styles/pandora.css
include/javascript/pandora_alerts.js
extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql
extras/pandoradb_migrate_4.1_to_5.0.oracle.sql
extras/pandoradb_migrate_4.1_to_5.0.mysql.sql
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
extras/check_other_languages.sh
extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql
extras/network_components.postgreSQL.sql
extras/network_components.oracle.sql
extras/network_components.mysql.sql
godmode/alerts/alert_actions.php
godmode/alerts/alert_commands.php
godmode/alerts/alert_view.php
godmode/alerts/configure_alert_template.php
godmode/alerts/alert_templates.php
godmode/alerts/configure_alert_action.php: Clean sql scripts,
reorganise the alert template creation interface, add field1
to template recovery fields and add action recovery fields.
Ticket #501
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9505 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 11:34:05 +00:00
zarzuelo
364bc423bd
2013-07-30 Sergio Martin <sergio.martin@artica.es>
...
* include/ajax/module.php
extensions/insert_data.php
operation/tree.php
operation/reporting/reporting_viewer.php
operation/reporting/graph_viewer.php
operation/agentes/datos_agente.php
godmode/agentes/planned_downtime.editor.php
godmode/alerts/configure_alert_template.php
godmode/reporting/reporting_builder.item_editor.php: Change
the inclusion of timepicker language file from jquery include
function to manually way to avoid jQuery errors
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8598 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-30 14:59:19 +00:00
zarzuelo
f2450b3e8c
2013-07-25 Sergio Martin <sergio.martin@artica.es>
...
* godmode/alerts/configure_alert_template.php: Fix alert
template hint javascript problem for bug #2357
* godmode/massive/massive_edit_modules.php: Change
help tip to clarify user experience
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8578 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-25 15:30:17 +00:00
Ramon Novoa
52bf1fb57c
2013-07-24 Ramon Novoa <rnovoa@artica.es>
...
* godmode/alerts/configure_alert_template.php: Fixed a translation that
broke the javascript.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8567 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-24 14:00:46 +00:00
zarzuelo
54eb30bddf
2013-07-17 Sergio Martin <sergio.martin@artica.es>
...
* operation/agentes/status_monitor.php
operation/agentes/alerts_status.php
godmode/alerts/configure_alert_template.php: Clean
useless ACL checks. Change header string by the same
string but translated. Added to the alert templates
wizard level combo the option No Wizard to avoid
confussing
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8534 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 10:31:31 +00:00
mariopulido
20e0859b7d
2013-06-19 Mario Pulido <mario.pulido@artica.es>
...
*godmode/alerts/alert_list.php,
godmode/alerts/configure_alert_template.php,
godmode/alerts/alert_templates.php,
godmode/alerts/configure_alert_action.php,
godmode/alerts/configure_alert_command.php,
godmode/alerts/alert_actions.php,
godmode/alerts/alert_commands.php,
include/help/en/help_event_alert.php,
include/help/en/help_alerts_config.php,
include/help/es/help_event_alert.php,
include/help/es/help_alerts_config.php,
include/help/ja/help_event_alert.php,
images/help/alert01.png,
images/help/alert02.png,
images/help/alert03.png,
images/help/alert04.png,
images/help/alert05.png,
images/help/alert06.png,
images/help/alert07.png,
images/help/alert08.png,
images/help/alert09.png,
images/help/event01.png,
images/help/event02.png,
images/help/event03.png,
images/help/event04.png,
images/help/alert10.png,
images/help/alert11.png,
images/help/alert12.png,
images/help/alert13.png,
images/help/alert14.png,
images/help/alert15.png,
images/help/alert16.png: Added new helps
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-19 16:28:30 +00:00
mdtrooper
6ff1234704
2013-06-11 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/alerts/configure_alert_template.php,
godmode/reporting/reporting_builder.item_editor.php,
godmode/agentes/planned_downtime.editor.php,
operation/reporting/reporting_viewer.php,
operation/netflow/nf_live_view.php: added lost help tips for the
formats time and date.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8288 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-11 13:39:03 +00:00