Jose Gonzalez
|
5b1517f767
|
Merge
|
2021-03-12 11:07:44 +01:00 |
|
Marcos Alconada
|
d8a628b1c4
|
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
|
2021-03-11 14:40:23 +00:00 |
|
Jose Gonzalez
|
92d654763f
|
Fixed some issues
|
2021-03-10 16:20:45 +01:00 |
|
alejandro.campos@artica.es
|
71e9452988
|
Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora
|
2021-03-10 10:28:45 +01:00 |
|
alejandro.campos@artica.es
|
5913313bae
|
Increased number of possible custom fields for Integria action
|
2021-03-10 10:28:27 +01:00 |
|
José González
|
69e1f1fb33
|
Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general'
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
# pandora_console/include/styles/pandora.css
|
2021-03-09 14:39:15 +00:00 |
|
Alejandro Campos
|
d4054f15d0
|
Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
# Conflicts:
# pandora_console/extras/mr/45.sql
# pandora_console/godmode/alerts/configure_alert_action.php
# pandora_server/util/pandora_db.pl
|
2021-03-04 10:27:07 +00:00 |
|
fbsanchez
|
d96590aea5
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
pandora_console/include/functions_ui.php
pandora_console/include/styles/pandora.css
|
2021-03-02 09:40:15 +01:00 |
|
Daniel Rodriguez
|
07a29fae04
|
Merge branch 'ent-6608-OPEN-Servidores-SMTP-externos-no-mandan-e-mail-test' into 'develop'
fixed string
See merge request artica/pandorafms!3870
|
2021-03-01 10:05:04 +00:00 |
|
alejandro.campos@artica.es
|
86cd01418f
|
fixed string
|
2021-02-26 09:41:53 +01:00 |
|
alejandro.campos@artica.es
|
901d12fec0
|
Integration with Integria
|
2021-02-25 13:18:04 +01:00 |
|
fbsanchez
|
85f37a91de
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
pandora_console/include/functions_ui.php
|
2021-02-22 12:01:29 +01:00 |
|
fbsanchez
|
0fb3ba9232
|
System status notifications filtered by subtype
|
2021-02-19 13:36:29 +01:00 |
|
fbsanchez
|
5a38d31a6d
|
Wizard (interfaces) backend performance improved
|
2021-02-04 13:11:47 +01:00 |
|
Marcos Alconada
|
b7bf265cb4
|
changed ssl/tls to ssl
|
2021-02-03 11:09:38 +01:00 |
|
fbsanchez
|
bcb2447edb
|
WIP Historical database manager (setup)
|
2021-01-27 13:03:57 +01:00 |
|
fbsanchez
|
c7706a6bfa
|
WIP Historical database manager (setup)
|
2021-01-27 12:35:37 +01:00 |
|
Jose Gonzalez
|
1fc1752b01
|
Solved merge
|
2021-01-12 13:26:48 +01:00 |
|
fbsanchez
|
6667b38729
|
Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico
Conflicts:
pandora_server/util/pandora_db.pl
|
2021-01-07 10:42:29 +01:00 |
|
José González
|
02475d25b6
|
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
# pandora_console/general/header.php
# pandora_console/general/sap_view.php
|
2020-12-23 06:48:22 +01:00 |
|
Jose Gonzalez
|
f8dd8da8c8
|
Forgotten file
|
2020-12-18 12:34:39 +01:00 |
|
Jose Gonzalez
|
5f0d686034
|
Changed Network Tools for External Tools
|
2020-12-18 12:31:44 +01:00 |
|
Daniel Rodriguez
|
30650abaf0
|
Merge branch 'ent-6628-Titulo-y-subtitulos-borrados-en-la-open' into 'develop'
Ent 6628 titulo y subtitulos borrados en la open
See merge request artica/pandorafms!3669
|
2020-12-17 17:06:05 +01:00 |
|
daniel
|
76da033775
|
fix legend pdf chart verticals
|
2020-12-17 16:58:20 +01:00 |
|
Jose Gonzalez
|
7d5f4f8f65
|
WIP: Backup upload
|
2020-12-17 16:51:05 +01:00 |
|
Jose Gonzalez
|
959fbd4764
|
WIP: Backup upload
|
2020-12-17 13:04:21 +01:00 |
|
Jose Gonzalez
|
6da8f33e20
|
WIP
|
2020-12-16 14:26:32 +01:00 |
|
Jose Gonzalez
|
010dc65dd4
|
WIP: Backup upload
|
2020-12-16 14:09:54 +01:00 |
|
José González
|
623b729001
|
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
# pandora_agents/pc/Win32/pandora_agent.conf
# pandora_agents/win32/bin/pandora_agent.conf
# pandora_console/extensions/realtime_graphs.php
# pandora_console/godmode/snmpconsole/snmp_alert.php
# pandora_console/include/functions_ui.php
# pandora_console/install.php
# pandora_console/operation/agentes/realtime_win.php
|
2020-12-14 11:10:35 +01:00 |
|
Daniel Rodriguez
|
98c5ef7142
|
Merge branch 'ent-6619-Remote-code-execution' into 'develop'
fixed security vulnerability
See merge request artica/pandorafms!3591
|
2020-12-02 17:16:05 +01:00 |
|
Daniel Maya
|
3a0f14e7bd
|
Ent 5835 9693 error al exportar csv el log view parte 2
|
2020-12-02 10:13:22 +01:00 |
|
Luis
|
aeb7a7e9c6
|
Add decimal separator to all pandora csv
|
2020-12-01 11:56:15 +01:00 |
|
Daniel Maya
|
76ce47fea1
|
disabled Title (header) in open
|
2020-11-30 12:48:25 +01:00 |
|
Jose Gonzalez
|
649442f794
|
Updated copyrights
|
2020-11-27 13:52:35 +01:00 |
|
marcos
|
1ce48c812f
|
updated 2fa all user
|
2020-11-26 18:11:30 +01:00 |
|
marcos
|
af863a45de
|
updates
|
2020-11-26 16:25:21 +01:00 |
|
marcos
|
c824972c8c
|
updates
|
2020-11-26 11:02:48 +01:00 |
|
marcos
|
5476c96941
|
update fix
|
2020-11-25 13:40:37 +01:00 |
|
marcos
|
e3e9736fc5
|
show and hide
|
2020-11-25 13:07:38 +01:00 |
|
marcos
|
06475d21ce
|
Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario
|
2020-11-25 11:08:09 +01:00 |
|
marcos
|
73f931d516
|
show and hide 2fa swtich
|
2020-11-25 10:50:06 +01:00 |
|
Marcos Alconada
|
481dd07e1b
|
requiered subject on create news
|
2020-11-25 10:38:38 +01:00 |
|
marcos
|
51322b48d7
|
Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario
|
2020-11-25 09:31:14 +01:00 |
|
fbsanchez
|
a767b6c133
|
Fixes in history db settings and improved pandora_db tool
|
2020-11-23 20:16:11 +01:00 |
|
José González
|
32dcd8a7ca
|
Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords'
# Conflicts:
# pandora_console/include/javascript/pandora_ui.js
|
2020-11-19 15:21:58 +01:00 |
|
marcos
|
13d90bb1c5
|
Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario
|
2020-11-18 12:05:57 +01:00 |
|
alejandro-campos
|
241c90f201
|
fixed security vulnerability
|
2020-11-03 15:58:53 +01:00 |
|
marcos
|
53362f6424
|
update branch
|
2020-10-13 15:04:33 +02:00 |
|
Daniel Rodriguez
|
b6ee1a9434
|
Merge branch 'ent-6432-No-funciona-el-envio-de-mails-by-default' into 'develop'
fixed email test
See merge request artica/pandorafms!3504
|
2020-10-08 20:01:33 +02:00 |
|
marcos
|
848f60229a
|
updates on 2FA all users feature
|
2020-10-06 17:02:58 +02:00 |
|