jose.gonzalez@pandorafms.com
a688182062
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com
8e0e249b81
Fixed views and styles
2022-11-21 14:49:07 +01:00
Calvo
43fd43d0d5
Updated php versopm notifications to php8
2022-11-15 10:29:15 +01:00
Daniel Maya
564cd837ae
#9292 code refactoring
2022-11-14 17:43:35 +01:00
Rafael Ameijeiras
43690d3aa6
Merge branch 'ent-9745-XSS' into 'develop'
...
fixed vulnerability in load of help iframes
See merge request artica/pandorafms!5245
2022-11-08 11:49:46 +00:00
Jimmy Olano
a548d2a798
Merge branch 'ent-9722-cartel-de-licencia-expirada' into 'develop'
...
Ent 9722 cartel de licencia expirada
#9722
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9722
See merge request artica/pandorafms!5237
2022-11-04 10:07:56 +00:00
edu.corral
fb4b42e6c5
ent 9722 expired license notifications
2022-11-03 13:55:06 +01:00
alejandro.campos@artica.es
2c7d7e4044
fixed vulnerability in load of help iframes
2022-11-03 13:53:10 +01:00
Daniel Rodriguez
e52da7d379
Merge branch 'ent-9105-poder-anadir-colecciones-al-satellite-server' into 'develop'
...
Ent 9105 poder anadir colecciones al satellite server
See merge request artica/pandorafms!5202
2022-11-03 10:28:32 +00:00
jose.gonzalez@pandorafms.com
32466c6906
Changes
2022-11-03 10:18:17 +01:00
edu.corral
8d34ef88c5
ent 9722 expired licence notification
2022-11-02 09:19:15 +01:00
jose.gonzalez@pandorafms.com
195611a3c1
Adapt views and refactor
2022-10-28 15:01:00 +02:00
Daniel Maya
382e74ae36
resolved conflict
2022-10-27 09:42:40 +02:00
alejandro.campos@artica.es
8d611a8e7f
implemented float formatting and option in reports to change visualization format
2022-10-26 18:25:16 +02:00
jose.gonzalez@pandorafms.com
edbf7ff249
Adapted views
2022-10-26 17:04:50 +02:00
jose.gonzalez@pandorafms.com
5aaa415ed9
Several fixes
2022-10-25 17:11:18 +02:00
jose.gonzalez@pandorafms.com
dd7f378354
WelcomeWindow buttons
2022-10-25 16:25:34 +02:00
jose.gonzalez@pandorafms.com
13b0c7d0c8
Fixed views
2022-10-25 13:13:52 +02:00
jose.gonzalez@pandorafms.com
00de0faac3
Adapted views
2022-10-24 19:55:22 +02:00
Daniel Rodriguez
f57876b332
Merge branch 'ent-9591-mejoras-vista-administracion-agentes-satellite' into 'develop'
...
Ent 9591 mejoras vista administracion agentes satellite
See merge request artica/pandorafms!5190
2022-10-21 11:09:21 +00:00
Diego Muñoz-Reja
423d4b8763
Merge branch 'ent-9641-mejorar-heatmaps' into 'develop'
...
Ent 9641 mejorar heatmaps
See merge request artica/pandorafms!5196
2022-10-21 09:29:40 +00:00
Daniel Rodriguez
77cb8be6cc
Merge branch 'ent-2190-filtros-en-migracion-de-agentes-metaconsola' into 'develop'
...
Added id to form on html print form grid
See merge request artica/pandorafms!5181
2022-10-21 09:26:26 +00:00
Calvo
2d71c75405
Added title to printFormAsGrid
2022-10-20 13:42:08 +02:00
jose.gonzalez@pandorafms.com
f2ebd96cc8
WIP: Created new way to do the menus
2022-10-20 09:43:02 +02:00
Daniel Rodriguez
35fcfa275f
Merge branch 'ent-9117-diferencia-de-estilos-en-mouseovers-del-tree-view-de-servicios' into 'develop'
...
Ent 9117 diferencia de estilos en mouseovers del tree view de servicios
See merge request artica/pandorafms!5185
2022-10-20 07:13:39 +00:00
Daniel Maya
bfc1289ba6
#9105 Added collections satellite
2022-10-19 13:59:16 +02:00
Diego Muñoz-Reja
dfb5776f68
Merge branch 'ent-8648-Improvement-for-SNMP-interface-wizard' into 'develop'
...
Added default definition for SNMP Interface Wizard
See merge request artica/pandorafms!5168
2022-10-18 09:25:17 +00:00
Daniel Maya
0db0b50ebd
#9641 heatmap changes 2
2022-10-17 10:32:28 +02:00
Daniel Maya
f3bae30f55
#9641 heatmap changes
2022-10-14 13:53:05 +02:00
Jimmy Olano
0fb44c923a
Merge branch 'ent-9303-derivado-del-trabajo-q-a-764-icono-show-extended-info-en-system-audit-log-no-funciona' into 'develop'
...
Ent 9303 derivado del trabajo q a 764 icono show extended info en system audit log no funciona
#9303
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9303
See merge request artica/pandorafms!5139
2022-10-13 16:27:51 +00:00
Daniel Maya
5e062b2a51
#9591 added dialog
2022-10-11 17:22:53 +02:00
edu.corral
a078fb790a
ent 9117 service tree mouseover
2022-10-11 09:46:53 +02:00
Daniel Maya
bf0d7ff687
#4043 added wizard snmp
2022-10-10 13:27:19 +02:00
Daniel Maya
7f220eae19
#4043 Added wizard WMI
2022-10-07 10:06:35 +02:00
Calvo
7eb1aa5549
Added id to form on html print form grid
2022-10-06 19:58:28 +02:00
Daniel Maya
e743c57a71
#4043 added SNMP
2022-10-05 15:47:49 +02:00
Daniel Maya
eefb872c47
#9604 Fixed delete_host and ignore_host 2
2022-10-04 13:16:39 +02:00
Daniel Maya
66e083a964
#9604 Fixed delete_host and ignore_host
2022-10-04 10:58:30 +02:00
Daniel Maya
767ca3732b
#4043 Added WMI
2022-10-04 09:57:31 +02:00
Daniel Maya
c1b4501da5
resolved conflict
2022-10-03 14:41:14 +02:00
José González
9f800df034
Added default definition for SNMP Interface Wizard
2022-10-03 12:41:55 +02:00
Daniel Rodriguez
74e291696a
Merge branch 'ent-9334-mejorar-seccion-de-administrar-host-para-la-configuracion-remota-del-satellite' into 'develop'
...
Ent 9334 mejorar seccion de administrar host para la configuracion remota del satellite
See merge request artica/pandorafms!5117
2022-09-30 09:41:57 +00:00
Daniel Maya
2d31c7b116
#9334 fixed regex
2022-09-30 09:16:31 +02:00
Daniel Maya
ee83cbf155
#9334 Fixed satellite host 2
2022-09-29 16:17:41 +02:00
Daniel Rodriguez
637fae3e8d
Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop'
...
Ent 8898 anida mapas de red no actualizan bien
See merge request artica/pandorafms!5143
2022-09-29 12:36:37 +00:00
Daniel Maya
6babb50608
#9334 Fixed satellite host
2022-09-28 15:00:46 +02:00
Diego Muñoz-Reja
4fba7077ec
Merge branch 'ent-9255-error-en-notificacion-consola-php-8-y-mysql-8' into 'develop'
...
Ent 9255 error en notificacion consola php 8 y mysql 8
See merge request artica/pandorafms!5081
2022-09-26 13:07:50 +00:00
Daniel Maya
67c8a945bf
resolved conflict
2022-09-26 11:08:18 +02:00
edu.corral
6a93b4d554
ent 9303 audit log extended info
2022-09-23 11:35:17 +02:00
Daniel Maya
96f81475f7
resolved conflict
2022-09-23 09:20:59 +02:00
Daniel Rodriguez
c34328583f
Merge branch 'ent-8978-derivado-del-trabajo-q-a-762-lts-servidores-pfms-sin-dig-ni-y-o-whois-instalado' into 'develop'
...
Ent 8978 derivado del trabajo q a 762 lts servidores pfms sin dig ni y o whois instalado
See merge request artica/pandorafms!5082
2022-09-22 08:21:41 +00:00
Daniel Maya
cd199e233d
#9334 Added improve in satellite hosts
2022-09-19 12:17:24 +02:00
Daniel Maya
d53ee55663
#9331 Fixed wizard wmi
2022-09-08 15:18:48 +02:00
Calvo
415e1a589e
Included dig/whois dependencies
2022-09-06 10:10:41 +02:00
Daniel Maya
451d984dba
#9255 Fixed max_input_time notify
2022-09-06 09:24:44 +02:00
Daniel Maya
bb691c2e16
#8889 Fixed refresh and duplicate relations
2022-08-31 10:08:20 +02:00
Daniel Maya
16554cfc7a
#8898 networkmap
2022-08-29 09:39:47 +02:00
Daniel Maya
182bb2d2c4
8898 Refresh time
2022-08-23 11:17:48 +02:00
Daniel Maya
6cf8fdad39
#9348 improved usability
2022-08-16 14:07:25 +02:00
Daniel Maya
2f9d1de8b4
#9343 Not closing the modal window
2022-08-11 12:46:25 +02:00
Calvo
1ad4b96d4e
Fix font notification redirection on meta
2022-08-10 15:58:35 +02:00
Calvo
9f8796580f
Fix font notification redirection on meta
2022-08-10 15:55:06 +02:00
Calvo
db72108b0e
Satellite agent management
2022-08-08 09:53:03 +02:00
Calvo
2c8b9b3aa5
Satellite agent management
2022-08-05 21:49:42 +02:00
Jimmy Olano
a296a58b61
Merge branch 'ent-9104-selector-multiple-a-veces-escoge-elementos-incorrectos' into 'develop'
...
Ent 9104 selector multiple a veces escoge elementos incorrectos
#9104 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9104
See merge request artica/pandorafms!5006
2022-07-19 01:33:57 +00:00
Jimmy Olano
3bbd08ec11
Merge branch 'ent-8249-12679-Incluir-filtrado-por-nombre-en-vista-de-arbol-de-servicios' into 'develop'
...
Ent 8249 12679 incluir filtrado por nombre en vista de arbol de servicios
Ref pandora_enterprise#8249
See merge request artica/pandorafms!4899
2022-07-19 01:06:53 +00:00
edu.corral
4673a253f9
ent-9104 selector multiple
2022-07-05 13:38:59 +02:00
Diego Muñoz-Reja
3fe66d9a9b
Merge branch 'ent-9085-13692-Fallo-permisos-en-creacion-edicion-de-List-of-Special-Days' into 'develop'
...
fixed permissions
See merge request artica/pandorafms!4934
2022-06-28 14:32:31 +00:00
daniel
867e659118
Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop'
...
add treshold pdf pandora_enterprise#1419
See merge request artica/pandorafms!4894
2022-06-28 13:45:53 +00:00
Daniel Barbero Martin
3cdde5054a
size form widgets dashboards pandora_enterprise#8827
2022-06-27 15:43:42 +02:00
Daniel Barbero Martin
5328cf21c6
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
2022-06-23 12:51:35 +02:00
Daniel Rodriguez
4dd65c20a8
Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop'
...
Not orientation CV view mobile pandora_enterprise#8888
See merge request artica/pandorafms!4886
2022-06-23 10:07:24 +00:00
Daniel Rodriguez
c0509a798c
Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop'
...
Added control for WMI binary
See merge request artica/pandorafms!4884
2022-06-23 08:27:11 +00:00
José González
38ecfd5b62
Added message for control return code in WMI
2022-06-22 14:25:08 +02:00
Daniel Barbero Martin
c42852a18f
refactor events meta pandora_enterprise#9086
2022-06-21 11:20:26 +02:00
Daniel Rodriguez
8fb54be1bb
Merge branch 'ent-8730-problema-notificacion-consola-con-parches-soporte' into 'develop'
...
some fixes in version control and php memory usage
See merge request artica/pandorafms!4803
2022-06-20 15:07:01 +00:00
José González
275fd2ed19
Fix minor issues related with pandorawmic
2022-06-20 16:20:49 +02:00
Daniel Rodriguez
f4761e5c0f
Merge branch 'ent-9067-no-estan-funcionando-los-enlaces-sistema-de-notificacion' into 'develop'
...
Ent 9067 no estan funcionando los enlaces sistema de notificacion
See merge request artica/pandorafms!4964
2022-06-20 09:09:16 +00:00
Daniel Barbero Martin
f3e645146d
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
2022-06-17 08:51:11 +02:00
Daniel Maya
ad98356957
resolved conflict
2022-06-16 14:21:47 +02:00
Daniel Rodriguez
bea57c8991
Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop'
...
Changed snmpwalk parameters for wizard
See merge request artica/pandorafms!4872
2022-06-16 12:17:27 +00:00
Daniel Rodriguez
d400d5b7dc
Merge branch 'ent-8860-mejora-wizard-snmp' into 'develop'
...
Applied fix for snmp
See merge request artica/pandorafms!4868
2022-06-16 11:46:53 +00:00
edu.corral
4ee4590690
ent-9067 notifications fixed
2022-06-16 13:02:49 +02:00
Daniel Barbero Martin
1bf1a83782
Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour
2022-06-15 19:49:31 +02:00
Daniel Barbero Martin
5680b82563
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
2022-06-13 08:16:40 +02:00
José González
3ec50f10b4
Update warp strings
2022-06-10 12:57:45 +02:00
José González
815a737a69
Change strings for Update Manager references to WARP update
2022-06-10 10:17:23 +02:00
Daniel Rodriguez
1eea27e1f3
Merge branch 'ent-9040-Mejoras-en-la-vista-de-agents-alerts' into 'develop'
...
Ent 9040 mejoras en la vista de agents alerts
See merge request artica/pandorafms!4933
2022-06-08 09:11:19 +00:00
Daniel Barbero Martin
951a1703bf
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
...
Conflicts:
pandora_console/include/functions_reporting.php
2022-06-08 08:15:49 +02:00
Daniel Rodriguez
bf7941ddd2
Merge branch 'ent-7757-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual-dashboard' into 'develop'
...
Service tree view with local scope parents
See merge request artica/pandorafms!4826
2022-06-07 10:47:26 +00:00
alejandro.campos@artica.es
d0386b17a4
fixed permissions
2022-06-03 11:41:06 +02:00
alejandro.campos@artica.es
bf2ef75552
fixed permissions
2022-06-03 11:39:58 +02:00
Daniel Barbero Martin
1cd680a971
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
...
Conflicts:
pandora_console/operation/events/events.php
2022-06-03 09:28:18 +02:00
Daniel Maya
3fb0392d80
#9040 changed table styles
2022-06-02 16:47:48 +02:00
Daniel Rodriguez
1aefe527c4
Merge branch 'ent-8723-13221-giss-optimizacion-en-el-despliegue-del-tree-view-de-servicios' into 'develop'
...
allow disable counters on mc environments
See merge request artica/pandorafms!4814
2022-06-02 09:08:08 +00:00
Daniel Barbero Martin
0cda3d3613
refactor events meta pandora_enterprise#9086
2022-06-01 17:27:44 +02:00
alejandro.campos@artica.es
afc50aee46
added filter in services treeview
2022-05-23 12:53:38 +02:00
alejandro.campos@artica.es
ba0c6a7ed7
added filter in services treeview
2022-05-23 12:51:32 +02:00
Daniel Barbero Martin
d0a04177c0
add treshold pdf pandora_enterprise#1419
2022-05-18 17:17:31 +02:00
Daniel Rodriguez
70150d39bc
Merge branch 'ent-8922-wizard-snmp-context-erroneo-version-3-bandwitdh' into 'develop'
...
Set empty context for snmp v3 issues with bandwidth
See merge request artica/pandorafms!4867
2022-05-17 08:36:42 +00:00
Daniel Barbero Martin
ececdca0b6
Not orientation CV view mobile pandora_enterprise#8888
2022-05-13 12:54:58 +02:00
José González
4589a7c298
Added control for WMI binary
2022-05-12 18:31:24 +02:00
Daniel Rodriguez
8dd959c306
Merge branch 'ent-8930-13524-Elementos-Tree-View-en-Dashboards-tienen-0' into 'develop'
...
Ent 8930 13524 elementos tree view en dashboards tienen 0
See merge request artica/pandorafms!4856
2022-05-11 06:20:22 +00:00
Daniel Rodriguez
7168f1d848
Merge branch 'ent-8735-vista-de-interfaces-referencia-mal-los-agentes' into 'develop'
...
Ent 8735 vista de interfaces referencia mal los agentes
See merge request artica/pandorafms!4800
2022-05-11 06:20:02 +00:00
Calvo
dfc4786ef1
Changed snmpwalk parameters for wizard
2022-05-06 13:35:04 +02:00
Daniel Maya
1b3994d32c
#8730 Fixed console server version
2022-05-06 11:54:17 +02:00
José González
f3272eb3df
Applied fix for snmp
2022-05-05 17:36:07 +02:00
José González
68b4f23a7b
Set empty context for snmp v3 issues with bandwidth
2022-05-05 15:35:32 +02:00
Daniel Maya
5a0b3eb4a1
#8930 Fixed prune agents
2022-05-03 18:10:42 +02:00
fbsanchez
87cd23b08a
a nice trick
2022-04-20 18:41:03 +02:00
José González
80a2775b6f
Fix typo
2022-04-20 14:51:01 +02:00
fbsanchez
2ab1aa601c
Service tree view with local scope parents
2022-04-20 14:10:23 +02:00
fbsanchez
8a221f10b0
allow disable counters on mc environments
2022-04-11 14:20:17 +02:00
fbsanchez
686ba0a5a5
Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
...
Conflicts:
pandora_console/extras/mr/53.sql
2022-04-07 09:44:12 +02:00
fbsanchez
3dc57f8a8c
some fixes in version control and php memory usage
2022-04-06 14:29:24 +02:00
Daniel Maya
165f3ff598
#8735 Fixed interface view
2022-04-05 13:00:15 +02:00
Junichi Satoh
5fcf3a4009
Added support for FreeBSD in checkAllowOverrideEnabled().
2022-04-04 16:22:25 +09:00
Daniel Rodriguez
99b8fa0cf6
Merge branch 'ent-8458-heatmap-view' into 'develop'
...
Ent 8458 heatmap view
See merge request artica/pandorafms!4695
2022-04-01 07:46:25 +00:00
Daniel Rodriguez
2cc019ea29
Merge branch 'ent-7225-monitorizacion-global-de-discovery-vmware-mediante-tokens' into 'develop'
...
remove extra margin from grid forms in discovery
See merge request artica/pandorafms!4777
2022-03-31 13:43:42 +00:00
Daniel Maya
e796dc52bb
#8458 Change in refresh value
2022-03-31 09:46:30 +02:00
fbsanchez
e70c85fc65
Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
2022-03-30 15:05:04 +02:00
Daniel Maya
cab85cbfbd
#8458 Fixed errors
2022-03-30 10:21:30 +02:00
fbsanchez
b832fd17e4
update_manager_client => vendor
2022-03-28 12:20:36 +02:00
José González
61713b453a
Added control for ascii characters
2022-03-24 13:53:22 +01:00
fbsanchez
da668a3a93
some style updates
2022-03-23 15:17:43 +01:00
fbsanchez
d938d59263
remove extra margin from grid forms in discovery
2022-03-23 15:02:36 +01:00
José González
a90e31be4f
Fix credential storing with spaces
2022-03-18 14:03:36 +01:00
Daniel Rodriguez
d7598cefa5
Merge branch 'ent-8662-modulos-modulo-padre-no-se-ven-en-tree-view' into 'develop'
...
Clean filtered references for parent modules
See merge request artica/pandorafms!4744
2022-03-15 10:06:18 +00:00
Daniel Rodriguez
185be2ddb8
Merge branch 'ent-8374-12855-giss-agentes-deshabilitados-en-meta' into 'develop'
...
Addedd metaconsole tree view filter for disabled agents
See merge request artica/pandorafms!4725
2022-03-11 11:38:05 +00:00
Daniel Rodriguez
ebdc7e4fce
Merge branch 'ent-8689-Error-500-en-wizard-de-agente' into 'develop'
...
Ent 8689 error 500 en wizard de agente
See merge request artica/pandorafms!4751
2022-03-09 12:57:20 +00:00
Daniel Maya
0e70bc9f67
#8689 Fixed wizard
2022-03-08 18:00:09 +01:00
Daniel Maya
270bb433da
added heatmap ajax and class
2022-03-07 13:11:54 +01:00
José González
89d5b490bf
Clean filtered references for parent modules
2022-03-07 10:45:11 +01:00
Daniel Maya
f34e8fead7
Merge branch 'develop' into ent-8458-heatmap-view
2022-03-07 10:35:26 +01:00
Calvo
05c283642f
Addedd metaconsole tree view filter for disabled agents
2022-02-25 15:37:08 +01:00
Daniel Maya
74996e3cc0
WIP heatmap 2
2022-02-25 09:41:32 +01:00
Calvo
4f3c509bde
Fix credential store ACL, only accces to PM or UM
2022-02-24 17:33:13 +01:00
Daniel Maya
d73fd0450d
Merge branch 'develop' into ent-8458-heatmap-view
2022-02-21 10:18:15 +01:00
fbsanchez
3b99a95368
Quick fix
2022-02-18 13:48:23 +01:00
fbsanchez
1da5534484
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
.gitlab-ci.yml
pandora_console/pandoradb.sql
2022-02-15 17:32:10 +01:00
Luis
4b1c93d7b3
Treeview not showing notinit agents when filter enabled
2022-02-14 17:55:29 +01:00
Daniel Maya
3c50164270
WIP heatmap
2022-02-11 14:50:57 +01:00
fbsanchez
4d912fbd34
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
2022-02-11 09:55:34 +01:00
Jose Gonzalez
b13b2b144b
Added some fixes
2022-02-09 12:30:48 +01:00
José González
fc4b702db0
Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
...
# Conflicts:
# pandora_console/godmode/alerts/configure_alert_template.php
2022-02-08 11:35:01 +00:00
fbsanchez
17be6f3ca5
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
2022-02-02 11:36:14 +01:00
Jose Gonzalez
40efaa157d
Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs
2022-02-01 13:42:30 +01:00
Jose Gonzalez
d81e6571ec
New audit logs
2022-02-01 13:39:18 +01:00
Daniel Maya
561589423d
Fixed color of fictional node
2022-01-27 12:55:42 +01:00
fbsanchez
b0824e048e
some changes
2022-01-26 18:40:45 +01:00
fbsanchez
81b1454b2e
minor fixes
2022-01-26 17:34:56 +01:00
fbsanchez
9c09f43ad8
fix in recon definition
2022-01-26 11:48:07 +01:00
fbsanchez
1207463f16
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
vgilc
4b85e93490
Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop'
...
Ent 8222 nueva grafica desde la vista de modulos histograma
See merge request artica/pandorafms!4637
2022-01-25 10:28:18 +00:00
vgilc
b547278930
Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop'
...
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados
See merge request artica/pandorafms!4633
2022-01-25 10:27:25 +00:00
Jose Gonzalez
3252832cc7
WIP: Check audit logs
2022-01-20 10:55:23 +01:00
Daniel Barbero Martin
a0a74cf7bb
add new chart histogram
2022-01-18 13:01:49 +01:00
Daniel Maya
e8d3d93f7f
Fixed pandora_black in metaconsole
2022-01-17 10:22:30 +01:00
Daniel Maya
626431f27c
Added check on agents without acl
2022-01-14 09:49:26 +01:00
fbsanchez
2aad6404a2
php8 with php72 support
2022-01-13 13:48:25 +01:00
fbsanchez
32c0229966
php8 review
2022-01-13 12:43:55 +01:00
fbsanchez
8e5a0917ba
php8 review + pdf images b64 fix
2022-01-12 19:43:33 +01:00
fbsanchez
fee3f4ab96
php8 review + mdpf update
2022-01-12 14:22:16 +01:00
fbsanchez
3b6f5bd02f
services php8
2022-01-11 14:30:59 +01:00
fbsanchez
7ebd6a5f74
php8 warnings cleanup
2022-01-11 12:08:41 +01:00
fbsanchez
b731a05bb3
networkmaps php8
2022-01-11 11:24:30 +01:00
fbsanchez
5a761059ea
Networkmap php8 fix
2022-01-11 11:00:54 +01:00
fbsanchez
58ba683005
Super 8
2022-01-10 20:52:29 +01:00
Daniel Rodriguez
8efea9f44c
Merge branch 'ent-7251-no-generar-notificaciones-con-servidores-deshabilitados' into 'develop'
...
Recovered servers fix
See merge request artica/pandorafms!4594
2022-01-03 14:19:57 +00:00
Daniel Rodriguez
3f57c260ba
Merge branch 'ent-8322-Interfaces-no-aplica-los-valores-seleccionados-en-la-configuracion-general' into 'develop'
...
fixed interface wizard selectors
See merge request artica/pandorafms!4576
2021-12-27 14:08:52 +00:00
fbsanchez
757f9b7510
Recovered servers fix
2021-12-16 18:29:27 +01:00
Jose Gonzalez
73c7fea94e
Fixed issue with enterprise feature in community
2021-12-14 12:22:00 +01:00
Jose Gonzalez
4924e0d6bc
Updated audit logs view and added controller
2021-12-14 12:06:20 +01:00
alejandro.campos@artica.es
d3e99b315f
fixed interface wizard selectors
2021-12-09 18:00:39 +01:00
Daniel Rodriguez
69590afef6
Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
...
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor
See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
Daniel Maya
c289f67395
#8307 Added contextmenu in supernet map
2021-11-29 15:54:45 +01:00
Calvo
54755db59b
Control inverse and percentege cannot be selected at same time
2021-11-26 11:55:38 +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
4dd931f277
Modules percentage threshold form
2021-11-24 11:33:36 +01:00
Jose Gonzalez
98f519958c
Fix merge
2021-11-23 12:25:58 +01:00
Daniel Barbero Martin
c52e11e91a
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
Daniel Rodriguez
3c71ecfec2
Merge branch 'ent-8069-command-center-anadir-una-notificacion-si-la-cola-de-tareas-de-los-nodos-tiene-un-fallo-o-es' into 'develop'
...
Notifications if syncqueue exceeds limits in MC
See merge request artica/pandorafms!4515
2021-11-18 12:09:06 +00:00
Daniel Rodriguez
908bc22b33
Merge branch 'ent-8052-vista-de-datos-de-modulos-en-agente-tree-view-services-metaconsola' into 'develop'
...
Fix metaconsole services tree view agent module data popup
See merge request artica/pandorafms!4473
2021-11-17 15:15:13 +00:00
Daniel Rodriguez
9ba2169de3
Merge branch 'ent-8239-12653-GUARDIA-No-devuelve-valor-SNMP-Interface-wizard-cuando-se-ejecuta-a-traves-de-pandora-exec-proxy-satelite' into 'develop'
...
Ent 8239 12653 guardia no devuelve valor snmp interface wizard cuando se ejecuta a traves de pandora exec proxy satelite
See merge request artica/pandorafms!4530
2021-11-17 10:20:43 +00:00
Daniel Rodriguez
5264f39065
Merge branch 'ent-7912-12337-Fallo-filtrado-Tree-view-widget-en-Dashboards' into 'develop'
...
Ent 7912 12337 fallo filtrado tree view widget en dashboards
See merge request artica/pandorafms!4503
2021-11-16 13:15:47 +00:00
Daniel Rodriguez
f2b9d1fbd2
Merge branch 'ent-8134-Tree-View-Tags-Falla-la-búsqueda-por-módulos' into 'develop'
...
Ent 8134 tree view tags falla la búsqueda por módulos
See merge request artica/pandorafms!4500
2021-11-16 09:14:02 +00:00
Daniel Rodriguez
cd2f3b8a54
Merge branch 'ent-8098-Bug-en-filtro-de-Agents/Alerts' into 'develop'
...
Ent 8098 bug en filtro de agents/alerts
See merge request artica/pandorafms!4470
2021-11-15 11:18:27 +00:00
Daniel Rodriguez
34a8633aae
Merge branch 'ent-7905-bug-visual-agents-alerts-black-theme' into 'develop'
...
Fixed issue with OK label
Closes pandora_enterprise#7905
See merge request artica/pandorafms!4480
2021-11-15 10:09:39 +00:00
alejandro.campos@artica.es
e3ba62b6b6
remove quotes from strings
2021-11-12 10:16:18 +01:00
alejandro.campos@artica.es
293cb43544
fixed missing name and current value in snmp interface wizard when using satellite
2021-11-11 15:32:48 +01:00
alejandro.campos@artica.es
49d9271b4e
fixed missing name and current value in snmp interface wizard when using satellite
2021-11-11 15:25:44 +01:00
alejandro.campos@artica.es
6b724b7747
fixed missing name and current value in snmp interface wizard when using satellite
2021-11-11 15:20:21 +01:00
Daniel Barbero Martin
2d4c949113
add metaconsole calendars special days alerts
2021-11-08 13:07:31 +01:00
José González
bdc4d0a8b1
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
...
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez
c0abe5edb9
Fix merge
2021-11-04 16:00:05 +01:00
Daniel Barbero Martin
cd163a96ef
wip special days alerts
2021-11-04 13:07:17 +01:00
Daniel Barbero Martin
c3f4addb0e
wip special days alerts
2021-11-04 12:33:40 +01:00
Daniel Barbero Martin
f521dec4e2
wip special days alerts
2021-11-04 10:10:11 +01:00
Daniel Barbero Martin
bd75912a0d
wip special days alerts
2021-11-04 09:55:37 +01:00
Daniel Barbero Martin
fdca5e4a78
wip special days alerts
2021-11-03 17:30:54 +01:00
Daniel Barbero Martin
1e976a8605
alerts special days wip
2021-11-03 10:59:00 +01:00
Daniel Barbero Martin
25268ec9b4
color
2021-11-02 17:49:45 +01:00
fbsanchez
3a74a6ea42
custom val
2021-11-02 13:59:17 +01:00
fbsanchez
4f2bca1df4
Added sync status notifications
2021-11-02 13:51:30 +01:00
fbsanchez
976e881cb9
Message update notif.syncqueue.length
2021-11-02 12:48:48 +01:00
fbsanchez
7f35845944
Notifications if syncqueue exceeds limits in MC
2021-11-02 12:47:36 +01:00
Daniel Maya
2de38a915b
#7912 Hidden agents without modules
2021-10-26 15:36:12 +02:00
fbsanchez
a5bf72cca0
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/include/constants.php
pandora_server/lib/PandoraFMS/Tools.pm
2021-10-26 14:21:40 +02:00
Daniel Maya
030938c78e
#8134 Fixed search module
2021-10-25 15:40:43 +02:00
fbsanchez
5ae3bbc4fe
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
2021-10-25 10:28:31 +02:00
Jose Gonzalez
dc3e690502
Fixed issue with OK label
2021-10-18 17:24:41 +02:00
Daniel Rodriguez
aa2eb08edb
Merge branch 'ent-fix-snmp-interfaces-wizard' into 'develop'
...
Fixed SNMP interfaces wizard against 32bit counter devices.
See merge request artica/pandorafms!4348
2021-10-18 08:33:17 +00:00
Calvo
bd46cb7abc
Fix metaconsole services tree view agent module data popup
2021-10-18 10:26:47 +02:00
Daniel Maya
a300ca5786
#8098 Fixed pagination
2021-10-14 11:33:06 +02:00
Jose Gonzalez
aafa979b4a
Fixed name
2021-10-08 12:37:09 +02:00
Jose Gonzalez
2c22e53e9d
Fixed Diagnostics
2021-10-07 14:20:59 +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
ce656997a5
Merge branch 'ent-8078-Los-tokens-de-selector-general-del-wizard-SNMP-no-funcionan' into 'develop'
...
fix block selector in snmp wizards
See merge request artica/pandorafms!4443
2021-10-06 12:28:40 +00:00
alejandro.campos@artica.es
4016d97c39
fix block selector in snmp wizards
2021-10-05 16:51:13 +02:00
Daniel Rodriguez
1595b99e09
Merge branch 'ent-7748-fallo-visual-en-snmp-interfaces-wizard' into 'develop'
...
fallo critico del swich regordete
See merge request artica/pandorafms!4288
2021-10-05 09:24:51 +00:00
fbsanchez
9dff230b65
Allow enable or disable cache in Entity and some minor fixes
2021-09-30 12:23:37 +02:00
Jose Gonzalez
8696d21a42
Fixed any minor bugs
2021-09-29 17:03:13 +02:00
Jose Gonzalez
0a0d055252
Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta
2021-09-29 14:21:23 +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
Jose Gonzalez
1a884a9df6
Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta
2021-09-28 11:33:48 +02:00
Calvo
46136a66ca
Merge remote-tracking branch 'origin/develop' into ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo
2021-09-27 10:40:50 +02:00
Daniel Rodriguez
49961ed261
Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop'
...
Ent 6296 10650 añadir widget de lista de servicios
See merge request artica/pandorafms!4355
2021-09-24 09:09:28 +00:00
Jose Gonzalez
de1bf03976
Clean logs
2021-09-23 17:19:47 +02:00
Jose Gonzalez
7bfe699802
Fixes minor issues
2021-09-23 17:01:22 +02:00
Daniel Rodriguez
ce286f2654
Merge branch 'ent-8003-bung-en-despliegue-de-tags-en-tree-view' into 'develop'
...
Fix tag treeview level2
See merge request artica/pandorafms!4407
2021-09-22 09:09:11 +00:00
Daniel Rodriguez
1ac070d35d
Merge branch 'ent-7339-warning-module-templates' into 'develop'
...
Improve pen list handling
Closes pandora_enterprise#7339
See merge request artica/pandorafms!4263
2021-09-21 13:16:44 +00:00
Daniel Maya
30ab96003c
#6296 Fixed info popup and status images
2021-09-21 13:22:37 +02:00
fbsanchez
8f7e49b0d1
CS fix in memory_limit detection (MC)
2021-09-14 18:59:15 +02:00
Calvo
e30fb70f11
Fix tag treeview level2
2021-09-14 13:03:38 +02:00
Jose Gonzalez
423bd106d5
Fix issues
2021-09-01 16:57:48 +02:00
fbsanchez
88e4a804f5
Fix map styles
2021-08-31 11:05:41 +02:00
Daniel Rodriguez
3be0c18165
Merge branch 'ent-7889-vulnerabilidad-xss-en-elementos-de-servicios' into 'develop'
...
Ent 7889 vulnerabilidad xss en elementos de servicios
See merge request artica/pandorafms!4360
2021-08-30 08:45:13 +00:00
Daniel Rodriguez
e6c5d1a6ef
Merge branch 'ent-7392-aviso-configuracion-cron' into 'develop'
...
Change time check for cron
Closes pandora_enterprise#7392
See merge request artica/pandorafms!4296
2021-08-25 12:57:40 +00:00
José González
357b47a6d5
Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan
2021-08-25 10:27:56 +02:00
José González
64982ee292
Fix issues with select inputs
2021-08-24 11:52:37 +02:00
Daniel Maya
fc4074b70b
Fixed xss vulnerability
2021-08-18 13:57:47 +02:00
fbsanchez
3109975e7d
Notifications in MC
2021-08-12 12:01:24 +02:00
Junichi Satoh
cadaca669f
Fixed SNMP interfaces wizard against 32bit counter devices.
2021-08-10 12:08:28 +09:00
Daniel Rodriguez
0c4b5619f5
Merge branch 'ent-7738-Pandora-recien-instalado-via-cloud-enlaces-a-mensajes-del-sistema-son-url-invalida' into 'develop'
...
set urls as macros in console supervisor
See merge request artica/pandorafms!4234
2021-08-06 12:53:54 +00:00
Calvo
7890c4269c
Added checkbox for group recursion in network maps
2021-07-14 18:00:07 +02:00
José González
4c962cd25c
Change time check for cron
2021-07-14 11:31:54 +02:00
fbsanchez
d3fe504241
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-13 13:14:01 +02:00
fbsanchez
cc23b8310f
Avoid check for UM messages more often than 2h
2021-07-12 17:41:58 +02:00
marcos
640c81b487
fallo critico del swich regordete
2021-07-12 13:06:30 +02:00
fbsanchez
198e4bf6a3
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-05 20:56:48 +02:00
vgilc
2be851ef83
Merge branch 'ent-7625-eliminar-traza-tree-class' into 'develop'
...
trace deleted
See merge request artica/pandorafms!4163
2021-07-05 15:21:59 +00:00
José González
d219e004df
Improve pen list handling
2021-07-02 16:39:59 +02:00
José González
350f34ebf5
Fixed type mismatch
2021-07-02 13:29:00 +02:00
fbsanchez
b3d88e6f6e
Some general fixes, deprecated rrdir (use Files::rmrf)
2021-07-01 00:37:13 +02:00
fbsanchez
771c51ef5d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-28 10:13:51 +02:00
Daniel Rodriguez
a13256043c
Merge branch 'ent-7644-mapa-servicio-tree-view-muestra-elementos-deshabilitados' into 'develop'
...
Ent 7644 mapa servicio tree view muestra elementos deshabilitados
See merge request artica/pandorafms!4193
2021-06-25 09:37:09 +00:00
Luis
14e69c5c07
Ent 7644 mapa servicio tree view muestra elementos deshabilitados
2021-06-25 09:37:09 +00:00
Daniel Rodriguez
cb101d5540
Merge branch 'ent-7707-wizard-de-interfaz-snmp-no-soporta-determinados-caracteres' into 'develop'
...
Fixed SNMP interface wizard modules with special chars
See merge request artica/pandorafms!4215
2021-06-25 09:15:55 +00: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
Daniel Rodriguez
040010d169
Merge branch 'ent-7670-reemplazar-url-en-ayuda-contextual' into 'develop'
...
Changed new wiki url on helps
See merge request artica/pandorafms!4205
2021-06-24 12:31:15 +00:00
Luis
497ecb329d
Changed new wiki url on helps
2021-06-24 12:31:15 +00:00
Marcos Alconada
4bbd0ae508
fixed error with block current value
2021-06-24 12:28:49 +00:00
alejandro.campos@artica.es
fec0114801
set urls as macros in console supervisor
2021-06-24 13:22:25 +02:00
fbsanchez
faa9fee273
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
pandora_agents/unix/Darwin/dmg/resources/text/license.html
pandora_console/extras/delete_files/delete_files.txt
pandora_console/extras/mr/48.sql
2021-06-21 17:33:45 +02:00
Daniel Rodriguez
f134377b37
Merge branch 'ent-7547-Tree-view-no-filtra-bien-Dashboard' into 'develop'
...
Ent 7547 tree view no filtra bien dashboard
See merge request artica/pandorafms!4136
2021-06-21 14:01:32 +00:00
Daniel Maya
878a5321e8
Ent 7547 tree view no filtra bien dashboard
2021-06-21 14:01:32 +00:00
Daniel Rodriguez
f5221083b1
Merge branch 'ent-7244-Errores-network-tools' into 'develop'
...
Solved issues with double quotes and improve the code
Closes pandora_enterprise#7244
See merge request artica/pandorafms!4101
2021-06-21 09:13:35 +00:00
Calvo
06f3b0ea36
Fixed SNMP interface wizard modules with special chars
2021-06-16 16:30:45 +02:00
fbsanchez
94cd4c96dd
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/javascript/pandora_ui.js
2021-06-14 17:37:01 +02:00
Daniel Rodriguez
08011d60b2
Merge branch 'ent-7122-nuevo-update-manager' into 'develop'
...
Embebed UMC in Pandora FMS
See merge request artica/pandorafms!3894
2021-06-14 11:56:43 +00:00
fbsanchez
cdad04f9cd
Update the DB schema when upgrading from RPMs.
...
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
Daniel Barbero Martin
a7c1c49636
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-14 08:42:31 +02:00
José González
e17b63e6fc
Fixed issue with single line
2021-06-14 08:16:35 +02:00
fbsanchez
ae34209f52
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 21:45:50 +02:00
Calvo
e0b3536d1b
Fix treeview modules sql inner condition
2021-06-10 18:00:53 +02:00
Marcos Alconada
665efa4fb7
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-10 08:19:11 +00:00
Daniel Rodriguez
4b819360ff
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
...
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
Marcos Alconada
2334eccd01
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-09 13:59:28 +00: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
12e67380ee
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-28 14:37:20 +02:00
Calvo
8010b375dd
trace deleted
2021-05-28 14:10:12 +02:00
Daniel Rodriguez
2eb85562c2
Merge branch 'ent-7468-campo-plugin-falla-bandwith-politicas' into 'develop'
...
Fixed issue with id_plugin with bandwidth modules
Closes pandora_enterprise#7468
See merge request artica/pandorafms!4159
2021-05-28 10:38:21 +00:00
Daniel Barbero Martin
8c7654cd2d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/godmode/setup/os.php
pandora_console/include/styles/pandora.css
pandora_console/operation/users/user_edit.php
2021-05-28 08:26:19 +02:00
José González
91e870edbc
Fixed issue with id_plugin with bandwidth modules
2021-05-27 22:06:58 +02:00
Daniel Rodriguez
be77599c07
Merge branch 'ent-7337-tree-view-os-no-aparecen-not-init-modules' into 'develop'
...
Fixed not showing agents with not init modules on os treeview
See merge request artica/pandorafms!4120
2021-05-27 16:22:47 +00:00
Luis
cb6f130ab0
Fixed not showing agents with not init modules on os treeview
2021-05-27 16:22:47 +00: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
Daniel Rodriguez
c2314717e3
Merge branch 'ent-7467-wizard-snmp-falla-para-modulos-que-usen-braa' into 'develop'
...
Ent 7467 wizard snmp falla para modulos que usen braa
See merge request artica/pandorafms!4139
2021-05-27 16:19:08 +00:00
Daniel Barbero Martin
a1ca4abe8f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-27 08:22:43 +02:00
fbsanchez
50242d3030
OID fixes while retrieving from remote Satellite server
2021-05-26 17:55:30 +02:00
Daniel Rodriguez
e3cd5b6d56
Merge branch 'ent-7468-snmp-wizard-modulos-plugin-no-configuran-campo-plugin' into 'develop'
...
Fixed missed parameter
Closes pandora_enterprise#7468
See merge request artica/pandorafms!4097
2021-05-26 13:38:43 +00:00
Daniel Rodriguez
693e3988b9
Merge branch 'ent-7182-barra-de-busqueda-no-funciona-correctamente' into 'develop'
...
Changed search bar text
See merge request artica/pandorafms!4004
2021-05-26 13:36:47 +00:00
Daniel Barbero Martin
d91e7f6aba
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-26 08:28:42 +02:00
Daniel Rodriguez
b875199f28
Merge branch 'ent-7492-bug-visual-vista-agents-alerts-no-alerts' into 'develop'
...
Ent 7492 bug visual vista agents alerts no alerts
See merge request artica/pandorafms!4110
2021-05-25 15:53:41 +00:00
Luis
eb54ce9a62
Ent 7492 bug visual vista agents alerts no alerts
2021-05-25 15:53:41 +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
Daniel Barbero Martin
73454dd4ea
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-20 08:21:31 +02:00
Daniel Rodriguez
4ea790a649
Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop'
...
Ent 7141 vulnerabilities csrf
Closes pandora_enterprise#7141
See merge request artica/pandorafms!4015
2021-05-19 16:00:16 +00:00
Daniel Barbero Martin
6c305833bf
fix groups, module_groups, network_components user_edit synch
2021-05-18 17:18:54 +02:00