d6ecce1ce9
fixed visual error
2021-06-21 14:06:29 +00:00
44ea35bb69
Merge branch 'ent-7300-email-test-solo-envia-datos-guardados' into 'develop'
...
Email test working with data in text fields
See merge request artica/pandorafms!4090
2021-05-26 13:30:36 +00:00
9c234eef85
Ent 7087 mensaje duplicado en los test mails
2021-05-11 13:48:09 +00:00
f25256a74d
Unified downtime name as scheduled downtime
2021-05-10 09:06:43 +00:00
6ad371e4ab
Email test working with data in text fields
2021-04-29 16:04:51 +02:00
79914082e9
Ent 6850 quitar nta
2021-03-24 15:16:13 +00:00
6a427cfa8a
Fixed
2021-03-12 11:09:34 +01:00
5b1517f767
Merge
2021-03-12 11:07:44 +01:00
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
92d654763f
Fixed some issues
2021-03-10 16:20:45 +01:00
86cd01418f
fixed string
2021-02-26 09:41:53 +01:00
b7bf265cb4
changed ssl/tls to ssl
2021-02-03 11:09:38 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
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
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
2915a3bd35
fixed email test
2020-10-06 11:07:46 +02:00
6a21a668bf
Added control for reveal passwords
2020-09-29 09:44:20 +02:00
867fccf604
Custom id improvements
2020-09-17 14:38:01 +02:00
63df6c15f0
Merge branch 'develop' into ent-6030-Problema-codificacion
2020-07-01 16:39:00 +02:00
6520ad2107
Added setup token
2020-06-23 09:21:15 +02:00
ab61cf1fc5
changed console and audit log locations
2020-06-08 10:48:48 +02:00
611291c217
Ent 5428 revision total de ayudas hint wiki
2020-05-29 11:37:06 +02:00
bd1954ce38
Setup Websocket engine, unified
2019-12-13 13:11:38 +01:00
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
2218ad7d60
Added email check functionality
2019-09-12 15:37:16 +02:00
4722d4a08b
changed setup option text
2019-09-10 11:38:02 +02:00
93b9c76f58
Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email
2019-09-10 10:50:53 +02:00
c2e47e0ffa
Revert "ddded comment"
...
This reverts commit 4ec832f523
2019-09-10 10:06:33 +02:00
4ec832f523
ddded comment
2019-09-10 10:03:30 +02:00
eb01e9baaf
public_url with force option
2019-07-02 14:17:53 +02:00
89ff40e2b9
moved mail server setup to general setup
2019-06-10 09:43:27 +02:00
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
b660da6e84
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
2019-03-14 10:49:16 +01:00
488be0d602
Changed radio buttons by checkbox switch
...
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
2019-03-04 13:12:01 +01:00
3f53541c5e
Added switch to enable NTA
...
Former-commit-id: 5fc3b47f8f9f92ac643db6a5dbe4fc320ca141f6
2019-03-01 13:38:48 +01:00
875d7ecaba
Unified sizes of the checkbox switch
...
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
4473762393
Merge branch '3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general' into 'develop'
...
fix bug when updating path of ssl certificate in general setup
See merge request artica/pandorafms!2052
Former-commit-id: 453119a3a14e50ce6834eb1ee46da2f1289d6082
2019-02-18 17:18:46 +01:00
2c97708373
Merge branch 'develop' into 3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general
...
Former-commit-id: d6becbfc3aba9d5197b748647db5e93e3b58c348
2019-02-15 14:56:20 +01:00
6c9ce7e65b
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/setup/setup_general.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
2019-02-15 13:18:10 +01:00
bf7e7f1e5c
Fixed merge errors
...
Former-commit-id: 30312c4b1ae7a3615576abbae90776f278586f27
2019-02-06 18:11:50 +01:00
9568cc9aba
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/include/functions_config.php
Former-commit-id: 19f087050477dcc099bd31d7de62ac893de5d686
2019-02-06 18:06:49 +01:00
dee7c769f2
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup_auth.php
pandora_console/godmode/setup/setup_ehorus.php
pandora_console/godmode/setup/setup_general.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/styles/pandora.css
modificado: pandora_console/include/functions_html.php
Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
2019-02-06 16:11:46 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
fd2dcb3281
Changed radio buttons by toogle switch checkbox
...
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
2019-01-17 17:28:23 +01:00
6f65c9876f
Added option in setup for unique main IP in agents - #1744
...
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
2019-01-09 16:20:24 +01:00
c05b4c53e8
fix bug when updating path of ssl certificate in general setup
...
Former-commit-id: dfe466e64e18c7e3ea949f7786e0ef6343334260
2018-12-07 15:12:09 +01:00
0b0bad8a73
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
2018-10-25 17:43:28 +02:00
e2f7157545
fixed php7
2018-10-04 11:43:08 +02:00
69ec75e392
Capital letter in the letter a of audit - #2762
2018-09-14 09:38:36 +02:00
Marcos Alconada
Daniel Rodriguez
Daniel Maya
Luis
Jose Gonzalez
Marcos Alconada
alejandro.campos@artica.es
fbsanchez
Manuel Montes
fermin831
Tatiana Llorente
artica
daniel