tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-23 02:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,526 Commits 34 Branches 30 Tags
Commit Graph

15166 Commits

Author SHA1 Message Date
Jose Gonzalez
6ee5b9c3e9 Fix issues 2021-03-04 11:33:21 +01:00
Daniel Rodriguez
94b04a8ef4 Merge branch 'ent-6106-Exportacion-CSV-en-icono-grafica-es-diferente-a-la-exportacion-normal' into 'develop' 
Fix styles file export_data

See merge request artica/pandorafms!3691
 2021-03-04 10:29:52 +00:00
daniel
fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
Alejandro Campos
d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
Daniel Barbero Martin
90af8824de Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-04 08:18:29 +01:00
artica
4d1cab6b67 Auto-updated build strings. 2021-03-04 01:00:19 +01:00
daniel
6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00
artica
442d0d440a Auto-updated build strings. 2021-03-03 01:00:23 +01:00
Daniel Rodriguez
abdfe6b77f Merge branch 'ent-7064-no-se-muestran-los-mensajes' into 'develop' 
fixed error not show messages

See merge request artica/pandorafms!3859
 2021-03-02 12:50:36 +00:00
Daniel Rodriguez
51404eda8d Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop' 
Ent 7077 no funciona doble auth meta

See merge request artica/pandorafms!3866
 2021-03-02 12:24:03 +00:00
Luis
93a4a90dd6 Ent 7077 no funciona doble auth meta 2021-03-02 12:24:03 +00:00
Daniel Rodriguez
8c730f7a0c Merge branch 'ent-6522-fallo-visual-vista-ficheros-colecciones' into 'develop' 
Added infobox for empty folder on collections

See merge request artica/pandorafms!3717
 2021-03-02 12:21:13 +00:00
Luis
28b8092669 Added infobox for empty folder on collections 2021-03-02 12:21:13 +00:00
Daniel Barbero Martin
da263b23d2 WIP Command center 2021-03-02 11:09:55 +01:00
fbsanchez
c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus 
Conflicts:
	pandora_console/extras/mr/45.sql
 2021-03-02 09:48:33 +01:00
fbsanchez
d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
Daniel Barbero Martin
12b63b8a7a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-02 08:33:20 +01:00
Daniel Barbero Martin
2ea6c9dbda WIP Command center 2021-03-02 08:32:59 +01:00
artica
19ab53cfb8 Auto-updated build strings. 2021-03-02 01:00:21 +01:00
Daniel Rodriguez
23cddae261 Merge branch 'ent-5229-filtro-event-report' into 'develop' 
Added string exclude filter to events reports

See merge request artica/pandorafms!3748
 2021-03-01 15:28:18 +00:00
Daniel Rodriguez
4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
Daniel Rodriguez
23edf2f11f Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop' 
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco

See merge request artica/pandorafms!3695
 2021-03-01 12:14:54 +00:00
Daniel Rodriguez
72ecb53412 Merge branch 'ent-6602-AXA-Recursividad-de-grupos-no-funciona-en-operaciones-masivas' into 'develop' 
fix recursivity check

See merge request artica/pandorafms!3711
 2021-03-01 10:57:45 +00:00
Daniel Rodriguez
39d0e66983 Merge branch 'ent-6378-descarga-custom-field-view' into 'develop' 
Added ACL check to custom view CSV donwload

See merge request artica/pandorafms!3714
 2021-03-01 10:47:50 +00:00
Daniel Rodriguez
0ff981e279 Merge branch 'ent-6364-bug-set-stop-downtime-api' into 'develop' 
Fixed api call set stop_downtime

See merge request artica/pandorafms!3704
 2021-03-01 10:46:33 +00:00
Daniel Rodriguez
da15dfc69c Merge branch 'ent-5347-Mensaje-de-aviso-de-información-actualizada-erróneo-al-cambiar-el-idioma' into 'develop' 
Ent 5347 mensaje de aviso de información actualizada erróneo al cambiar el idioma

See merge request artica/pandorafms!3698
 2021-03-01 10:41:39 +00:00
Daniel Rodriguez
55f9ab6d57 Merge branch 'ent-5113-Metaconsola-vista-tactica-alertas-disparadas' into 'develop' 
fixed triggered alerts count

See merge request artica/pandorafms!3716
 2021-03-01 10:29:31 +00:00
Daniel Rodriguez
54fa645d00 Merge branch 'ent-6840-Errores-en-la-vista-de-Omnishell' into 'develop' 
Ent 6840 errores en la vista de omnishell

See merge request artica/pandorafms!3732
 2021-03-01 10:19:21 +00:00
Daniel Rodriguez
b2ed2f5511 Merge branch 'ent-6833-planned-downtimes-any-no-funciona' into 'develop' 
Fix issue with adding agents and modules

Closes pandora_enterprise#6833

See merge request artica/pandorafms!3723
 2021-03-01 10:05:59 +00:00
Daniel Rodriguez
0243740ab1 Merge branch 'ent-6136-fallos-visuales-en-la-correlacion-de-alertas' into 'develop' 
add new style

See merge request artica/pandorafms!3789
 2021-03-01 10:02:19 +00:00
Marcos Alconada
0d4761b63d add new style 2021-03-01 10:02:18 +00:00
Daniel Rodriguez
1128b366d5 Merge branch 'ent-5537-cambio-en-botones-de-select-all-de-ventanas-de-seleccion-de-agentes' into 'develop' 
Ent 5537 cambio en botones de select all de ventanas de seleccion de agentes

See merge request artica/pandorafms!3696
 2021-03-01 10:00:22 +00:00
Daniel Maya
6175d91298 Ent 5537 cambio en botones de select all de ventanas de seleccion de agentes 2021-03-01 10:00:22 +00:00
Daniel Rodriguez
a0335b5fe6 Merge branch 'ent-4336-8257-separar-alertas-de-system-status-para-elegir-cuales-deseamos-recibir' into 'develop' 
Ent 4336 8257 separar alertas de system status para elegir cuales deseamos recibir

See merge request artica/pandorafms!3846
 2021-03-01 09:57:51 +00:00
artica
0587500074 Auto-updated build strings. 2021-03-01 01:00:09 +01:00
artica
0cf47e4b00 Auto-updated build strings. 2021-02-28 01:00:06 +01:00
artica
814a39235e Auto-updated build strings. 2021-02-27 01:00:19 +01:00
Daniel Barbero Martin
58ca60c857 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-02-26 08:37:06 +01:00
Daniel Barbero Martin
85ec17f3e1 WIP Command center 2021-02-26 08:36:48 +01:00
artica
dc04a2b2b5 Auto-updated build strings. 2021-02-26 01:00:19 +01:00
Luis
eb5e295286 Ent 7080 error servicios elementos modulo 2021-02-25 17:56:21 +00:00
Jose Gonzalez
7cfc1d2f9a Fixed issue with all modules 2021-02-25 16:08:02 +01:00
alejandro.campos@artica.es
901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
Daniel Barbero Martin
36d4b7b7c3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-02-25 09:46:59 +01:00
artica
078ab1657f Auto-updated build strings. 2021-02-25 01:00:25 +01:00
fbsanchez
9f694e32f7 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php
 2021-02-24 09:41:53 +01:00
artica
508b953496 Auto-updated build strings. 2021-02-24 01:00:21 +01:00
marcos
b13d5dc8d4 fixed error not show messages 2021-02-23 14:35:57 +01:00
Jose Gonzalez
e68d2bfe5c Fixed issue with URLs 2021-02-23 14:32:51 +01:00
Luis Calvo
e258069c39 Fixed data always formatting to date in sys uptime snmp modules 2021-02-23 11:50:35 +01:00