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

19783 Commits

Author SHA1 Message Date
fbsanchez 7df9d4f78b WIP: H&D merge 
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
 2019-02-14 17:14:01 +01:00
Daniel Rodriguez 52c4b3dab1 Merge branch 'ent-2806-Administracion_base_de_datos_de_historico' into 'develop' 
add params setup historic database

See merge request artica/pandorafms!2154

Former-commit-id: ef832c053b6e678ec48c95a5494aa2b774b533ed
 2019-02-14 17:00:56 +01:00
fermin831 0d7ea0d056 Added CSV report and copy a lot of not revisted code 
Former-commit-id: 005362b157450862501963770df3fd0419bc573a
 2019-02-14 16:56:03 +01:00
Daniel Barbero 624d804168 Fixed minor error 
Former-commit-id: 05fc8b97c42ee9907954cb28d9e560c9076d50e9
 2019-02-14 16:53:01 +01:00
Tatiana Llorente f849c2b0f0 Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows 
Conflicts:
	pandora_console/include/styles/pandora.css
	pandora_console/install.php


Former-commit-id: d74f5cb5c6ff0cc05542e63d1f8537f289eebfc8
 2019-02-14 16:41:17 +01:00
Daniel Barbero d9ba3af358 Fixed errors in setup performances 
Former-commit-id: 1eb48c00f527f43504a41aea8b352f30792e080b
 2019-02-14 16:31:19 +01:00
Alejandro Fraguas 4c94956b91 Merge branch 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' into 'develop' 
Fixed slow query in template item

See merge request artica/pandorafms!2151

Former-commit-id: db1f74b219dcac4180690d56310dcc2a11acd14d
 2019-02-14 16:15:01 +01:00
Daniel Barbero 40143a1402 fixed reports 
Former-commit-id: 99e8d84b1db440156f8b382ded51be7c39322eed
 2019-02-14 15:50:13 +01:00
Alejandro Fraguas 04e8962cec Merge branch 'ent-2967-6662-Error-504-en-vista-de-eventos' into 'develop' 
Ent 2967 6662 error 504 en vista de eventos

See merge request artica/pandorafms!2167

Former-commit-id: 4096c814248a75bbe5e75858b31ee040379d6486
 2019-02-14 14:55:33 +01:00
fbsanchez 8acb658266 WIP: H&D 
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
 2019-02-14 13:27:49 +01:00
fbsanchez 070db506b8 WIP: H&D 
Former-commit-id: 8f66bccf64b219df20d19d72eb41bec8acdd9bbc
 2019-02-14 11:53:06 +01:00
fbsanchez 685d8c04c2 WIP H&D base structure 
Former-commit-id: dace1164c5a568adbb98c187106838d25334f934
 2019-02-14 11:32:07 +01:00
fbsanchez 3e9e668e00 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices 
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
 2019-02-14 10:59:27 +01:00
fbsanchez 6ff357595d Merge remote-tracking branch 'refs/remotes/origin/ent-3431-discovery-host-devices' into ent-3431-discovery-host-devices 
Former-commit-id: 8210f6bb9abb2c666b6cf4e914d87bb92e8b0690
 2019-02-14 10:58:26 +01:00
fbsanchez 0db88817a9 WIP H&D 
Former-commit-id: c3b0b6f56ff0591f8c5839d61144bbb72ddd7033
 2019-02-14 10:56:25 +01:00
fbsanchez 6e7369d672 Merge branch 'ent-3381-eventos-extendidos' into 'ent-3430-discovery' 
Ent 3381 eventos extendidos

See merge request artica/pandorafms!2169

Former-commit-id: b8a4fd52a30b8cc34c2417499ce3b4a60c027edf
 2019-02-14 10:51:04 +01:00
fbsanchez beb47ec480 Merge branch 'ent-3371-sistema-de-notificaciones-pandora' into 'ent-3430-discovery' 
Ent 3371 sistema de notificaciones pandora

See merge request artica/pandorafms!2129

Former-commit-id: 3a3a2a28f817cf13365bace9d6b963055b0fef75
 2019-02-14 10:50:29 +01:00
fermin831 57991495e4 Use the CSV extension to import CSV on host and devices 
Former-commit-id: ed95b09992ee681e35e7f934b8a8ac70c83bc8be
 2019-02-14 10:30:01 +01:00
Daniel Barbero 52bf8befd2 Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola 
Conflicts:
	pandora_console/install.php


Former-commit-id: 02eb23f0147608c8154aad2c312d8f9d84390806
 2019-02-14 08:06:19 +01:00
Daniel Barbero 0fb61444f6 Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico 
Conflicts:
	pandora_console/godmode/setup/performance.php
	pandora_console/include/functions_api.php
	pandora_console/install.php


Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
 2019-02-14 08:01:23 +01:00
Daniel Barbero 444b5c4bfd Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF 
Conflicts:
	pandora_console/install.php


Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f
 2019-02-14 07:51:53 +01:00
Daniel Barbero f91635c67c fixed errors in pdf reports 
Former-commit-id: fbc3598ab2dfd11cc2bfa850ba49b3e35481218d
 2019-02-14 07:46:19 +01:00
artica f0338cd08e Auto-updated build strings. 
Former-commit-id: d0d40baca6720eb12b085a1968d827b8e9e767b0
 2019-02-14 00:01:26 +01:00
Daniel Rodriguez c0dd81cab5 Merge branch 'ent-3277-Error_al_guardar_password_en_chequeos_wmi' into 'develop' 
Fixed WMI passwords when encrypted

See merge request artica/pandorafms!2164

Former-commit-id: 7c2aeffb2849a3539569b2706b4ca613e1c632a8
 2019-02-13 18:33:11 +01:00
fbsanchez 5b4cadf138 minor style fix 
Former-commit-id: ca2dcf89672832b7796c9b9cc555d36d9db503ec
 2019-02-13 17:16:12 +01:00
Samuel Carcases 812382a47f Update manage_network_components_form.php 
Former-commit-id: 17e3faf98a33bb6f7e21e805085f366944e51ea4
 2019-02-13 16:51:22 +01:00
fbsanchez f75a292b34 minor fixes/updates in notifications UI 
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
 2019-02-13 16:40:37 +01:00
Alejandro Fraguas 8abb1b90dc Merge branch 'ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI' into 'develop' 
Changed popup windows by tooltips

See merge request artica/pandorafms!2106

Former-commit-id: 5682d4f7088be60279aaf33a9756b306a23ea4d8
 2019-02-13 16:08:01 +01:00
Daniel Rodriguez f7134b6d81 Merge branch 'ent-3377-Bug_Manager_Update_Online_de_la_version_OpenSource' into 'develop' 
Ent 3377 bug manager update online de la version open source

See merge request artica/pandorafms!2171

Former-commit-id: f353173953ab39af5bd6e1f39d41e37c7476618a
 2019-02-13 15:56:19 +01:00
fbsanchez 7f4353c4bc optimized. events_has_extended_info 
Former-commit-id: 2435badcea24fd5777bde358658409bf947a2d4b
 2019-02-13 15:55:03 +01:00
fbsanchez 453c639c53 optimized. events_has_extended_info 
Former-commit-id: 805b80f1a9e09425b0e5710906886ae39e791753
 2019-02-13 15:54:40 +01:00
Daniel Maya 4c809ba8d2 event query optimization 
Former-commit-id: 322868d281ddeac4006480bac6dbf03434ffefa1
 2019-02-13 15:41:34 +01:00
fbsanchez 10a37c313c DB schema update native WMI scan 
Former-commit-id: 995fce571f2f37c5cbe891f726fa979cbb8ef183
 2019-02-13 15:05:21 +01:00
fermin831 9951aadab3 Fixed typo 
Former-commit-id: 469f46c34caefcb6b810e99f88a9223434959182
 2019-02-13 15:04:53 +01:00
fermin831 74e16b656b Disable max postpone select 
Former-commit-id: 43460b3304b70d6d0248ace672d51c2b48c3d22c
 2019-02-13 15:03:59 +01:00
fbsanchez ed63ef47fa Moved ReconServer to DiscoveryServer 
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
 2019-02-13 14:56:10 +01:00
manuel 40419ea587 Merge branch 'develop' into ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI 
Conflicts:
pandora_console/godmode/agentes/module_manager_editor_wmi.php


Former-commit-id: ec88c5b6ff36318db9a1f9ca98651bb49aa6eb9d
 2019-02-13 14:55:21 +01:00
fermin831 0ecf2bb9c4 Added pandora db messages purgue 
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
 2019-02-13 14:43:55 +01:00
manuel bf0fc07533 Merge branch 'develop' into 3219-Vista-de-custom-fields-diferente-nodo-meta2 
Conflicts:
pandora_console/include/functions_events.php


Former-commit-id: 00b8cb47f7294fa6cd3c3fe257e18a1e56759580
 2019-02-13 14:38:56 +01:00
fermin831 855822f61e Fixed arrow on notifications area 
Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931
 2019-02-13 12:44:30 +01:00
samucarc 6a9e69adb1 Added changes 
Former-commit-id: 0d0de6dba065aaaa5bbfc4b9f9790e4ef1b92b7d
 2019-02-13 12:21:31 +01:00
Daniel Rodriguez 80407881dc Merge branch 'ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte' into 'develop' 
Changed radio buttons by toogle switch checkbox

See merge request artica/pandorafms!2130

Former-commit-id: ab3aa0dbe0266fccba771fb3aa36ca3fb7d489ac
 2019-02-13 12:14:13 +01:00
manuel b11d1a6687 Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte 
Conflicts:
pandora_console/godmode/setup/setup_auth.php
pandora_console/include/functions_api.php
pandora_console/install.php


Former-commit-id: 70caf6f8d0b99057c55b21c8e3b4317a343923fb
 2019-02-13 12:03:46 +01:00
fermin831 8be28b5fed Removed some header icons (it will be substituted by notifications) 
Former-commit-id: 29929ee6f9785cf892b3a0afe7779531d5615e6c
 2019-02-13 11:47:33 +01:00
fermin831 fe50d6caff Open toasts and messages into new window 
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
 2019-02-13 11:09:15 +01:00
Alejandro Fraguas 20d7598abb Merge branch '3145-Fallback_to_local_and_save_password' into 'develop' 
Save password option disabled if Fallback is enabled

See merge request artica/pandorafms!2137

Former-commit-id: 48390e003cad5f9393282907587d51ce9a92dfd8
 2019-02-13 10:07:58 +01:00
Daniel Barbero eeb5f0e296 Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF 
Conflicts:
	pandora_console/include/functions_reporting_html.php
	pandora_console/install.php


Former-commit-id: 8f8f95cebc06d0a6802c6a7204a942658efa21f0
 2019-02-13 08:02:46 +01:00
Daniel Barbero 93edda07ee fixed errors 
Former-commit-id: 167c9a725e5dbd4f4ae1db0b6fb6c573a364c122
 2019-02-13 07:55:21 +01:00
artica 0e39e3fef7 Auto-updated build strings. 
Former-commit-id: 7c2aabad85c99a55d80b3dc856c931f160cb35d7
 2019-02-13 00:01:37 +01:00
samucarc f00266bc86 Merge branch 'develop' into 3145-Fallback_to_local_and_save_password 
Former-commit-id: d3a7766ee87b4e1484d55b14abd69d7fe2ee709e
 2019-02-12 18:55:48 +01:00