6294 Commits

Author SHA1 Message Date
artica
1d58e25a88 Auto-updated build strings. 2019-09-24 00:01:11 +02:00
Alejandro Campos
20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
# Conflicts:
#   pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
artica
2543f54413 Auto-updated build strings. 2019-09-23 00:01:17 +02:00
artica
b763650177 Auto-updated build strings. 2019-09-22 00:01:06 +02:00
artica
27d8c5025e Auto-updated build strings. 2019-09-21 00:01:09 +02:00
Alejandro Fraguas
0418c86867 Merge branch 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' into 'develop'
pandora HA review

See merge request artica/pandorafms!2654
2019-09-20 13:57:03 +02:00
Daniel Rodriguez
409ac061e0 Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop'
Ent 4047 simplificacion de la configuracion del sistema de email

See merge request artica/pandorafms!2712
2019-09-20 11:57:58 +02:00
Ramon Novoa
0bdf967259 Temporarily disable cert verification for STARTTLS too. 2019-09-20 10:36:56 +02:00
artica
d8ab1defcb Auto-updated build strings. 2019-09-20 00:01:09 +02:00
Ramon Novoa
274b6b9327 Disable certificate verification until it can be turned on/off from the console. 2019-09-19 15:27:46 +02:00
Ramon Novoa
0e281c7a0a Send sendmail errors to pandora_server.error. 2019-09-19 12:43:31 +02:00
fbsanchez
6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
# Conflicts:
#   pandora_console/extras/mr/32.sql
2019-09-19 10:18:15 +02:00
artica
14f73f147f Auto-updated build strings. 2019-09-19 00:01:10 +02:00
artica
47be6a611f Auto-updated build strings. 2019-09-18 00:01:11 +02:00
artica
15a5d6f2e5 Auto-updated build strings. 2019-09-17 00:01:57 +02:00
artica
2e121e2cc5 Auto-updated build strings. 2019-09-16 00:01:08 +02:00
artica
05eeb6f3d2 Auto-updated build strings. 2019-09-15 00:01:08 +02:00
artica
bc36ed132d Auto-updated build strings. 2019-09-14 00:01:23 +02:00
Tatiana Llorente
ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
fbsanchez
3eabfb7456 Added a subroutine to get a list of enabled servers 2019-09-13 11:35:57 +02:00
artica
2f45d3d6ec Auto-updated build strings. 2019-09-13 00:01:11 +02:00
artica
602c9ccb5e Auto-updated build strings. 2019-09-12 00:01:26 +02:00
Ramon Novoa
9809443016 Add IO::Socket::SSL to the list of dependencies. 2019-09-11 13:36:14 +02:00
Ramon Novoa
4f2b2df1b0 Comment mta_address by default. 2019-09-11 12:42:52 +02:00
marcos.alconada
47b61a2025 refactor --stop_downtime 2019-09-11 12:36:15 +02:00
marcos.alconada
64e69da924 simplify code 2019-09-11 11:41:14 +02:00
marcos.alconada
d2b7ec7a6f deleted duplicated code 2019-09-11 10:06:08 +02:00
marcos.alconada
329cafad49 fixed fixed error on stop_downtime 2019-09-11 10:04:18 +02:00
Alejandro Fraguas
a9e6409cf9 Merge branch 'ent-4587-Limpieza-de-sesiones' into 'develop'
delete session open by api calls

See merge request artica/pandorafms!2691
2019-09-11 09:40:18 +02:00
Ramon Novoa
39d5285720 Re-read the configuration from the DB periodically. 2019-09-11 09:25:40 +02:00
artica
fdef0b5188 Auto-updated build strings. 2019-09-11 00:01:10 +02:00
Ramon Novoa
33d9ce9de8 Add SSL/STARTTLS support to pandora_sendmail. 2019-09-10 15:53:47 +02:00
artica
16912732d2 Auto-updated build strings. 2019-09-10 00:01:08 +02:00
artica
5526bb49ed Auto-updated build strings. 2019-09-09 00:01:07 +02:00
artica
f088f47605 Auto-updated build strings. 2019-09-08 00:01:06 +02:00
artica
3680555bae Auto-updated build strings. 2019-09-07 00:01:10 +02:00
artica
ae474a2731 Auto-updated build strings. 2019-09-06 00:01:10 +02:00
artica
a4739e4891 Auto-updated build strings. 2019-09-05 00:01:07 +02:00
artica
61c75118f2 Auto-updated build strings. 2019-09-04 00:01:10 +02:00
Daniel Rodriguez
0f85f91c47 Merge branch 'ent-4452-macro-policy-no-funciona' into 'develop'
Changed function to get policy name macro

See merge request artica/pandorafms!2681
2019-09-03 17:52:46 +02:00
artica
fa39119264 Auto-updated build strings. 2019-09-03 00:01:12 +02:00
alejandro-campos
11cb53582c backup changes 2019-09-02 17:01:41 +02:00
fbsanchez
0abb2ae987 Revert "Revert "Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'""
This reverts commit 74c9e604e8a68bf55565c724d8caa27142f9b1de.
2019-09-02 15:24:21 +02:00
artica
d6b91e9fce Auto-updated build strings. 2019-09-02 00:01:15 +02:00
artica
aea8a6b3c7 Auto-updated build strings. 2019-09-01 00:01:07 +02:00
artica
fe7ec38cef Auto-updated build strings. 2019-08-31 00:01:12 +02:00
Luis Calvo
72ba228b68 Fixed policy macro on mail 2019-08-30 12:48:03 +02:00
Daniel Maya
25354f6f3b delete session open by api calls 2019-08-30 08:47:49 +02:00
artica
79298d0b8e Auto-updated build strings. 2019-08-30 00:01:09 +02:00
artica
1c4b639deb Auto-updated build strings. 2019-08-29 00:01:08 +02:00