tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-24 03:08:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,402 Commits 34 Branches 30 Tags
Commit Graph

17573 Commits

Author SHA1 Message Date
José González
7edcd3b0a6 Improve code and fix update alerts 2022-06-29 11:05:50 +02:00
José González
8ffc5aef97 Minor improvements 2022-06-29 09:14:21 +02:00
Daniel Barbero Martin
e3dfbf2bb2 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-29 09:14:17 +02:00
Jimmy Olano
5f5ca9ac13 Merge branch 'ent-9009-dashboards-widget-Estado-del-Módulo-pone-icono-inexistente' into 'develop' 
Ent 9009 dashboards widget estado del módulo pone icono inexistente

See merge request artica/pandorafms!4900
 2022-06-29 01:18:35 +00:00
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
José González
c3dc1d820d Frontend changes 2022-06-28 17:24:49 +02:00
José González
ded27ce411 Backend changes 2022-06-28 17:24:22 +02: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
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 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 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
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
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
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
Daniel Barbero Martin
f89aaabc21 minor fixed events 2022-06-23 18:06:25 +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 Barbero Martin
58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +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
Daniel Rodriguez
d6ab78ba68 Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop' 
Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
 2022-06-23 07:53:11 +00:00
artica
7854206ede Updated version and build strings. 2022-06-23 08:27:31 +02:00
Daniel Barbero Martin
b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02:00
artica
a254c7d3c5 Auto-updated build strings. 2022-06-23 01:01:15 +02:00
Daniel Rodriguez
428de71b85 Merge branch 'ent-9192-cambio-imagen-warp-update-online' into 'develop' 
new images update manager online pandora_enterprise#9192

See merge request artica/pandorafms!4976
 2022-06-22 14:44:20 +00:00
Daniel Barbero Martin
e77ae67fb2 new images update manager online pandora_enterprise#9192 2022-06-22 14:48:54 +02:00
Daniel Rodriguez
7e206716d7 Merge branch 'ent-9181-problema-al-borrar-agentes-cuando-hay-modulos-delete-pending' into 'develop' 
Ent 9181 problema al borrar agentes cuando hay modulos delete pending

See merge request artica/pandorafms!4973
 2022-06-22 12:29:19 +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
0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00