Daniel Maya
4211327275
#8260 Fixed Integria IMS Ticket edit in metaconsole
2021-11-25 13:17:12 +01: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 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
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
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
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
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
Jose Gonzalez
67f893f4ee
Fixed issue
2021-11-23 12:50:12 +01:00
Jose Gonzalez
98f519958c
Fix merge
2021-11-23 12:25:58 +01:00
Daniel Maya
3bfce928c4
#7902 Fixed add and update actions
2021-11-23 10:53:51 +01:00
Daniel Barbero Martin
02b3bc8574
fix setup centraliced active directory
2021-11-23 10:18:20 +01:00
Daniel Maya
131be55be1
#8277 Fixed search by agent
2021-11-22 16:18:53 +01:00
Daniel Rodriguez
13835582d2
Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop'
...
Ent 8210 bug al editar acciones ya configuradas en alertas
See merge request artica/pandorafms!4536
2021-11-22 12:44:51 +00:00
Daniel Maya
8ce1a500ea
#8210 Fixed dialog
2021-11-19 14:57:56 +01:00
fbsanchez
582cb9a082
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 10:51:46 +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
5b49372e99
Merge branch 'ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones' into 'develop'
...
Added missing sec related to GET params to ACL enterprise
See merge request artica/pandorafms!4345
2021-11-18 12:14:12 +00:00
Calvo
2562a44d94
Fix duplicated ACL setup update manager
2021-11-18 12:25:14 +01:00
Daniel Maya
6f7b35a3b4
#8210 Fixed dropdown select2
2021-11-18 11:48:19 +01:00
Calvo
06fe1552bf
Enterprise ACL step 2: Add options fix merge
2021-11-17 17:31:43 +01:00
Daniel Rodriguez
495d8d8db8
Merge branch 'ent-8163-bug-en-item-alert-report-metaconsola' into 'develop'
...
Fix server name item on reporting buider
See merge request artica/pandorafms!4525
2021-11-17 15:15:42 +00:00
Daniel Rodriguez
54ef63f6d3
Merge branch 'ent-7918-Cambio-texto-informe-availability-graph' into 'develop'
...
changed text
See merge request artica/pandorafms!4490
2021-11-17 15:12:24 +00:00
Daniel Rodriguez
38468ff1f2
Merge branch 'ent-8215-perfiles-usuario-puede-crear-agentes-de-otros-grupos' into 'develop'
...
Fix ACL grous AW creation
See merge request artica/pandorafms!4523
2021-11-16 17:03:17 +00:00
Daniel Rodriguez
cb3bba0a0d
Merge branch 'ent-8125-Usuarios-globales-se-borran-si-les-borras-todos-los-perfiles' into 'develop'
...
prevent from deleting global admin users when removing all of their profiles
See merge request artica/pandorafms!4493
2021-11-16 14:55:05 +00:00
Daniel Rodriguez
1fb78c169e
Merge branch 'ent-8257-no-aparecen-tokns-de-consola-visual-en-perfil' into 'develop'
...
Ent 8257 no aparecen tokns de consola visual en perfil
See merge request artica/pandorafms!4533
2021-11-16 13:17:15 +00:00
Daniel Rodriguez
09202cebc4
Merge branch 'ent-8088-Alertas-SNMP-no-mantienen-el-valor-en-dropdowns' into 'develop'
...
Ent 8088 alertas snmp no mantienen el valor en dropdowns
See merge request artica/pandorafms!4458
2021-11-16 09:15:02 +00:00
Calvo
c47799a4f1
Fix missing visual console profile tokens
2021-11-15 18:58:54 +01:00
Calvo
7e36a678e9
Fix file erorrs and warns
2021-11-15 18:54:28 +01:00
Calvo
b6e34a2697
erge remote-tracking branch 'origin/develop' into ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones
2021-11-15 18:14:18 +01:00
Daniel Maya
efd8c8cab2
#8040 resolved conflict
2021-11-15 13:20:43 +01:00
Daniel Rodriguez
eb9e73ecb0
Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop'
...
Deleted and reubicated acl options
See merge request artica/pandorafms!4340
2021-11-15 11:24:50 +00:00
Daniel Rodriguez
ff31a347c4
Merge branch 'ent-7947-Bug-en-integración-de-Integria-en-nodo-centralizado' into 'develop'
...
Ent 7947 bug en integración de integria en nodo centralizado
See merge request artica/pandorafms!4492
2021-11-15 11:22:25 +00:00
Daniel Rodriguez
bec244e9b7
Merge branch 'ent-7593-fallo-en-boton-busqueda-libre-componente-remotos' into 'develop'
...
Fix search component group passing invalid get params
See merge request artica/pandorafms!4293
2021-11-15 10:18:20 +00:00
Daniel Rodriguez
e573e79bcd
Merge branch 'ent-7784-12114-en-las-templates-de-informes-en-metaconsola-no-busca-por-grupos-secundarios' into 'develop'
...
Fix list agent with secondaty grouos on selec
See merge request artica/pandorafms!4303
2021-11-15 10:16:24 +00:00
Daniel Rodriguez
09af86fbeb
Merge branch 'ent-8105-Revision-de-lista-de-item-en-consolas-visuales' into 'develop'
...
Ent 8105 revision de lista de item en consolas visuales
See merge request artica/pandorafms!4468
2021-11-15 10:15:24 +00:00
Daniel Rodriguez
504411d7d2
Merge branch 'ent-8039-Bug-en-item-Network-link-CV' into 'develop'
...
Ent 8039 bug en item network link cv
See merge request artica/pandorafms!4453
2021-11-15 10:13:44 +00:00
Daniel Barbero Martin
0caeee185e
WIP new report alert fired actions
2021-11-12 13:21:05 +01:00
Daniel Barbero Martin
e70ecd461e
WIP new report alert fired actions
2021-11-12 13:11:49 +01:00
Calvo
94d1964166
Fix server name item on reporting buider
2021-11-08 13:27:32 +01:00
Calvo
61bdc1f4e0
Fix ACL grous AW creation
2021-11-05 15:21:04 +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
Jose Gonzalez
932d42e8da
Fixed colours
2021-11-04 15:44:40 +01:00
Daniel Barbero Martin
93aad130cb
wip special days alerts
2021-11-04 10:20:03 +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
53361484fd
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-03 11:16:46 +01:00
Daniel Barbero Martin
1e976a8605
alerts special days wip
2021-11-03 10:59:00 +01:00
Daniel Rodriguez
56ae68a034
Merge branch 'ent-7951-Bloqueo-auto-creacion-usuarios-desde-nodo-en-entornos-centralizado' into 'develop'
...
Ent 7951 bloqueo auto creacion usuarios desde nodo en entornos centralizado
See merge request artica/pandorafms!4487
2021-11-03 09:34:49 +00:00
Daniel Barbero Martin
25268ec9b4
color
2021-11-02 17:49:45 +01:00
Daniel Barbero Martin
3ed3a14443
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-02 08:08:19 +01:00
alejandro.campos@artica.es
b4c21cfdca
fixed several bugs in AD authentication in metaconsole
2021-10-29 16:12:23 +02:00
Daniel Barbero Martin
89680907fd
wip special days
2021-10-29 13:45:18 +02:00
Daniel Rodriguez
3883c99804
Merge branch 'ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card' into 'develop'
...
CorrelationServer
See merge request artica/pandorafms!4377
2021-10-29 10:07:25 +00:00
Daniel Barbero Martin
c2cce3990a
special days template alerts
2021-10-28 17:30:03 +02:00
fbsanchez
77bee9f3ca
UM replicated
2021-10-27 22:28:37 +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
fbsanchez
05a2db88a3
menu fix
2021-10-25 17:01:26 +02:00
fbsanchez
dabd7f53fe
minor fixes
2021-10-25 14:05:11 +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
fbsanchez
925fa8b819
Errata fix
2021-10-22 10:54:41 +02:00
alejandro.campos@artica.es
07c7c7a387
prevent from deleting global admin users when removing all of their profiles
2021-10-22 09:48:00 +02:00
fbsanchez
bb8dbc9332
NCM
2021-10-21 02:17:17 +02:00
Daniel Maya
6520f95fcf
#7947 Fixed integria IMS ticket in metaconsole
2021-10-20 17:06:24 +02:00
alejandro.campos@artica.es
3e1dcbb554
changed text
2021-10-20 13:30:24 +02:00
Jose Gonzalez
5b4043d9ea
Fix delete files issue
2021-10-15 13:31:19 +02:00
Daniel Rodriguez
92740cd86b
Merge branch 'ent-8096-arreglos-black-theme' into 'develop'
...
fixed visual black theme error
See merge request artica/pandorafms!4457
2021-10-14 09:59:16 +00:00
Daniel Maya
4579d2b8c6
#8105 Fixed list of elements
2021-10-13 15:20:20 +02: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
Jose Gonzalez
4331438765
Removed some cheerful words in the project
2021-10-08 11:13:28 +02:00
Daniel Rodriguez
16f2c776f2
Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop'
...
show only events filter in acl groups
See merge request artica/pandorafms!4451
2021-10-08 08:09:19 +00:00
marcos
85037693b2
fixed visual black theme error
2021-10-07 16:45:56 +02:00
marcos
d4108c4e8b
show only events fetch with user groups
2021-10-07 16:11:23 +02:00
Daniel Maya
c61c39f45f
#8088 Fixed selected option with select2
2021-10-07 15:45:17 +02:00
marcos
f55a6685bd
show only events filter in acl groups
2021-10-07 14:09:02 +02:00
marcos
030b45af8e
add new filter fot litghbulb_off
2021-10-07 12:50:10 +02:00
marcos
afb9cea67f
add new filter fot litghbulb_off
2021-10-07 12:42:58 +02:00
Daniel Maya
49ffdf822b
#8040 Fixed module graph
2021-10-07 11:50:27 +02:00
Daniel Maya
e9b6acc1a8
#8039 Fixed network link
2021-10-07 10:27:31 +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
a674aeeb91
Merge branch 'ent-8054-12471-Conteo-erroneo-de-agentes-para-licenciamiento' into 'develop'
...
fixed count
See merge request artica/pandorafms!4441
2021-10-06 08:34:13 +00:00
alejandro.campos@artica.es
ec693a88a0
fixed count
2021-10-05 11:26:29 +02:00
Daniel Rodriguez
6cbf83b2e2
Merge branch 'ent-7780-error-black-theme-en-transaccional-maps' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!4285
2021-10-05 09:23:14 +00: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
Daniel Rodriguez
ce53453e32
Merge branch 'ent-8002-bug-visual-vista-informes-open' into 'develop'
...
Fiex open report list view
See merge request artica/pandorafms!4408
2021-10-05 09:20:01 +00:00
Daniel Rodriguez
d0e738e8fb
Merge branch 'ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola' into 'develop'
...
Ent 7937 mensaje this node is configured with centralized mode de nodo sale en metaconsola
See merge request artica/pandorafms!4409
2021-10-05 09:18:41 +00:00
fbsanchez
31f329a833
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
...
Conflicts:
pandora_console/vendor/composer/autoload_classmap.php
pandora_console/vendor/composer/autoload_static.php
2021-10-05 10:57:00 +02:00
marcos
aa43caee23
resolved mrege conflicts
2021-10-04 14:22:11 +02:00
Jose Gonzalez
6deaee84ac
Merge
2021-10-04 10:00:15 +02:00
fbsanchez
e237d7dd07
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/mr/50.sql
2021-09-30 12:24:19 +02: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
alejandro.campos@artica.es
fc6fb36293
Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports
2021-09-29 13:29:20 +02:00
Daniel Rodriguez
894cd0974f
Merge branch 'ent-3407-Informes-en-IPAM' into 'develop'
...
Ent 3407 informes en ipam
See merge request artica/pandorafms!4424
2021-09-27 12:06:00 +00:00
Daniel Rodriguez
c57c901e55
Merge branch 'ent-7068-funcionamiento-de-alertas-en-politicas' into 'develop'
...
Added unlinked icon to alerts in unlinked module
See merge request artica/pandorafms!4426
2021-09-27 10:09:30 +00:00
Daniel Rodriguez
a754b875c9
Merge branch 'ent-7976-GISS-Limite-de-licencia-en-metaconsola-para-UM' into 'develop'
...
Ent 7976 giss limite de licencia en metaconsola para um
See merge request artica/pandorafms!4403
2021-09-24 12:37:03 +00:00
alejandro.campos@artica.es
9e0729574e
Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports
2021-09-24 11:40:25 +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
Daniel Rodriguez
7bdb730abd
Merge branch 'ent-8018-estilos-campos-seleccion-metaconsola' into 'develop'
...
Fix select fields size
Closes pandora_enterprise#8018
See merge request artica/pandorafms!4418
2021-09-24 07:12:52 +00:00
Calvo
4a9f523468
Added unlinked icon to alerts in unlinked module
2021-09-23 19:02:31 +02:00
fbsanchez
12ddb4d792
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/pandoradb.sql
2021-09-23 16:23:38 +02:00
Alejandro Campos
ca46285a0e
Merge branch 'develop' into 'ent-3407-Informes-en-IPAM'
...
# Conflicts:
# pandora_console/extras/mr/50.sql
2021-09-23 13:33:02 +00:00
fbsanchez
fe42a8782b
Updated messages in centralised environment status check
2021-09-23 11:16:48 +02:00
Jose Gonzalez
5b40a4f700
Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open
2021-09-23 08:50:50 +02:00
Daniel Rodriguez
42700e9033
Merge branch 'ent-7785-input-email-con-fondo-blanco-y-texto-negro' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!4284
2021-09-22 09:10:09 +00:00
alejandro.campos@artica.es
d9dd7f211e
created report for ipam networks
2021-09-21 16:02:17 +02:00
alejandro.campos@artica.es
fc959f0bc6
created report for ipam networks
2021-09-21 15:59:14 +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
Calvo
5027e8c9a5
Fiex open report list view
2021-09-14 13:33:18 +02:00
Daniel Maya
3dc9165209
#7976 Fixed agent limit
2021-09-13 13:30:14 +02:00
Daniel Rodriguez
93b4d81264
Merge branch 'ent-7730-visualizacion-update-manager-en-tema-oscuro' into 'develop'
...
add update manager black background update manager
See merge request artica/pandorafms!4270
2021-09-10 11:11:24 +00:00
Marcos Alconada
2ed5be71d6
Resolve conflict
2021-09-10 08:04:23 +00:00
fbsanchez
34adf6e9e2
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
2021-09-08 21:21:45 +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
Daniel Rodriguez
6599f80dff
Merge branch 'ent-7444-Metaconsole-Triggered-alerts-report' into 'develop'
...
Fixed forget metaconsole alerts
Closes pandora_enterprise#7444
See merge request artica/pandorafms!4388
2021-09-08 10:14:22 +00:00
Jose Gonzalez
e8eb77058b
Fix
2021-09-06 15:19:23 +02:00
Jose Gonzalez
fa101db3b6
Fix vulnerability
2021-09-03 13:30:15 +02:00
marcos
9c425f60e8
less module selector width
2021-09-02 16:56:01 +02:00
fbsanchez
6756c16c35
Added correlation server to server list
2021-09-02 12:21:31 +02:00
José González
6b90b33a26
Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager'
...
# Conflicts:
# pandora_console/include/functions_filemanager.php
2021-09-01 15:33:44 +00:00
marcos
1bec5014c7
resoled conflcits
2021-09-01 16:58:36 +02:00
Daniel Rodriguez
b8e1391ffd
Merge branch 'ent-7911-errores-file-manager' into 'develop'
...
Fixed issues with files upload
Closes pandora_enterprise#7911
See merge request artica/pandorafms!4370
2021-09-01 13:18:10 +00:00
Jose Gonzalez
73cd0fd17e
Changed content of advice
2021-09-01 10:29:25 +02:00
Daniel Rodriguez
f12f3d6cf4
Merge branch 'ent-7915-Error-SQL-en-filtro-de-custom-field-en-informe-de-inventario-de-agentes' into 'develop'
...
Ent 7915 error sql en filtro de custom field en informe de inventario de agentes
See merge request artica/pandorafms!4375
2021-08-31 10:05:31 +00:00
Daniel Rodriguez
fae4b284e4
Merge branch 'ent-7945-500-al-crear-informe' into 'develop'
...
Ent 7945 500 al crear informe
See merge request artica/pandorafms!4373
2021-08-27 12:07:24 +00: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 Maya
c4e6c52fe2
#7915 fixed custom field filter
2021-08-27 11:24:23 +02:00
Daniel Rodriguez
c172afe1ce
Merge branch 'ent-7940-Bug-items-de-informes-en-open' into 'develop'
...
Ent 7940 bug items de informes en open
See merge request artica/pandorafms!4372
2021-08-26 10:13:13 +00:00
Daniel Maya
0a79014480
#7495 fixed report name 2
2021-08-26 12:03:14 +02:00
Jose Gonzalez
945c29d1bc
Fix issues
2021-08-26 11:15:02 +02:00
Daniel Rodriguez
22587a0dde
Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop'
...
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos
See merge request artica/pandorafms!4275
2021-08-25 13:00:42 +00:00
Daniel Rodriguez
61baf63a6a
Merge branch 'ent-7819-500-al-ordernar-items-de-informes' into 'develop'
...
fixed error 500 when sort report items
See merge request artica/pandorafms!4314
2021-08-25 12:52:33 +00:00
Daniel Rodriguez
3be8971360
Merge branch 'ent-7887-Vulnerabilidad-xss-en-operaciones-masivas-de-módulos' into 'develop'
...
Ent 7887 vulnerabilidad xss en operaciones masivas de módulos
See merge request artica/pandorafms!4365
2021-08-25 12:52:06 +00:00
Daniel Maya
c8fb8a441f
#7940 Fixed server filter in open
2021-08-25 13:43:13 +02:00
Jose Gonzalez
1bbcc47344
Merge remote-tracking branch 'origin' into ent-7911-errores-file-manager
2021-08-24 16:17:33 +02:00
Daniel Rodriguez
8a574a2f93
Merge branch 'ent-7920-metacosola-gestion-de-usuarios-locales' into 'develop'
...
Re-enabled user management in MC while not in centralised environment
See merge request artica/pandorafms!4369
2021-08-24 12:28:03 +00:00
Daniel Rodriguez
4d5926e427
Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop'
...
Ent 7612 implementar sistema de mensajeria en la meta
See merge request artica/pandorafms!4353
2021-08-24 08:13:02 +00:00
José González
6358f3fc9b
Fixed issues with files upload
2021-08-23 15:35:47 +02:00
Daniel Rodriguez
3dc6db320e
Merge branch 'ent-7725-bug-en-creacion-de-itmes-sla' into 'develop'
...
Fixed SLA report items creating empty extra item
See merge request artica/pandorafms!4253
2021-08-23 10:50:10 +00:00
fbsanchez
4ff6b8a1bb
Re-enabled user management in MC while not in centralised environment
2021-08-23 12:29:17 +02:00
marcos
244d7f6c8b
solved conflicts
2021-08-23 08:25:12 +02:00
alejandro.campos@artica.es
c07a112f4b
migrate histrogram report items
2021-08-19 16:23:52 +02:00
Daniel Maya
9488ce873b
#7887 Fixed xss in massive modules
2021-08-19 12:57:16 +02:00
Daniel Rodriguez
44dcdb03bc
Merge branch 'ent-7542-11882-Buscador-de-acciones-no-funciona' into 'develop'
...
Ent 7542 11882 buscador de acciones no funciona
See merge request artica/pandorafms!4343
2021-08-17 07:09:26 +00:00
alejandro.campos@artica.es
21e15752cf
fixed select2 search in action update
2021-08-16 11:04:52 +02:00
alejandro.campos@artica.es
54ae7e5783
modified availability report
2021-08-16 09:43:11 +02:00
fbsanchez
93636aef96
Avoid warning phpcs
2021-08-12 12:00:53 +02:00
fbsanchez
034e921e35
Upgraded jquery to 3.6.0, without npm
2021-08-12 09:30:43 +02:00
Daniel Rodriguez
03306454e0
Merge branch 'ent-7883-aplicacion-de-parches-offline-en-la-open' into 'develop'
...
Allowed UMC offline for opensource installations, fixed issue while accessing settings
See merge request artica/pandorafms!4349
2021-08-11 12:20:32 +00:00
fbsanchez
3662d8b8a0
Added offline entry to menu in community ed
2021-08-11 14:12:49 +02:00
fbsanchez
c69c326bc5
Warning to be careful with offline patches
2021-08-11 11:34:29 +02:00
fbsanchez
97afb02ba6
Allowed UMC offline for opensource installations, fixed issue while accessing settings
2021-08-11 11:28:33 +02:00
fbsanchez
cf976f9622
Merge remote-tracking branch 'origin/develop' into ent-7861-fallo-umc-cuando-hay-db-historico
...
Conflicts:
pandora_console/godmode/um_client/index.php
2021-08-11 09:56:02 +02:00
Daniel Rodriguez
f8e9bd38ec
Merge branch 'ent-7633-selector-de-grupos-en-el-graph-builder-de-las-custom-graphs-ocupa-todo-el-ancho-de-la-pantalla' into 'develop'
...
colspan 1 to group selector custom graph
See merge request artica/pandorafms!4223
2021-08-11 07:10:50 +00:00
Daniel Rodriguez
00ed8233d0
Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop'
...
set default font size on graph modules when is send in mails
See merge request artica/pandorafms!4264
2021-08-10 12:19:54 +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
Calvo
9d04933ca2
Added missing sec related to GET params to ACL enterprise
2021-08-06 10:29:38 +02:00
Daniel Maya
a5f9e74b50
#7881 Fixed snmp alert
2021-08-05 15:53:44 +02:00
Daniel Rodriguez
e623fa1822
Merge branch 'ent-7854-warning-por-memoria-php-umc-cuando-vale-1' into 'develop'
...
Minor fix in memory detection UMC
See merge request artica/pandorafms!4327
2021-08-05 11:51:39 +00:00
alejandro.campos@artica.es
5acd64bbf7
fixed text inputs in add action modals
2021-08-05 13:05:53 +02:00
Daniel Rodriguez
39d4466658
Merge branch 'ent-fix-alert-action-creation' into 'develop'
...
Fixed alert action creation problem.
See merge request artica/pandorafms!4313
2021-08-05 07:56:22 +00:00
Daniel Rodriguez
e2a1a42006
Merge branch 'ent-7592-componentes-remotos-de-red-campo-tcp-send' into 'develop'
...
Unset field tcp send when snmp remote component selected
See merge request artica/pandorafms!4160
2021-08-04 12:03:52 +00:00
Daniel Rodriguez
801f8fc3c4
Merge branch 'ent-7615-hide-en-los-comandos-de-alertas' into 'develop'
...
Fixed alert command hide on update
See merge request artica/pandorafms!4164
2021-08-03 06:47:41 +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
Calvo
9b736d0c48
Deleted and reubicated acl options
2021-07-30 13:49:22 +02:00
fbsanchez
b88b019528
errata fix0
2021-07-29 13:15:01 +02:00
fbsanchez
41f2842e41
Proxy fix and some traceability for DBH upgrade
2021-07-29 13:11:45 +02:00
fbsanchez
cea9d2ae3d
Fix searchpath for MR while updating
2021-07-28 19:16:27 +02:00
fbsanchez
9206dc491e
avoid notice but accept any other alert from PHP
2021-07-27 11:24:23 +02:00
fbsanchez
3c78bfc89e
Changed LOAD por SOURCE in UMC - MR loader
2021-07-27 10:48:12 +02:00
fbsanchez
60de51cfdb
Minor fix in memory detection UMC
2021-07-27 10:21:52 +02:00
fbsanchez
dc7d30cbf8
Stupid sexy error_get_last
2021-07-22 11:41:04 +02:00
fbsanchez
d3270904bd
Avoid notice
2021-07-22 11:33:57 +02:00
fbsanchez
f83fddb4ff
Always ignopre undefined indexes notices
2021-07-22 11:29:01 +02:00
fbsanchez
52059661a4
Ignore undefined indexes E_NOTICE
2021-07-22 10:59:19 +02:00
fbsanchez
f71ae73c84
Load procedures (or complex queries) in UMC
2021-07-21 17:31:03 +02:00
marcos
e02dd1b61f
fixed error 500 when sort report items
2021-07-21 11:43:11 +02:00
Junichi Satoh
4115bd0cba
Fixed an issue where alert actions belonging to the "All" group could be created by restricted users.
2021-07-21 15:34:46 +09:00
José González
96fccb01b9
Created token for hande file creation
2021-07-16 16:54:43 +02:00
Calvo
77552805a4
Fix list agent with secondaty grouos on selec
2021-07-16 13:55:31 +02:00
fbsanchez
d3fe504241
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-13 13:14:01 +02:00
Calvo
c0a4ba5cb4
Fix search component group passing invalid get params
2021-07-13 11:12:06 +02:00
vgilc
b7729447f6
Merge branch 'ent-fix-keep-counters' into 'develop'
...
Fixed 'Keep counters' cannot be cleared in module configuration.
See merge request artica/pandorafms!4292
2021-07-13 08:37:09 +00:00
Junichi Satoh
512cfb69c5
Fixed 'Keep counters' cannot be cleared in module configuration.
2021-07-13 11:55:49 +09:00
Junichi Satoh
e7079dd4c4
Fixed all alert actions are shown after alert action creation/edition even if user has access rights only for specific groups.
2021-07-13 09:53:23 +09:00
marcos
201e9c7216
fixed visual error
2021-07-12 11:10:41 +02:00
marcos
ff60a4ec62
fixed visual error
2021-07-12 10:58:51 +02:00
Daniel Maya
66e9539818
Added agent ip in custom events
2021-07-07 16:07:08 +02:00
marcos
7a4224cef6
add update manager black background update manager
2021-07-06 12:49:20 +02:00
marcos
ea57c58f40
set default font size on graph modules when is send in mails
2021-07-05 11:34:32 +02:00
fbsanchez
f52d389327
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
2021-07-05 09:55:14 +02:00
José González
498a353a29
Improve code for get secondary groups
2021-07-02 12:20:53 +02:00
Calvo
5bd49a1e49
Fixed SLA report items creating empty extra item
2021-06-30 12:04:01 +02:00
fbsanchez
074fbf916c
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-29 20:03:07 +02:00
fbsanchez
3bd0464c86
removed unwanted traces
2021-06-29 14:35:22 +02:00
fbsanchez
f403e3a43b
Avoid trial users from using UMC
2021-06-29 14:34:09 +02:00
Daniel Maya
b37bbcd944
Ent 7143 autoajuste de la consola visual
2021-06-29 10:02:13 +00:00
fbsanchez
4e1110a052
MQ up to down connections (MC => NODES)
2021-06-28 21:21:31 +02:00
fbsanchez
017e12c751
Use metaconsole_access_node to allow or deny access to node for a user created and synchronized from MC
2021-06-25 15:41:34 +02:00
fbsanchez
4d2f9fb4c9
missing messages
2021-06-25 12:54:14 +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
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
294741b472
Merge branch 'ent-6990-copiar-informes' into 'develop'
...
Ent 6990 copiar informes
See merge request artica/pandorafms!4129
2021-06-21 14:07:03 +00:00
Luis
51844da01b
Ent 6990 copiar informes
2021-06-21 14:07:03 +00:00
Daniel Rodriguez
7dfae672d5
Merge branch 'ent-7673-scroll-horizontal-en-moda-test' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!4199
2021-06-21 14:06:29 +00:00
Marcos Alconada
d6ecce1ce9
fixed visual error
2021-06-21 14:06:29 +00:00
Daniel Rodriguez
ab3a7e9d2d
Merge branch 'ent-7629-Error-500-en-borrado-selectivo-de-items-de-informes' into 'develop'
...
Ent 7629 error 500 en borrado selectivo de items de informes
See merge request artica/pandorafms!4175
2021-06-21 14:03:39 +00:00
Daniel Rodriguez
227055446e
Merge branch 'ent-7630-bug-visual-enedicion-de-items-de-informes' into 'develop'
...
fixed error updating item reporting
See merge request artica/pandorafms!4168
2021-06-21 14:02:54 +00:00
marcos
951924dd93
colspan 1 to group selector custom graph
2021-06-21 11:40:48 +02:00
José González
0c5b8766d0
Change snmpwalk behaviour in module configuration
2021-06-18 14:05:59 +02:00
fbsanchez
1401f30e84
Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center
2021-06-17 14:49:25 +02:00
Daniel Barbero Martin
50c7394e7d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-17 08:23:46 +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
fbsanchez
81254cf3fb
WIP Plugins sync
2021-06-16 18:18:38 +02:00
fbsanchez
b032beb559
Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center
2021-06-16 17:27:06 +02:00
Daniel Barbero Martin
c6877154fb
Wip command center, Plugins in meta
2021-06-16 17:26:19 +02:00
fbsanchez
b701b2be32
Plugin sync
2021-06-16 15:53:05 +02:00
fbsanchez
b8d3d962a0
Minor CDE
2021-06-16 12:44:03 +02:00
marcos
716c82bd30
fixed error with pagination user filter
2021-06-16 10:41:12 +02:00
Daniel Barbero Martin
841842da59
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb_data.sql
2021-06-16 08:46:21 +02:00
Daniel Barbero Martin
5b1498e08c
Wip command center, Plugins in meta
2021-06-15 17:40:48 +02:00
Daniel Barbero Martin
64dd4f2c2b
Wip command center, Plugins in meta
2021-06-15 17:24:03 +02:00
fbsanchez
04e2919497
Avoid using old data when parsing progress
2021-06-15 14:43:11 +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
marcos
2e5073e1ba
new background image UM
2021-06-14 16:12:48 +02:00
Marcos Alconada
42274e7252
changed UM image background
2021-06-14 13:31:37 +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
alejandro.campos@artica.es
cb5905b000
fixed xss vulnerability
2021-06-11 08:52:10 +02:00
fbsanchez
ae34209f52
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 21:45:50 +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 Barbero Martin
9e27843b19
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 08:51:48 +02: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
Daniel Rodriguez
d58e9f634a
Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
...
Ent 7519 cambio de fuentes en la consola a nivel global
See merge request artica/pandorafms!4132
2021-06-09 13:59:29 +00:00
Marcos Alconada
2334eccd01
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-09 13:59:28 +00:00
Daniel Rodriguez
95832cd071
Merge branch 'ent-7652-iconos-para-black-theme' into 'develop'
...
changed icons for black theme
See merge request artica/pandorafms!4186
2021-06-09 13:12:47 +00:00
Marcos Alconada
8814b1f971
changed icons for black theme
2021-06-09 13:12:47 +00:00
Daniel Rodriguez
73f54c3375
Merge branch 'ent-7661-Error-500-al-editar-las-opciones-avanzadas-de-un-informe' into 'develop'
...
fixed bug
See merge request artica/pandorafms!4185
2021-06-09 12:37:59 +00:00
alejandro.campos@artica.es
13850e52d5
fixed bug
2021-06-09 10:41:45 +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
c0103367fd
Wip command center, masive edit operations
2021-06-07 13:38:07 +02: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
Daniel Maya
11a6c41728
Fixed url
2021-06-04 14:52:53 +02:00
Marcos Alconada
3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00:00
Daniel Rodriguez
77b05de784
Merge branch 'ent-fix-bulk-alert-operations' into 'develop'
...
Fixed that restricted users can add/delete all alert templates using bulk alert operations.
See merge request artica/pandorafms!4171
2021-06-04 10:24:51 +00:00
Daniel Barbero Martin
da6c75f5b0
Wip command center, alerts SNMP broken
2021-06-04 11:34:12 +02:00
Daniel Rodriguez
90a5a1c1a3
Merge branch 'ent-5785-Nuevo-informe-inventario-de-agentes' into 'develop'
...
Added new item type in reports
See merge request artica/pandorafms!4133
2021-06-04 09:03:32 +00:00
alejandro.campos@artica.es
70946af507
Merge remote-tracking branch 'origin/develop' into ent-5785-Nuevo-informe-inventario-de-agentes
2021-06-04 10:32:45 +02:00
Junichi Satoh
3563a99703
Fixed that restricted users can see all alert templates.
2021-06-04 16:01:16 +09:00
Daniel Barbero Martin
ca59034cf3
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-04 08:13:20 +02:00
Jose Gonzalez
08c945d91d
Fixed missed buttons, improve code and added go back button when create-update
2021-06-03 15:37:11 +02:00
Daniel Rodriguez
b5802d41c7
Merge branch 'ent-7604-Vulnerabilidad-file-manager-images' into 'develop'
...
Fix vulnerability with directories created in upper levels
Closes pandora_enterprise#7604
See merge request artica/pandorafms!4158
2021-06-03 11:36:22 +00:00
alejandro.campos@artica.es
b8c6922902
minor fixes in report item
2021-06-03 12:04:25 +02:00
Daniel Barbero Martin
97595ad973
Wip command center
2021-06-03 10:16:29 +02:00
alejandro.campos@artica.es
36eb084824
minor fixes
2021-06-02 19:02:25 +02:00
alejandro.campos@artica.es
84905a6579
minor fixes in report item
2021-06-02 18:39:33 +02:00
Daniel Barbero Martin
ea90a61b06
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-02 18:27:15 +02:00
Jose Gonzalez
897a98eab6
Handle directory paths for file upload
2021-06-02 13:17:34 +02:00
marcos
802dc50b79
fixed error updating item reporting
2021-06-02 09:18:40 +02:00
alejandro.campos@artica.es
59834088bf
created agents inventory report item
2021-06-01 18:04:01 +02:00
fbsanchez
70b8eb77a3
Remove service elements when removing items itselves and multiple fixes
2021-06-01 12:12:07 +02:00
alejandro.campos@artica.es
9cbe6a2924
created new report item
2021-06-01 09:43:55 +02:00
Daniel Barbero Martin
ddc4b47d0b
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-01 08:34:32 +02:00
Daniel Barbero Martin
a996c272e4
Wip command center
2021-05-31 17:32:53 +02:00
Daniel Barbero Martin
3a85c69043
Wip command center
2021-05-31 14:58:36 +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
alejandro.campos@artica.es
3362106afe
added agents inventory report item
2021-05-31 13:13:25 +02: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
275c6d321b
Fixed alert command hide on update
2021-05-28 14:29:53 +02: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
Calvo
62272a1f3f
Unset field tcp send when snmp remote component selected
2021-05-28 12:45:39 +02: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
Daniel Rodriguez
0b158028f3
Merge branch 'ent-7560-item-de-excxeption-no-funciona-en-metaconsola-con-not-ok' into 'develop'
...
Fixed report exception item with not ok on meta
See merge request artica/pandorafms!4143
2021-05-27 16:23:20 +00:00
Luis
db306a30b9
Fixed report exception item with not ok on meta
2021-05-27 16:23:20 +00:00
Daniel Rodriguez
791f007ff6
Merge branch 'ent-7502-11735-problemas-visuales-tema-oscuro' into 'develop'
...
fixed visual error on alerts black theme
See merge request artica/pandorafms!4113
2021-05-27 16:22:19 +00:00
Marcos Alconada
e2cfc5d615
fixed visual error on alerts black theme
2021-05-27 16:22:19 +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
José González
57eeb9a1db
Fix vulnerability with directories created in upper levels
2021-05-27 16:19:51 +02:00
alejandro.campos@artica.es
7abe6d5446
created new report item
2021-05-27 11:22:01 +02:00
Daniel Barbero Martin
a1ca4abe8f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-27 08:22:43 +02:00
Daniel Rodriguez
74b38f299e
Merge branch 'ent-7183-limitar-expansion-lateral-modulos-web-data-server' into 'develop'
...
Resize vertical on textarea web/data server modules css
See merge request artica/pandorafms!4011
2021-05-26 13:39:25 +00:00
Luis
8c100e8809
Resize vertical on textarea web/data server modules css
2021-05-26 13:39:25 +00:00
Daniel Rodriguez
104205a372
Merge branch 'ent-7455-No-funciona-check-de-exec-server' into 'develop'
...
Ent 7455 no funciona check de exec server
See merge request artica/pandorafms!4086
2021-05-26 13:37:27 +00:00
Daniel Rodriguez
44ea35bb69
Merge branch 'ent-7300-email-test-solo-envia-datos-guardados' into 'develop'
...
Email test working with data in text fields
See merge request artica/pandorafms!4090
2021-05-26 13:30:36 +00:00
José González
e7b59ab472
Added standarized headers
2021-05-26 10:16:23 +02: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
96741c1864
Merge branch 'ent-7246-icono-vista-informes-y-custom-graphs' into 'develop'
...
Fixed view icon on report and custom graphs
See merge request artica/pandorafms!4002
2021-05-25 15:53:05 +00:00
Daniel Rodriguez
f01eec72dc
Merge branch 'ent-7460-fallo-visual-en-error-creacion-usuario' into 'develop'
...
Fixed visual bug on user creation error
See merge request artica/pandorafms!4088
2021-05-25 15:51:49 +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
337450a1f8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/ajax.php
pandora_console/extras/delete_files/delete_files.txt
2021-05-24 17:41:28 +02:00
Calvo
8019126367
Fixed group icon on agent creation
2021-05-20 17:15:27 +02:00
fbsanchez
09ccaf254e
Fixed public access and added PublicLogin interface, including code style fixex
2021-05-19 11:31:52 +02:00
Daniel Barbero Martin
6c305833bf
fix groups, module_groups, network_components user_edit synch
2021-05-18 17:18:54 +02:00
Daniel Barbero Martin
5d70226b13
fix category, Os, tags, user_edit synch
2021-05-18 11:02:00 +02:00
Daniel Barbero Martin
ec6cb4d532
fix category, Os, tags, user_edit synch
2021-05-18 10:57:21 +02:00
Daniel Barbero Martin
a0982cd260
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/users/profile_list.php
2021-05-18 08:39:06 +02:00
Daniel Barbero Martin
4c12c6e770
fix profiles and user synch
2021-05-17 17:57:08 +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
alejandro.campos@artica.es
1c1e25e712
Added new item type in reports
2021-05-14 14:54:09 +02: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
alejandro.campos@artica.es
9cde8c345f
removed deprecated incident permissions
2021-05-13 13:33:45 +02:00
Daniel Rodriguez
13fa1159ce
Merge branch 'ent-6858-Goliat-opensource' into 'develop'
...
Backup upload
See merge request artica/pandorafms!3936
2021-05-12 13:10:48 +00:00
Daniel Maya
9c234eef85
Ent 7087 mensaje duplicado en los test mails
2021-05-11 13:48:09 +00:00
José González
5aa5e9eab4
Merge branch 'develop' into 'ent-6858-Goliat-opensource'
...
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
2021-05-11 13:11:51 +00:00
Daniel Rodriguez
89dcde6ca7
Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop'
...
minor changes
See merge request artica/pandorafms!4107
2021-05-11 07:40:24 +00:00
Daniel Rodriguez
ac0ef3c61c
Merge branch 'ent-7475-Mejor-interfaz-de-configuracion-en-integracion-Integria' into 'develop'
...
minor change in integria ims setup
See merge request artica/pandorafms!4104
2021-05-11 07:39:16 +00:00
Daniel Rodriguez
d1e0f070f1
Merge branch 'ent-7296-botones-descolocados-gestion-eventos-metaconsola' into 'develop'
...
Event responses buttons visual bug
See merge request artica/pandorafms!4111
2021-05-10 09:11:29 +00:00
Daniel Rodriguez
5a339ac76e
Merge branch 'ent-7284-Warning-creación-agente' into 'develop'
...
Ent 7284 warning creación agente
See merge request artica/pandorafms!4017
2021-05-10 09:10:43 +00:00
Daniel Maya
cdf0e1a4f4
Ent 7284 warning creación agente
2021-05-10 09:10:43 +00:00
Daniel Rodriguez
3d8f0b58d6
Merge branch 'ent-7258-spinner-infinito-agentes-report-sla-items' into 'develop'
...
Fix bugs with SLA item reports
Closes pandora_enterprise#7258
See merge request artica/pandorafms!4000
2021-05-10 09:09:36 +00:00
Daniel Rodriguez
514a91c853
Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop'
...
Ent 6541 quitar id usuario url seccion usuario
Closes pandora_enterprise#6541
See merge request artica/pandorafms!3990
2021-05-10 09:08:59 +00:00
Daniel Rodriguez
6faefa4afa
Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
...
Unified downtime name as scheduled downtime
See merge request artica/pandorafms!4001
2021-05-10 09:06:43 +00:00
Luis
f25256a74d
Unified downtime name as scheduled downtime
2021-05-10 09:06:43 +00:00
alejandro.campos@artica.es
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
José González
0a7c960630
Added control for autocomplete input icon
2021-05-07 12:40:38 +02:00
Calvo
3359b21d5b
Event responses buttons visual bug
2021-05-06 16:06:21 +02:00
José González
ce5934b9a1
Added form-type buttons for user-actions
2021-05-06 14:46:58 +02:00
Daniel Rodriguez
c39d013afb
Merge branch 'ent-7227-Perfil-LM-no-permite-modificar-acciones-ni-templates' into 'develop'
...
Ent 7227 perfil lm no permite modificar acciones ni templates
See merge request artica/pandorafms!3980
2021-05-06 12:22:48 +00:00
Daniel Maya
c003964394
Ent 7227 perfil lm no permite modificar acciones ni templates
2021-05-06 12:22:47 +00:00
Daniel Rodriguez
8e737502c5
Merge branch 'ent-7133-texto-ingles-discovery' into 'develop'
...
Fixed text
Closes pandora_enterprise#7133
See merge request artica/pandorafms!3976
2021-05-06 12:10:21 +00:00
Daniel Rodriguez
325e400b11
Merge branch 'ent-7109-Bug-al-duplicar-alertas-snmp' into 'develop'
...
Ent 7109 bug al duplicar alertas snmp
See merge request artica/pandorafms!3934
2021-05-06 12:07:16 +00:00
Daniel Rodriguez
db92b65fd0
Merge branch 'ent-7211-errores-visuales-en-la-vista-de-agente' into 'develop'
...
resolved error with sql message error external tools2
See merge request artica/pandorafms!3979
2021-05-06 12:05:04 +00:00
alejandro.campos@artica.es
aa4769d331
minor changes
2021-05-05 13:02:53 +02:00
alejandro.campos@artica.es
d358fd894d
minor change in integria ims setup
2021-05-05 11:03:32 +02:00
José González
dbb7fe364f
Added standard headers
2021-04-30 14:35:54 +02:00
José González
ab984b8c32
Added standard headers
2021-04-30 13:50:58 +02:00
José González
46a691c397
Added standard headers
2021-04-30 13:24:55 +02:00
José González
3f33a0ec29
Added standard header
2021-04-30 12:35:02 +02:00
José González
71c88313d5
Added standard header
2021-04-30 10:58:37 +02:00
Calvo
6ad371e4ab
Email test working with data in text fields
2021-04-29 16:04:51 +02:00
José González
9ab027b286
WIP: Upload
2021-04-29 13:28:03 +02:00
Calvo
4aea645735
Fixed visual bug on user creation error
2021-04-29 11:15:20 +02:00
Daniel Maya
1d472ec480
#7455 Fixed check_process
2021-04-29 08:55:16 +02:00
Marcos Alconada
b00e7eff8b
fixed size with select2 in module component
2021-04-28 10:48:32 +00:00
Daniel Rodriguez
28984aa414
Merge branch 'ent-7384-bug-acl-en-usuario-con-permiso-rr-u-o-rw' into 'develop'
...
fixed error with rr and rw in report list - acls
See merge request artica/pandorafms!4068
2021-04-27 14:07:48 +00:00