tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,205 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

29205 Commits

Author SHA1 Message Date
Daniel Barbero Martin dae6182ef0 wip reports alert actions 2021-11-25 17:28:00 +01:00
Daniel Maya 2894d23e40 #7316 Fixed config_url 2021-11-25 16:15:44 +01:00
alejandro.campos@artica.es d94ed13f76 minor fixes 2021-11-25 15:03:46 +01:00
alejandro.campos@artica.es 6469f8053d minor fixes 2021-11-25 15:00:57 +01:00
Jose Gonzalez b151b3996d Fixed issue with events 2021-11-25 13:52:53 +01:00
Daniel Maya 4211327275 #8260 Fixed Integria IMS Ticket edit in metaconsole 2021-11-25 13:17:12 +01:00
Ramon Novoa 5bf83bcc81 Add support for percentage module status thresholds. 2021-11-25 12:58:21 +01:00
Daniel Rodriguez 05e61492c0 Merge branch 'ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado' into 'develop' 
Ent 8228 se puede crear/editar/borrar un usuario desde cli en nodo centralizado

See merge request artica/pandorafms!4544
 2021-11-25 10:52:58 +00:00
Daniel Rodriguez f66d6e7f9c Merge branch 'ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado' into 'develop' 
Ent 8224 se puede crear/editar/borrar un grupo desde el cli en nodo centralizado

See merge request artica/pandorafms!4542
 2021-11-25 10:52:08 +00:00
Daniel Barbero Martin f7233604fe Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-25 08:19:35 +01:00
Daniel Barbero Martin 8746db24c9 demo 2021-11-25 08:19:05 +01:00
artica 1f428a25ad Auto-updated build strings. 2021-11-25 01:00:20 +01:00
fbsanchez ba8087f49b ncm2 with schedules 2021-11-24 22:01:21 +01:00
Daniel Rodriguez 5fcabbf959 Merge branch 'ent-7902-Bug-visual-en-modal-de-edición-de-acciones-de-alertas' into 'develop' 
Ent 7902 bug visual en modal de edición de acciones de alertas

See merge request artica/pandorafms!4541
 2021-11-24 17:20:35 +00:00
Daniel Rodriguez fff8f910f8 Merge branch 'ent-8015-palabras-conflictivas' into 'develop' 
Removed some cheerful words in the project

Closes pandora_enterprise#8015

See merge request artica/pandorafms!4460
 2021-11-24 17:18:38 +00:00
Daniel Maya 922088c306 resolved conflict 2021-11-24 17:48:34 +01:00
Daniel Maya 4185e34984 Merge branch 'develop' into ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado 2021-11-24 17:47:33 +01:00
Daniel Maya 0d2e4a99a3 resolved conflict 2021-11-24 17:46:23 +01:00
artica 3ec3e5e0a2 Updated version and build strings. 2021-11-24 17:45:09 +01:00
Daniel Maya 3cc3cef7fa oMerge branch 'develop' into ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado 2021-11-24 17:36:48 +01:00
Daniel Maya 716e04a6b1 #8224 Fixed print_log 2021-11-24 16:11:32 +01:00
Daniel Maya f52dc0c319 #8228 Fixed print_log 2021-11-24 16:07:20 +01:00
Daniel Rodriguez eb4666e2c2 Merge branch 'ent-8294-Graficos-de-area-se-ven-como-graficos-de-linea' into 'develop' 
fix chart area

See merge request artica/pandorafms!4546
 2021-11-24 14:45:39 +00:00
Daniel Rodriguez e3d7134dc8 Merge branch 'ent-8278-No-funcionan-las-gráficas-de-Agente-en-la-versión-Opensource' into 'develop' 
Ent 8278 no funcionan las gráficas de agente en la versión opensource

See merge request artica/pandorafms!4538
 2021-11-24 14:43:52 +00:00
Daniel Maya b3fcb689a8 #8262 Fixed pagination 2021-11-24 15:27:53 +01:00
Calvo f76670dd28 Fix delete agent secondary ip bug 2021-11-24 14:39:42 +01:00
Calvo d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00
Calvo 5464a73a12 Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor 2021-11-24 13:28:36 +01:00
Calvo 33a24533e1 Added new token percentage_warning and percentage_critical to pandoradb_data on tpolicy_modules 2021-11-24 13:27:33 +01:00
Daniel Rodriguez 8ed3042f9a Merge branch 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' into 'develop' 
added resolution field in creation and update operations

See merge request artica/pandorafms!4534
 2021-11-24 11:20:18 +00:00
Calvo 4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +01:00
Daniel Rodriguez 07ef0477af Merge branch 'ent-8301-Fallo-pandora-manage-pl' into 'develop' 
minor fix

See merge request artica/pandorafms!4548
 2021-11-24 10:23:48 +00:00
Daniel Barbero Martin 7a5f91188b Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 
Conflicts:
	pandora_console/include/functions_html.php
 2021-11-24 08:39:03 +01:00
artica 98f4bfbcc1 Auto-updated build strings. 2021-11-24 01:00:10 +01:00
fbsanchez ce00d59f00 ncm2 2021-11-23 20:31:04 +01:00
Daniel Barbero Martin e0fec6470d minor fix 2021-11-23 18:04:34 +01:00
alejandro.campos@artica.es 08ad73e34e minor fix 2021-11-23 16:29:25 +01:00
fbsanchez cbbfc337df errata fix 2021-11-23 14:33:59 +01:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-23 14:29:23 +01:00
fbsanchez 41dcc95d5a db changes 2021-11-23 14:26:11 +01:00
Daniel Barbero Martin aae0016191 fix chart area 2021-11-23 13:14:56 +01:00
Jose Gonzalez 67f893f4ee Fixed issue 2021-11-23 12:50:12 +01:00
Daniel Maya 90739088f4 #8228 Added centralised node check 2021-11-23 12:43:07 +01:00
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +01:00
Daniel Maya c5588197f2 #8224 centralised node check added 2021-11-23 12:23:27 +01:00
artica fee6b06a2a Updated version and build strings. 2021-11-23 11:28:02 +01:00
Daniel Maya 3bfce928c4 #7902 Fixed add and update actions 2021-11-23 10:53:51 +01:00
Daniel Rodriguez c096a244f6 Merge branch 'ent-8254-filtro-select-grupo-no-busca-sin-permiso-directo' into 'develop' 
Select group search filter working on groups' child

See merge request artica/pandorafms!4535
 2021-11-23 09:38:22 +00:00
Daniel Barbero Martin 02b3bc8574 fix setup centraliced active directory 2021-11-23 10:18:20 +01:00
artica feedce5a61 Auto-updated build strings. 2021-11-23 01:00:18 +01:00