Commit Graph

25068 Commits

Author SHA1 Message Date
rafael 9cbf3d1306 Merge remote-tracking branch 'origin/develop' into ent-6196-error-htaccess 2020-08-10 14:55:28 +02:00
Jose Gonzalez 35644a367f Added ttag modifies 2020-08-10 14:53:07 +02:00
José González 0b21adf150 Fix 41.sql 2020-08-10 10:18:50 +02:00
José González 69410815fb Update 40.sql 2020-08-10 10:06:51 +02:00
Daniel Rodriguez f43dc364de Merge branch 'ent-5821-bug-en-configuracion-de-notificaciones-de-la-console' into 'develop'
show hidden title on setup notifications

See merge request artica/pandorafms!3377
2020-08-10 09:46:54 +02:00
artica a60715a985 Auto-updated build strings. 2020-08-10 01:00:13 +02:00
artica 6902c61669 Auto-updated build strings. 2020-08-09 01:00:13 +02:00
artica 725b880d5e Auto-updated build strings. 2020-08-08 01:00:18 +02:00
Luis Calvo 18e6b26db8 Fixed wizard snmp process module process field 2020-08-07 16:46:35 +02:00
Daniel Rodriguez 9e9db89390 Merge branch 'ent-6027-error-cli-create-agent' into 'develop'
CLI create agent fixed add address to taddress

See merge request artica/pandorafms!3358
2020-08-07 14:09:26 +02:00
Jose Gonzalez 7300ccd185 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' of brutus.artica.es:artica/pandorafms into ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola 2020-08-07 13:29:25 +02:00
Jose Gonzalez c67d8bd005 Fixed little issues 2020-08-07 13:29:09 +02:00
José González 85d8e1f796 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
# Conflicts:
#   pandora_console/extras/mr/40.sql
#   pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
Daniel Rodriguez f7f60cfaec Merge branch 'ent-6113-modules-per-agent-ent-message-error' into 'develop'
Fixed modules per agent enterprise message

See merge request artica/pandorafms!3367
2020-08-07 11:33:42 +02:00
Luis f7f5798ee6 Fixed modules per agent enterprise message 2020-08-07 11:33:42 +02:00
Alejandro Fraguas 2988e67f4e Merge branch 'ent-6078-WMI-columna-no-funciona' into 'develop'
WMI column now refer to query order WMIServer

See merge request artica/pandorafms!3378
2020-08-07 09:56:58 +02:00
Luis 3176065ce2 WMI column now refer to query order WMIServer 2020-08-07 09:56:58 +02:00
Daniel Rodriguez 386ab5ef91 Merge branch 'ent-6075-SNMP-Browser-no-muestra-OIDs-con-version-v2' into 'develop'
fix snmp browser v2

See merge request artica/pandorafms!3354
2020-08-07 09:47:28 +02:00
Daniel Rodriguez f7854ab633 Merge branch 'ent-6068-snmp-browser-community-spcial-char' into 'develop'
Fixed snmp community special char

See merge request artica/pandorafms!3352
2020-08-07 09:46:57 +02:00
Daniel Rodriguez 1ab4e89a14 Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop'
fix empty check condition

See merge request artica/pandorafms!3359
2020-08-07 09:46:09 +02:00
Daniel Rodriguez a123eaa18c Merge branch 'ent-5609-link-to-credential-store-from-remote-module-creation' into 'develop'
Added link to credential store from module creation

See merge request artica/pandorafms!3363
2020-08-07 09:45:43 +02:00
Daniel Rodriguez ef73e7a73c Merge branch 'ent-6099-bug-al-duplicar-modulo' into 'develop'
resolved error with duplucated modules

See merge request artica/pandorafms!3357
2020-08-07 09:42:08 +02:00
Daniel Rodriguez dbe5c19209 Merge branch 'ent-6029-meta-groups-delete-bug' into 'develop'
Ent 6029 meta groups delete bug

See merge request artica/pandorafms!3355
2020-08-07 09:40:46 +02:00
Luis 7b09c1e943 Ent 6029 meta groups delete bug 2020-08-07 09:40:46 +02:00
Daniel Rodriguez c86ec629cd Merge branch 'ent-6054-Dashboard-group-status-mas-de-1-grupo' into 'develop'
fixed errors in dashboard widget groups status

See merge request artica/pandorafms!3369
2020-08-07 09:40:12 +02:00
Daniel Rodriguez d1730935d8 Merge branch 'ent-6080-cambiar-text-advertencia-modulos-no-inicializados-en-vista-agente' into 'develop'
change message in non initialited modules

See merge request artica/pandorafms!3365
2020-08-07 09:37:35 +02:00
Daniel Rodriguez bfe504b3be Merge branch 'ent-6053-error-envio-informe-mail-vista-informes' into 'develop'
Fixed report sendmail success message

See merge request artica/pandorafms!3353
2020-08-07 09:37:10 +02:00
Daniel Rodriguez cd3fe275e7 Merge branch 'ent-6037-configure-alert-actions-help' into 'develop'
Restored alert actions help (needed for macros)

See merge request artica/pandorafms!3349
2020-08-07 09:36:43 +02:00
Luis 35f231ac8c Restored alert actions help (needed for macros) 2020-08-07 09:36:43 +02:00
Daniel Rodriguez d5e8e43d85 Merge branch 'ent-6028-no-se-puede-marcar-tip-checkbox-custom-graphs' into 'develop'
Fixed missing ckbox custom graphs

See merge request artica/pandorafms!3345
2020-08-07 09:35:27 +02:00
Luis 20addda9fe Fixed missing ckbox custom graphs 2020-08-07 09:35:27 +02:00
marcos 248c5936b6 fixed error with filter form 2020-08-07 09:19:46 +02:00
marcos bb2fb0c631 Merge remote-tracking branch 'origin/develop' into ent-6099-bug-al-duplicar-modulo 2020-08-07 08:47:11 +02:00
marcos e3a126c260 Merge remote-tracking branch 'origin/develop' into ent-6080-cambiar-text-advertencia-modulos-no-inicializados-en-vista-agente 2020-08-07 08:45:21 +02:00
Marcos Alconada 50c089587d Update estado_monitores.php 2020-08-07 08:39:58 +02:00
artica a8d3c50467 Auto-updated build strings. 2020-08-07 01:00:17 +02:00
artica b812399ca3 Auto-updated build strings. 2020-08-06 01:00:16 +02:00
Alejandro Fraguas 2d25c19a5f Merge branch 'ent-6139-formatos-fecha-no-muestran-bien' into 'develop'
Fixed and added strfdate formats

See merge request artica/pandorafms!3383
2020-08-05 11:51:01 +02:00
artica bdec27d2a3 Auto-updated build strings. 2020-08-05 01:00:13 +02:00
artica b6d8cc1f2c Auto-updated build strings. 2020-08-04 01:00:14 +02:00
artica 6e6e194e73 Updated version and build strings. 2020-08-03 14:50:49 +02:00
vanessa gil 9fafb931e9 Updated translations. 2020-08-03 14:38:16 +02:00
Daniel Rodriguez d56ee82f07 Merge branch 'ent-5874-bug-module-min-module-max-rev' into 'develop'
Fixed module_max/min bug

See merge request artica/pandorafms!3393
2020-08-03 10:42:02 +02:00
Daniel Rodriguez 830b203f66 Merge branch 'ent-5607-10405-9779-10123-problema-con-el-envio-de-correos-mediante-la-configuracion-en-consola' into 'develop'
Suppress error messages from IO::Socket::SSL->start_SSL.

See merge request artica/pandorafms!3394
2020-08-03 09:01:10 +02:00
artica add395279f Auto-updated build strings. 2020-08-03 01:00:14 +02:00
artica ed7928b8aa Auto-updated build strings. 2020-08-02 01:00:14 +02:00
artica ee69438620 Auto-updated build strings. 2020-08-01 01:00:18 +02:00
Ramón Novoa 5e7d7da25e
Add a link to: https://pandorafms.com/server-monitoring/ 2020-07-31 15:07:59 +02:00
Ramon Novoa c3a98753b3 Suppress error messages from IO::Socket::SSL->start_SSL.
Ref pandora_enterprise#5607
2020-07-31 15:01:07 +02:00
Daniel Rodriguez 05446b6e3e Merge branch 'ent-5824-connection-lost-warn-mejora' into 'develop'
Ent 5824 connection lost warn mejora

See merge request artica/pandorafms!3392
2020-07-31 14:24:03 +02:00