marcos
|
e1e5475f9c
|
Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global
|
2021-06-07 08:55:10 +02:00 |
artica
|
bc6b4acd8b
|
Auto-updated build strings.
|
2021-06-07 01:00:19 +02:00 |
|
artica
|
656105cdf0
|
Auto-updated build strings.
|
2021-06-06 01:00:14 +02:00 |
|
artica
|
2513693ada
|
Auto-updated build strings.
|
2021-06-05 01:00:19 +02:00 |
|
marcos
|
430d25a551
|
merge conflict
|
2021-06-04 13:21:41 +02:00 |
|
artica
|
8976ec4b6e
|
Auto-updated build strings.
|
2021-06-04 01:00:19 +02:00 |
|
marcos
|
2de45a7eb8
|
Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global
|
2021-06-03 12:11:14 +02:00 |
|
artica
|
e1ae9d7908
|
Auto-updated build strings.
|
2021-06-03 01:00:17 +02:00 |
|
artica
|
2a5b5591a3
|
Auto-updated build strings.
|
2021-06-02 01:00:45 +02:00 |
|
artica
|
b0e3b0aa24
|
Auto-updated build strings.
|
2021-06-01 01:00:09 +02:00 |
|
marcos
|
0b8e721d34
|
resolve merge conflcit
|
2021-05-31 12:13:22 +02:00 |
|
artica
|
ff3eb72420
|
Auto-updated build strings.
|
2021-05-31 01:00:34 +02:00 |
|
artica
|
20d3399d39
|
Auto-updated build strings.
|
2021-05-30 01:00:20 +02:00 |
|
artica
|
ec8ffea249
|
Auto-updated build strings.
|
2021-05-29 01:00:10 +02:00 |
|
marcos
|
e3c0caadf0
|
resolve merge conflcit
|
2021-05-28 10:17:03 +02:00 |
|
artica
|
059b14dbf6
|
Auto-updated build strings.
|
2021-05-28 01:00:43 +02:00 |
|
artica
|
9103f671e2
|
Auto-updated build strings.
|
2021-05-27 01:00:43 +02:00 |
|
marcos
|
90fa3f085f
|
Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global
|
2021-05-26 11:39:14 +02:00 |
|
artica
|
22a9043378
|
Auto-updated build strings.
|
2021-05-26 01:00:45 +02:00 |
|
marcos
|
f2c30b6c73
|
Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global
|
2021-05-25 10:49:31 +02:00 |
|
artica
|
f3d6dafad2
|
Auto-updated build strings.
|
2021-05-25 01:00:38 +02:00 |
|
artica
|
3388bfa699
|
Auto-updated build strings.
|
2021-05-24 01:00:35 +02:00 |
|
artica
|
5366b40ac3
|
Auto-updated build strings.
|
2021-05-23 01:00:27 +02:00 |
|
artica
|
01e811254e
|
Auto-updated build strings.
|
2021-05-22 01:00:37 +02:00 |
|
artica
|
f86c1c50c6
|
Auto-updated build strings.
|
2021-05-21 01:01:12 +02:00 |
|
artica
|
63da7abe47
|
Auto-updated build strings.
|
2021-05-20 01:00:47 +02:00 |
Daniel Rodriguez
|
22fa755fc3
|
Merge branch 'ent-7527-problemas-pandora_revent' into 'develop'
Fixed issues with https calls
Closes pandora_enterprise#7527
See merge request artica/pandorafms!4128
|
2021-05-19 16:02:34 +00:00 |
José González
|
e0ec645613
|
Fixed issue with last hash symbol
|
2021-05-19 15:22:24 +02:00 |
|
José González
|
45b5ab4589
|
Added separator control
|
2021-05-19 12:40:06 +02:00 |
|
artica
|
f3eb560518
|
Auto-updated build strings.
|
2021-05-19 01:00:46 +02:00 |
|
José González
|
5342ae077c
|
id_agent default value
|
2021-05-18 15:27:45 +02:00 |
|
marcos
|
1650da0f75
|
cambio de fuentes cssç
|
2021-05-18 13:07:08 +02:00 |
|
José González
|
5cdc0b8a14
|
Code review
|
2021-05-18 10:52:39 +02:00 |
|
José González
|
be6269fc89
|
Code review
|
2021-05-18 10:25:45 +02:00 |
|
artica
|
739bc7ebd9
|
Auto-updated build strings.
|
2021-05-18 01:00:45 +02:00 |
|
Daniel Rodriguez
|
b8fe685028
|
Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop'
implemented user level authentication for integria ims integration
See merge request artica/pandorafms!4117
|
2021-05-17 14:41:11 +00:00 |
Daniel Maya
|
fd372d53d1
|
Ent 6978 umbrales inversos fallan
|
2021-05-17 13:00:59 +00:00 |
|
artica
|
d2fd310ea2
|
Auto-updated build strings.
|
2021-05-17 01:00:38 +02:00 |
|
artica
|
8c0461e2bf
|
Auto-updated build strings.
|
2021-05-16 01:00:26 +02:00 |
|
artica
|
bfc805d6a7
|
Auto-updated build strings.
|
2021-05-15 01:00:46 +02:00 |
|
marcos
|
660c7292a5
|
cambio de fuentes css
|
2021-05-14 11:53:46 +02:00 |
|
artica
|
9b6ad55910
|
Auto-updated build strings.
|
2021-05-14 01:00:47 +02:00 |
|
José González
|
0633ac24b9
|
Fixed issues with https calls
|
2021-05-13 16:43:18 +02:00 |
Alejandro Campos
|
caaa9c407e
|
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
|
2021-05-13 11:39:24 +00:00 |
|
alejandro.campos@artica.es
|
9cde8c345f
|
removed deprecated incident permissions
|
2021-05-13 13:33:45 +02:00 |
|
artica
|
afa48e815d
|
Auto-updated build strings.
|
2021-05-13 01:00:45 +02:00 |
|
Daniel Rodriguez
|
16c40c3ed4
|
Merge branch '7027-log-rotate-para-el-log-de-snmpd-de-las-traps' into 'develop'
Add a comment regarding snmp_logfile.
See merge request artica/pandorafms!4122
|
2021-05-12 15:56:45 +00:00 |
|
Daniel Rodriguez
|
13fa1159ce
|
Merge branch 'ent-6858-Goliat-opensource' into 'develop'
Backup upload
See merge request artica/pandorafms!3936
|
2021-05-12 13:10:48 +00:00 |
|
Daniel Rodriguez
|
6aa1188d35
|
Merge branch 'ent-7111-acciones-alertas-snmp-no-se-guardan' into 'develop'
Added missing fields to alert snmp actions
See merge request artica/pandorafms!3927
|
2021-05-12 12:54:37 +00:00 |
Luis
|
7d56552e72
|
Added missing fields to alert snmp actions
|
2021-05-12 12:54:36 +00:00 |