Jose Gonzalez
c0abe5edb9
Fix merge
2021-11-04 16:00:05 +01:00
fbsanchez
8652648824
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
2021-10-08 15:51:05 +02:00
marcos
795d5c055a
merge conflict
2021-10-07 09:56:17 +02:00
fbsanchez
dae8a9ba14
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
2021-10-06 14:50:13 +02:00
Daniel Rodriguez
3743fa6ca8
Merge branch 'ent-7922-selector-demasiado-grande-en-creacion-de-modulos' into 'develop'
...
less module selector width
See merge request artica/pandorafms!4384
2021-10-05 09:21:22 +00:00
fbsanchez
696c59b258
WIP NCM
2021-09-29 20:56:39 +02:00
Jose Gonzalez
8696d21a42
Fixed any minor bugs
2021-09-29 17:03:13 +02:00
fbsanchez
8c1838abb7
Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola
...
Conflicts:
pandora_console/install.php
2021-09-29 13:47:10 +02:00
Daniel Rodriguez
4420ecec2c
Merge branch 'ent-7514-pasar-networkmaps-a-open' into 'develop'
...
Ent 7514 pasar networkmaps a open
Closes pandora_enterprise#7514
See merge request artica/pandorafms!4416
2021-09-24 07:14:14 +00:00
fbsanchez
fe42a8782b
Updated messages in centralised environment status check
2021-09-23 11:16:48 +02:00
Jose Gonzalez
cd1b7daa00
Fix select fields size
2021-09-20 12:16:08 +02:00
Jose Gonzalez
3af47c0e5f
Open network maps
2021-09-17 10:45:01 +02:00
Daniel Rodriguez
6fff287b70
Merge branch 'ent-7314-comillas-comandos-remotos' into 'develop'
...
Added tip for notice to users for use single quotation
Closes pandora_enterprise#7314
See merge request artica/pandorafms!4376
2021-09-08 13:14:54 +00:00
José González
740a82253a
Fixed quot string
2021-09-08 12:20:38 +02:00
Jose Gonzalez
e8eb77058b
Fix
2021-09-06 15:19:23 +02:00
marcos
9c425f60e8
less module selector width
2021-09-02 16:56:01 +02:00
Jose Gonzalez
73cd0fd17e
Changed content of advice
2021-09-01 10:29:25 +02:00
José González
84b8973027
Added tip for notice to users for use single quotation
2021-08-27 12:49:27 +02:00
Daniel Rodriguez
16fff8b2f5
Merge branch 'ent-7619-cambiar-parametros-lanzar-snmpwalk-configuracion-modulo' into 'develop'
...
Change snmpwalk behaviour in module configuration
Closes pandora_enterprise#7619
See merge request artica/pandorafms!4221
2021-08-27 10:45:42 +00:00
Daniel Rodriguez
b3336cdc4f
Merge branch 'ent-7563-bug-carga-dinamica-icono-grupos-creacion-agente' into 'develop'
...
Fixed group icon on agent creation
See merge request artica/pandorafms!4145
2021-08-10 07:00:56 +00:00
Daniel Rodriguez
46b17e5156
Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop'
...
fixed xss vulnerability
See merge request artica/pandorafms!4196
2021-08-09 08:59:44 +00:00
Daniel Rodriguez
2963d67225
Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop'
...
Improve code for get secondary groups
Closes pandora_enterprise#7767
See merge request artica/pandorafms!4259
2021-08-02 07:18:02 +00:00
fbsanchez
d3fe504241
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-13 13:14:01 +02:00
Junichi Satoh
512cfb69c5
Fixed 'Keep counters' cannot be cleared in module configuration.
2021-07-13 11:55:49 +09:00
José González
498a353a29
Improve code for get secondary groups
2021-07-02 12:20:53 +02:00
fbsanchez
7e178ed18c
Fix add multiple tags at once into a module definition
2021-06-24 19:58:08 +02:00
fbsanchez
eec373e896
Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url
2021-06-24 19:48:07 +02:00
fbsanchez
4c2ac234b8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
pandora_console/godmode/servers/plugin.php
2021-06-24 14:37:30 +02:00
Luis
497ecb329d
Changed new wiki url on helps
2021-06-24 12:31:15 +00:00
José González
0c5b8766d0
Change snmpwalk behaviour in module configuration
2021-06-18 14:05:59 +02:00
fbsanchez
ae448e6eb8
Some fixes
2021-06-16 20:34:29 +02:00
Daniel Barbero Martin
452d5d0b73
Wip command center, error merge
2021-06-16 19:37:09 +02:00
alejandro.campos@artica.es
cb5905b000
fixed xss vulnerability
2021-06-11 08:52:10 +02:00
Daniel Barbero Martin
9e27843b19
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 08:51:48 +02:00
Junichi Satoh
5fcf3eca23
Fixed problems in planned downtime below.
...
- modules cannot be added to defined planned downtime with 'Quiet' mode.
- pending modules for delete can be selected when modify defined planned downtime.
2021-06-08 14:43:43 +09:00
Daniel Barbero Martin
835aad542f
Wip command center, agent synch
2021-06-07 12:19:03 +02:00
Daniel Barbero Martin
8b7c5c08c6
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-07 08:32:15 +02:00
Marcos Alconada
3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00:00
Daniel Barbero Martin
97595ad973
Wip command center
2021-06-03 10:16:29 +02:00
fbsanchez
70b8eb77a3
Remove service elements when removing items itselves and multiple fixes
2021-06-01 12:12:07 +02:00
Daniel Rodriguez
844f583b0c
Merge branch 'ent-7596-ocultar-campos-http-auth-en-modulos-web' into 'develop'
...
Ocultar campos http auth en modulos web en campo Web Checks
See merge request artica/pandorafms!4162
2021-05-31 11:25:25 +00:00
Calvo
b253a01841
Ocultar campos http auth en modulos web en campo Web Checks
2021-05-28 14:00:43 +02:00
Jose Gonzalez
84902a5d3d
Fixed code
2021-05-28 13:20:16 +02:00
Daniel Rodriguez
3f8d3a883f
Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop'
...
Ent 7002 revision cabeceras tabs
Closes pandora_enterprise#7002
See merge request artica/pandorafms!4094
2021-05-27 16:21:48 +00:00
Luis
8c100e8809
Resize vertical on textarea web/data server modules css
2021-05-26 13:39:25 +00:00
José González
76628117fa
Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs'
...
# Conflicts:
# pandora_console/operation/messages/message_edit.php
2021-05-25 13:50:17 +00:00
Calvo
8019126367
Fixed group icon on agent creation
2021-05-20 17:15:27 +02:00
Daniel Rodriguez
b8fe685028
Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop'
...
implemented user level authentication for integria ims integration
See merge request artica/pandorafms!4117
2021-05-17 14:41:11 +00:00
José González
998fb4b0dc
Fixed issue with undesired deactivate dynamic threshold max field
2021-05-14 11:22:32 +02:00
Alejandro Campos
caaa9c407e
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
...
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00