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

30784 Commits

Author SHA1 Message Date
artica 87db3d57b5 Auto-updated build strings. 2022-06-29 01:00:36 +02:00
Daniel Barbero Martin c2c519694a size modal form widget pandora_enterprise#8621 2022-06-28 17:49:58 +02:00
Diego Muñoz-Reja 9120eb44c5 Merge branch 'ent-9231-grave-problema-seguridad-vista-de-eventos-metaconsola' into 'develop' 
fix events pandora_enterprise#9231

See merge request artica/pandorafms!4990
 2022-06-28 15:37:46 +00:00
Diego Muñoz-Reja 4d48bdec36 Merge branch 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' into 'develop' 
Changed strings and improve code

See merge request artica/pandorafms!4935
 2022-06-28 15:22:08 +00:00
Diego Muñoz-Reja b73389fff0 Merge branch 'ent-9033-Vista-de-eventos-Validar-eventos-repetidos' into 'develop' 
Ent 9033 vista de eventos validar eventos repetidos

See merge request artica/pandorafms!4953
 2022-06-28 15:17:13 +00:00
Daniel Barbero Martin 867c6a1415 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-28 17:02:01 +02:00
Daniel Barbero Martin 0957dd338f fix events pandora_enterprise#9231 2022-06-28 16:56:25 +02:00
José González 2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' 
# Conflicts:
#   pandora_console/index.php
 2022-06-28 14:39:37 +00:00
Daniel Barbero Martin 2632816e13 top n regex pandora_enterprise#9129 2022-06-28 16:32:37 +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
José González b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' 
# Conflicts:
#   pandora_console/godmode/menu.php
 2022-06-28 14:08:13 +00:00
daniel 4ca27cd5a9 Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop' 
events sound pandora_enterprise#7960

See merge request artica/pandorafms!4923
 2022-06-28 13:47:05 +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 a1cae74fa8 Merge branch 'ent-8827-cambios-visuales-en-widget-agents-modules' into 'develop' 
fixed modal size configuration widgets pandora_enterprise#8827

See merge request artica/pandorafms!4893
 2022-06-28 13:44:43 +00:00
alejandro.campos@artica.es 609dc7deab changes in agent logrotate 2022-06-28 12:11:13 +02:00
alejandro.campos@artica.es 5b9b3f08b1 changes in agent logrotate 2022-06-28 12:10:10 +02:00
Daniel Maya 90c5155c1c #8939 conflict resolved 2 2022-06-28 11:26:08 +02:00
Daniel Barbero Martin 6d1121602a delete item into widget pandora_enterprise#9213 2022-06-28 11:09:47 +02:00
Daniel Maya 475524df04 #8939 conflict resolved 2022-06-28 10:58:17 +02:00
Daniel Barbero Martin 9612bd69f1 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-28 09:17:58 +02:00
Daniel Barbero Martin 7a93861a2b fixed size modal pandora_enterprise#8827 2022-06-28 09:14:11 +02:00
Daniel Barbero Martin 6edc6e1014 Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-28 08:51:22 +02:00
artica 6765cc136f Auto-updated build strings. 2022-06-28 01:01:20 +02:00
Daniel Barbero Martin 941d477403 fixed size modal pandora_enterprise#8827 2022-06-27 18:07:01 +02:00
Daniel Maya 2049805de7 #9033 conflict resolved 2022-06-27 17:13:23 +02:00
Daniel Barbero Martin d969ac42bf legend combined graph module view pandora_enterprise#8621 2022-06-27 17:09:27 +02:00
Daniel Maya 693c5d5044 #9172 Changed configure user 2022-06-27 16:48:00 +02:00
Daniel Barbero Martin 1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/functions_events.php
 2022-06-27 16:07:19 +02:00
Daniel Barbero Martin b82ea58efd new icons widgets dashboards pandora_enterprise#8621 2022-06-27 16:00:36 +02:00
Daniel Barbero Martin 3cdde5054a size form widgets dashboards pandora_enterprise#8827 2022-06-27 15:43:42 +02:00
Daniel Barbero Martin ebe5f0de7c Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-27 09:48:18 +02:00
Daniel Barbero Martin f1ac9cefd8 new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:47:33 +02:00
Daniel Barbero Martin a5e845e98f new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:45:21 +02:00
Daniel Barbero Martin 24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
 2022-06-27 08:38:50 +02:00
artica beefbff267 Auto-updated build strings. 2022-06-27 01:00:34 +02:00
artica cab6fdbf12 Auto-updated build strings. 2022-06-26 01:00:39 +02:00
artica 036aa788fa Auto-updated build strings. 2022-06-25 01:00:46 +02:00
vgilc af2a6da47a Merge branch 'ent-update-japanese-translations' into 'develop' 
Updated Japanese console translations.

See merge request artica/pandorafms!4984
 2022-06-24 06:37:48 +00:00
Junichi Satoh 8123392c50 Updated Japanese console translations. 2022-06-24 13:53:57 +09:00
artica a7051ea40d Auto-updated build strings. 2022-06-24 01:00:53 +02:00
vanessa gil 653226d45b Clean version. 2022-06-23 19:54:26 +02:00
Daniel Rodriguez 85b1af94a4 Merge branch 'ent-9211-cambio-como-se-muestra-la-vista-de-stadisticas-de-nodos-en-los-eventos-de-meta' into 'develop' 
minor fixed events

See merge request artica/pandorafms!4983
 2022-06-23 16:21:04 +00:00
Daniel Barbero Martin f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Rodriguez 051e16e535 Merge branch 'ent-9206-subir-version-paquete-y-mr' into 'develop' 
mr

See merge request artica/pandorafms!4981
 2022-06-23 12:44:49 +00:00
Daniel Barbero Martin bf28b44339 mr 2022-06-23 14:35:38 +02:00
Daniel Rodriguez 7af375567d Merge branch 'ent-9197-Problema-cabecera-menu' into 'develop' 
Change collapsed filename

See merge request artica/pandorafms!4977
 2022-06-23 12:29:26 +00:00
Daniel Rodriguez 1c52a2552c Merge branch 'ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado' into 'develop' 
Ent 9086 eliminacion de la replicacion de eventos duplicado

See merge request artica/pandorafms!4932
 2022-06-23 11:17:47 +00: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 Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
José González 237de0ee97 Resized alert action list and refactor 2022-06-23 12:21:00 +02:00