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

15320 Commits

Author SHA1 Message Date
fermin831 4d27093679 Fixed down server time calculation 2017-09-18 11:50:40 +02:00
vgilc a51952b3ed Merge branch '1245-Añadir-resumen-de-grupos-como-elemento-de-consola-visual-all-browsers-compatible' into 'develop' 
Compatible with all browsers - #1245

See merge request !824
 2017-09-18 11:13:59 +02:00
enriquecd e05d0bab25 Compatible with all browsers - #1245 2017-09-18 11:07:59 +02:00
vgilc d0f8b9d2a5 Merge branch '118-pandora_db-pl-use-uninisialized-config-value' into 'develop' 
Resolve "pandora_db.pl use uninisialized config value"

Closes #118

See merge request !361
 2017-09-18 10:53:17 +02:00
vgilc 4e840651be Merge branch '1217-errors-in-pandora-report-templates-macros-dev' into 'develop' 
1217 errors in pandora report templates macros dev

See merge request !822
 2017-09-18 10:28:54 +02:00
Arturo Gonzalez e3c01374b1 Added changes to meta report templates 2017-09-18 10:18:38 +02:00
vgilc 08ac4c2f35 Merge branch '161-Massive-Operations-remains-at-Console' into 'develop' 
"Massive Operations" had remained at Pandora Console.

Closes #161

See merge request !729
 2017-09-18 10:12:41 +02:00
vgilc bfbee7179d Merge branch 'Problemas_con_full_scale' into 'develop' 
fixed error in full_scale

See merge request !809
 2017-09-18 09:25:10 +02:00
artica 9a6a22718e Auto-updated build strings. 2017-09-18 00:01:20 +02:00
artica 14cea700ad Auto-updated build strings. 2017-09-17 00:01:19 +02:00
artica d35a88e439 Auto-updated build strings. 2017-09-16 00:01:20 +02:00
Arturo Gonzalez e3d42a878a Added changes to NODE 2017-09-15 13:21:51 +02:00
vgilc 27b01240d8 Merge branch '1330-perms-problem-in-cron-jobs-dev' into 'develop' 
Added servers sction in menu to RR perms

See merge request !821
 2017-09-15 10:24:06 +02:00
artica 802a782c9a Auto-updated build strings. 2017-09-15 00:01:21 +02:00
Arturo Gonzalez eb6e67e1ca Added servers sction in menu to RR perms 2017-09-14 17:56:57 +02:00
vgilc e8a3484646 Merge branch '1306-visual-console-management-with-cli-dev' into 'develop' 
1306 visual console management with cli dev

See merge request !819
 2017-09-14 15:48:08 +02:00
Arturo Gonzalez 4fd4783bc5 Added edit function with auto position 2017-09-14 13:14:31 +02:00
Arturo Gonzalez bb0e15261a Added editor function when static option is enabled 2017-09-14 12:07:52 +02:00
vgilc cd31d560ea Merge branch '1327-Desplazamiento-elementos-que-contiene-hipervículo-sin-enable-link-en-consola-visual' into 'develop' 
Fix - Horizontal scrolling of elements with hyperlink in label for VC - #1327

See merge request !817
 2017-09-14 11:38:06 +02:00
enriquecd 8907b393df Fix - Horizontal scrolling of elements with hyperlink in label for VC - #1327 2017-09-14 10:27:11 +02:00
Arturo Gonzalez aa8ee4278d Added export to JSON function to cli 2017-09-14 09:37:45 +02:00
artica 41956caa5c Auto-updated build strings. 2017-09-14 00:01:20 +02:00
Arturo Gonzalez f03514c771 Added first version to export console elements to json 2017-09-13 18:07:45 +02:00
Arturo Gonzalez 351f9e27b1 Added duplicate function 2017-09-13 17:39:17 +02:00
vgilc 2620de69e6 Merge branch '1245-Anadir-resumen-de-grupos-como-elemento-de-consola-visual-2' into 'develop' 
Let create a group status visual map element without image selected - #1245

See merge request !816
 2017-09-13 17:15:34 +02:00
enriquecd 7b2e2fadc6 Let create a group status visual map element without image selected - #1245 2017-09-13 17:07:35 +02:00
Arturo Gonzalez 26522ecaaa Added remove console items function to cli 2017-09-13 15:19:41 +02:00
Arturo Gonzalez e7cdf9b049 Added creation when elements position is auto 2017-09-13 13:27:37 +02:00
vgilc 754697f51c Merge branch 'ent-966-os_version-en-ficheros-xml-ext-4098-v7-0' into 'develop' 
Ent 966 os version en ficheros xml ext 4098 v7 0

See merge request !813
 2017-09-13 12:53:43 +02:00
artica 4cc2a5da0a Auto-updated build strings. 2017-09-13 00:01:21 +02:00
vgilc 8526cdd22a Merge branch '1318-4514-Problema-con-elementos-de-tipo-Auto-SLA-Graph-en-consolas-visuales' into 'develop' 
Fix SLA visual map item - #1318

See merge request !815
 2017-09-12 17:03:27 +02:00
enriquecd 3f6f544dc7 Fix SLA visual map item - #1318 2017-09-12 16:39:31 +02:00
artica 870a59ba57 Auto-updated build strings. 2017-09-12 00:01:21 +02:00
Arturo Gonzalez 4dec318607 Added function to create visual console with elements in cli 2017-09-11 17:56:42 +02:00
fermin831 89fc3c457a Fixed no os_version on event agent view 2017-09-11 17:54:28 +02:00
fermin831 787fb00d16 Avoid to overwrite the os_version when is empty 2017-09-11 17:46:56 +02:00
vgilc ab3b6838b9 Merge branch '1296-Barra-de-eventos---Vista-táctica-metaconsola-dev' into 'develop' 
added filter by user groups

See merge request !810
 2017-09-11 16:32:04 +02:00
Arturo Gonzalez ac36c701f7 Added a first contact with the new functions 2017-09-11 16:09:13 +02:00
Daniel Maya 975267eff0 added filter by user groups 2017-09-11 13:51:35 +02:00
vgilc 6b588e8c7b Merge branch '624-Operaciones-multiples-con-elementos-de-la-consola-visual' into 'develop' 
Multiple erasure and displacement of elements in visual console - #624

See merge request !645
 2017-09-11 11:56:32 +02:00
Enrique Camargo ae987427d7 Merge branch 'develop' into '624-Operaciones-multiples-con-elementos-de-la-consola-visual' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-09-11 10:44:17 +02:00
vgilc 49f7168e1b Merge branch '1089-Incluir-borrado-de-entradas-en-tgraph_source-al-pandora_db-dev' into 'develop' 
Delete old tgraph_source data

See merge request !806
 2017-09-11 09:58:09 +02:00
vgilc 508a594dba Merge branch '1154-Fallo-en-creación-de-paradas-programadas-en-modo-quiet-dev' into 'develop' 
Added modules selection mode

See merge request !804
 2017-09-11 09:53:06 +02:00
vgilc c9a431d2c9 Merge branch '972-added-disabled-agents-to-policy-agents-selects-dev' into 'develop' 
Added disabled option to get ggroup agents function

See merge request !782
 2017-09-11 09:51:39 +02:00
vgilc d5a89ee1f1 Merge branch 'MR-anadir_resumen_de_grupos_como_elemento_de_consola_visual' into 'develop' 
DB changes for visual console group elements - #1245

See merge request !793
 2017-09-11 09:49:21 +02:00
vgilc da0294b872 Merge branch '1245-Anadir-resumen-de-grupos-como-elemento-de-consola-visual' into 'develop' 
Add show_statistics option for group item - #1245

See merge request !766
 2017-09-11 09:45:45 +02:00
vgilc da0394cc81 Merge branch '1237-Ampliar_caracteres_para_box_de_comunidad_SNMP_en_operaciones_masivas_v7' into 'develop' 
fixed snmp comunity field

See merge request !783
 2017-09-11 09:44:55 +02:00
vgilc 813825a5be Merge branch '1223-Entidades-pendientes-dev' into 'develop' 
Added degree in io_safe_input

See merge request !805
 2017-09-11 09:44:14 +02:00
vgilc 4096a0f5ff Merge branch '1122-Revision-del-estilo-CSS-de-las-paginas-de-ayuda' into 'develop' 
Change pandora help window style - #1122

See merge request !741
 2017-09-11 09:43:39 +02:00
vgilc df1489e08f Merge branch '1194-Extension-DB-inface-en-panel-de-ultima-actividad' into 'develop' 
Fix dbmanager when insert db activity in activity login info panel - #1194

See merge request !739
 2017-09-11 09:42:56 +02:00