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

26274 Commits

Author SHA1 Message Date
Daniel Barbero Martin 58ca60c857 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-02-26 08:37:06 +01:00
Daniel Barbero Martin 85ec17f3e1 WIP Command center 2021-02-26 08:36:48 +01:00
artica dc04a2b2b5 Auto-updated build strings. 2021-02-26 01:00:19 +01:00
Daniel Rodriguez 1b2fcb67fb Merge branch 'ent-7080-error-servicios-elementos-modulo' into 'develop' 
Ent 7080 error servicios elementos modulo

See merge request artica/pandorafms!3868
 2021-02-25 17:56:22 +00:00
Luis eb5e295286 Ent 7080 error servicios elementos modulo 2021-02-25 17:56:21 +00:00
Daniel Barbero Martin 36d4b7b7c3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-02-25 09:46:59 +01:00
artica 078ab1657f Auto-updated build strings. 2021-02-25 01:00:25 +01:00
fbsanchez 9f694e32f7 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php
 2021-02-24 09:41:53 +01:00
artica 508b953496 Auto-updated build strings. 2021-02-24 01:00:21 +01:00
artica a5b1128014 Auto-updated build strings. 2021-02-23 01:00:16 +01:00
artica cd9694f034 Auto-updated build strings. 2021-02-22 01:00:09 +01:00
artica c70643203f Auto-updated build strings. 2021-02-21 01:00:14 +01:00
artica 396f67d57b Auto-updated build strings. 2021-02-20 01:00:21 +01:00
artica 0f4f9cd461 Auto-updated build strings. 2021-02-19 01:00:21 +01:00
Daniel Rodriguez 3b2ba087e3 Merge branch 'ent-7054-Selector-modulo-vacio-en-informe-SLA-Meta' into 'develop' 
Fixed error reports sla selected modules in metaconsole

See merge request artica/pandorafms!3847
 2021-02-18 18:01:29 +01:00
Daniel Rodriguez 3dd6fbfd26 Merge branch 'ent-7059-no-existe-el-console-log-en-nuevas-instalaciones' into 'develop' 
Ent 7059 no existe el console log en nuevas instalaciones

See merge request artica/pandorafms!3849
 2021-02-18 17:34:42 +01:00
Marcos Alconada c69b1f6282 Ent 7059 no existe el console log en nuevas instalaciones 2021-02-18 17:34:42 +01:00
Daniel Barbero Martin 6e3a3a1d38 Fixed error reports sla selected modules in metaconsole 2021-02-18 14:09:23 +01:00
artica 4c1eaf929b Auto-updated build strings. 2021-02-18 01:00:24 +01:00
vgilc 11cf5ae627 Merge branch 'fixed-mr-version-44-752-2' into 'develop' 
fixed mr version and remove updates mr

See merge request artica/pandorafms!3843
 2021-02-17 14:45:50 +01:00
Daniel Barbero Martin 39e603e908 fixed mr version and remove updates mr 2021-02-17 14:27:16 +01:00
vgilc c371370ac1 Merge branch 'fixed-mr-version-44-752' into 'develop' 
fixed mr version and remove updates mr

See merge request artica/pandorafms!3841
 2021-02-17 13:08:44 +01:00
Daniel Barbero Martin 234097320f fixed mr version and remove updates mr 2021-02-17 13:04:59 +01:00
Daniel Rodriguez 8a0b4fd090 Merge branch 'ent-7032-boton-ok-wizard-snmp-interfaces' into 'develop' 
Hide OK button meanwhile is loading data

Closes pandora_enterprise#7032

See merge request artica/pandorafms!3837
 2021-02-17 09:50:25 +01:00
artica a33a94eb89 Auto-updated build strings. 2021-02-17 01:00:18 +01:00
Jose Gonzalez ed6c6dfad5 Hide OK button meanwhile is loading data 2021-02-16 13:43:10 +01:00
artica c2ec312e72 Auto-updated build strings. 2021-02-16 01:00:18 +01:00
artica 2a7ba5fbe0 Auto-updated build strings. 2021-02-15 01:00:15 +01:00
artica 2ef0a1b395 Auto-updated build strings. 2021-02-14 01:00:15 +01:00
artica 3c29314dc7 Auto-updated build strings. 2021-02-13 01:00:18 +01:00
Daniel Rodriguez 51e7a6f593 Merge branch 'ent-6864-guardia-10968-graficas-por-mail' into 'develop' 
Pandora sendmail control write all data in socket

See merge request artica/pandorafms!3831
 2021-02-12 15:30:44 +01:00
Luis 0469c3c9a8 Pandora sendmail control write all data in socket 2021-02-12 15:30:44 +01:00
Daniel Rodriguez 6a514a2c99 Merge branch 'ent-fix-api-create-network-module' into 'develop' 
Fixed that 'use_agent_alias' cannot be specified in 'set create_network_module'.

See merge request artica/pandorafms!3832
 2021-02-12 09:39:01 +01:00
Junichi Satoh 5ce8d6dafc Fixed that 'use_agent_alias' cannot be specified in 'set create_network_module'. 2021-02-12 12:21:35 +09:00
artica 768494e796 Auto-updated build strings. 2021-02-12 01:00:20 +01:00
artica 16f2a60490 Auto-updated build strings. 2021-02-11 01:00:22 +01:00
artica 40852de906 Auto-updated build strings. 2021-02-10 01:00:22 +01:00
Daniel Rodriguez 4ef97ae494 Merge branch 'ent-6908-10801-cambio-funcionamiento-snmp-browser' into 'develop' 
Ent 6908 10801 cambio funcionamiento snmp browser

See merge request artica/pandorafms!3826
 2021-02-09 16:44:16 +01:00
Daniel Rodriguez df603853ad Merge branch 'ent-7020-movidas-del-wizard' into 'develop' 
Ent 7020 movidas del wizard

See merge request artica/pandorafms!3816
 2021-02-09 16:25:06 +01:00
fbsanchez b17d6349f7 Multiple fixes port defition 2021-02-09 13:44:21 +01:00
Daniel Rodriguez 9b177272b5 Merge branch 'ent-improve-api-alert-template2' into 'develop' 
Fixed permission problems and improved function for api calls, 'set create_alert_template', 'set update_alert_template' and 'set delete_alert_template'.

See merge request artica/pandorafms!3755
 2021-02-09 12:47:39 +01:00
fbsanchez 58354979d0 Minor fix 2021-02-09 12:08:19 +01:00
fbsanchez 2639533cc1 Fixes 2021-02-09 12:05:59 +01:00
fbsanchez 3db4a3a595 Merge remote-tracking branch 'origin/develop' into ent-6908-10801-cambio-funcionamiento-snmp-browser 2021-02-09 10:28:28 +01:00
fbsanchez ecf0f3d161 Force error catching while SNMP browsing 2021-02-09 10:25:42 +01:00
fbsanchez 40e97f6cf6 Removed warnings 2021-02-09 10:25:08 +01:00
artica e0d1cdd667 Auto-updated build strings. 2021-02-09 01:00:25 +01:00
fbsanchez e711239c69 Added port, limited base OID (default) removed timeout (browser) capturing error to message 2021-02-08 17:42:41 +01:00
fbsanchez 67c51b0e96 Merge remote-tracking branch 'origin/develop' into ent-7020-movidas-del-wizard 2021-02-08 15:22:04 +01:00
artica c828ca2061 Auto-updated build strings. 2021-02-08 01:00:16 +01:00