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

29387 Commits

Author SHA1 Message Date
fbsanchez 8f364c3914 Some errata fix 2022-02-01 21:40:09 +01:00
fbsanchez 5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-01 15:16:21 +01:00
fbsanchez ead8b39146 some updates 2022-02-01 15:11:59 +01:00
Daniel Rodriguez 91797c7112 Merge branch 'ent-8470-POST-ocultar-comando-en-respuestas-de-eventos-2' into 'develop' 
added token to display or hide command in event response execution

See merge request artica/pandorafms!4671
 2022-02-01 13:42:14 +00:00
alejandro.campos@artica.es 74c2dafed0 added token to display or hide command in event response execution 2022-02-01 14:30:25 +01:00
fbsanchez b15feab154 MySQL8 review for pandoradb.sql 2022-02-01 13:49:32 +01:00
Daniel Rodriguez 4ba18dc52b Merge branch 'ent-8119-Llamada-a-la-API-nodo-centralizado' into 'develop' 
implemented api method

See merge request artica/pandorafms!4659
 2022-02-01 09:42:42 +00:00
Daniel Rodriguez d21d65a7ac Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop' 
Added select filtered modulo to custom graphs conf menu

See merge request artica/pandorafms!4647
 2022-02-01 09:38:12 +00:00
Daniel Rodriguez 8c01afafdb Merge branch 'ent-8170-busqueda-de-tree-view-metaconsola-se-descuadra-con-baja-resolucion' into 'develop' 
Fix tree view filter view on meta

See merge request artica/pandorafms!4649
 2022-02-01 09:36:20 +00:00
Daniel Rodriguez 0e6e7b051d Merge branch 'ent-8502-12981-Cálculo-SLA-datos-string-parte-3' into 'develop' 
Ent 8502 12981 cálculo sla datos string parte 3

See merge request artica/pandorafms!4661
 2022-02-01 09:35:42 +00:00
Daniel Rodriguez 75f8c02eaf Merge branch 'ent-3763-Nuevas-macros-alertas' into 'develop' 
add new macros #3763

See merge request artica/pandorafms!4640
 2022-02-01 09:34:15 +00:00
Daniel Rodriguez 7aab1fe052 Merge branch 'ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola' into 'develop' 
bulk operations agents in meta #8290

See merge request artica/pandorafms!4645
 2022-02-01 09:32:34 +00:00
fbsanchez 2efbeb5c3d "rebrandable" cicd 2022-02-01 09:57:38 +01:00
fbsanchez 92a33bd6f0 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-01 09:44:57 +01:00
artica 9e12abcfc6 Auto-updated build strings. 2022-02-01 01:00:17 +01:00
artica 73b754f52d Auto-updated build strings. 2022-01-31 01:00:10 +01:00
artica 8001f6b1f2 Auto-updated build strings. 2022-01-30 01:00:15 +01:00
artica 6ffef13b9a Auto-updated build strings. 2022-01-29 01:00:20 +01:00
fbsanchez 401dd85c30 updates 2022-01-28 14:07:36 +01:00
fbsanchez c908925a5f legacy force use python instead defined env in script install_console 2022-01-28 13:44:09 +01:00
fbsanchez afd0d58a7e Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-01-28 13:38:57 +01:00
fbsanchez 350d5702e3 test-legacy 2022-01-28 13:38:52 +01:00
fbsanchez 08a7f62090 force compatibility test 2022-01-28 13:30:02 +01:00
artica b23f101812 Auto-updated build strings. 2022-01-28 01:00:20 +01:00
fbsanchez 59e95079f0 cicd moved to rocky8.5 2022-01-27 23:38:48 +01:00
fbsanchez 010f3c6125 docker image based on rockylinux 8.5 2022-01-27 23:37:20 +01:00
fbsanchez 61605f6168 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-01-27 23:19:33 +01:00
fbsanchez e157b1102f Pandora WebSockets fix 2022-01-27 23:18:12 +01:00
Daniel Maya 152b19d937 Fixed inversal interval with string module 2022-01-27 16:58:29 +01:00
alejandro.campos@artica.es 4cf312f88e implemented api method 2022-01-27 13:23:12 +01:00
Daniel Barbero Martin c597ca3629 Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-27 08:08:43 +01:00
artica 4da16bedf8 Auto-updated build strings. 2022-01-27 01:00:23 +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
Daniel Barbero Martin d76745cc9f chrome never autocomplete 2022-01-26 12:17:07 +01:00
Calvo 5b624fc388 Added searchbar to select multiple modules on custom graph 2022-01-26 11:52:49 +01:00
fbsanchez 9c09f43ad8 fix in recon definition 2022-01-26 11:48:07 +01:00
Daniel Barbero Martin 7b956d3ca1 select 2 never autocomplete 2022-01-26 09:14:19 +01:00
Daniel Barbero Martin 9f01029520 Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-26 08:12:20 +01:00
artica 11e0c99e74 Auto-updated build strings. 2022-01-26 01:00:23 +01:00
Calvo f383586dcc WIP:Added searchbar to select multiple modules 2022-01-25 20:15:40 +01:00
Calvo 96d0194009 Merge remote-tracking branch 'origin/develop' into ent-8206-busqueda-de-modulos-en-graficas-personalizadas 2022-01-25 15:39:58 +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
Calvo 926d3f5627 Fix tree view filter view on meta 2022-01-25 12:57:26 +01:00
vgilc a32fe84ca0 Merge branch 'ent-8454-Error-SQL-en-bulk-operations-en-copia-de-modulos' into 'develop' 
fixed bulk copy of modules with percent character

See merge request artica/pandorafms!4639
 2022-01-25 10:41:43 +00:00
vgilc 6edc6c6d40 Merge branch 'ent-8437-SQL-Injection-en-API' into 'develop' 
sanitize sql inputs

See merge request artica/pandorafms!4629
 2022-01-25 10:30:01 +00:00
vgilc f2d0ecc304 Merge branch 'ent-7485-12717-incluir-botones-de-generacion-de-informe-en-vista-html' into 'develop' 
Added combo with all export formats to report html view

See merge request artica/pandorafms!4638
 2022-01-25 10:29:00 +00: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