Marcos Alconada
92cf6c60cb
Ent 7015 establecer las nuevas consolas visuales habilitadas por defecto en instalaciones nuevas
2021-02-05 15:08:58 +01:00
fbsanchez
5a38d31a6d
Wizard (interfaces) backend performance improved
2021-02-04 13:11:47 +01:00
fbsanchez
712079c30e
RC1 #4755
2021-02-01 15:00:54 +01:00
fbsanchez
dbc48852aa
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
2021-01-28 16:12:47 +01:00
fbsanchez
9fc3856f83
WIP historical database automaintenance + minor fixes
2021-01-28 13:20:36 +01:00
fbsanchez
c7706a6bfa
WIP Historical database manager (setup)
2021-01-27 12:35:37 +01:00
Daniel Rodriguez
40921b96f9
Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop'
...
Avoid erase ALL sessions from tsessions_php (pandora_db)
See merge request artica/pandorafms!3663
2021-01-05 13:43:42 +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
daniel
76da033775
fix legend pdf chart verticals
2020-12-17 16:58:20 +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
Luis Calvo
d0b119c05f
Module library user pass let empty user/pass
2020-12-10 10:49:13 +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
Jose Gonzalez
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
fbsanchez
7e61465955
Avoid erase ALL sessions from tsessions_php (pandora_db)
2020-11-26 18:27:11 +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
daniel
3455de7f85
fixed visual errors and default values
2020-10-07 16:03:52 +02:00
marcos
848f60229a
updates on 2FA all users feature
2020-10-06 17:02:58 +02:00
daniel
1b5ccfb20a
Add new token chart fit to content
2020-10-05 17:03:30 +02:00
fbsanchez
b07d24ed25
Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
...
Conflicts:
pandora_console/include/functions_api.php
pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
marcos
f8666adf0f
F2 feature
2020-09-30 14:20:57 +02:00
Marcos Alconada
85a41af644
Ent 5296 anadir boton guardar contrasena en active directory
2020-09-18 14:50:50 +02:00
fbsanchez
867fccf604
Custom id improvements
2020-09-17 14:38:01 +02:00
Daniel Maya
cbc8630dfc
Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion
2020-07-23 16:52:24 +02:00
alejandro-campos
63df6c15f0
Merge branch 'develop' into ent-6030-Problema-codificacion
2020-07-01 16:39:00 +02:00
Alejandro Campos
a81e4acbb7
Merge branch 'develop' into 'ent-6030-Problema-de-codificacion'
...
# Conflicts:
# pandora_console/include/functions_config.php
2020-06-23 09:28:21 +02:00
alejandro-campos
6520ad2107
Added setup token
2020-06-23 09:21:15 +02:00
alejandro-campos
1243968872
Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion
2020-06-19 12:12:52 +02:00
Alejandro Fraguas
f8c9448866
Merge branch 'ent-5955-XSS-System-logfiles' into 'develop'
...
Solved security issue with system logfiles field
Closes pandora_enterprise#5955
See merge request artica/pandorafms!3289
2020-06-15 10:24:48 +02:00
Alejandro Fraguas
51f61059f4
Merge branch 'ent-5953-XSS-Visual-styles' into 'develop'
...
Cleaned tags for affected fields
Closes pandora_enterprise#5953
See merge request artica/pandorafms!3285
2020-06-15 09:47:19 +02:00
Jose Gonzalez
251e6669b9
Solved security issue with system logfiles field
2020-06-09 12:51:17 +02:00
Jose Gonzalez
73cf98fc02
Cleaned tags for affected fields
2020-06-09 10:22:54 +02:00
alejandro-campos
ab61cf1fc5
changed console and audit log locations
2020-06-08 10:48:48 +02:00
fbsanchez
fae026a089
Form fixes
2020-05-26 13:48:43 +02:00
Tatiana Llorente
ec57540fb0
Ent 5432 libreria de modulos de pandora integrada en consola
2020-02-27 11:20:24 +01:00
marcos
76ed257287
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-21 15:23:26 +01:00
alejandro-campos
bb4d3abe6b
change config default value
2020-01-17 12:42:29 +01:00
Marcos Alconada
5268c23c7a
Merge branch 'develop' into 'ent-4705-encriptado-de-nuevos-tokens'
...
# Conflicts:
# pandora_console/include/functions_config.php
2020-01-16 09:23:42 +01:00
alejandro-campos
d9062def99
Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024
2020-01-15 16:01:11 +01:00
alejandro-campos
3f26f2ef6f
fix bug when deleting custom units and changed default value for byte multiplier
2020-01-15 16:00:33 +01:00
Alejandro Campos
0468c85a4d
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
vgilc
c14a462e63
Merge branch '5027-pandora-db-error-history-db-step' into 'develop'
...
Added control for int values
See merge request artica/pandorafms!2927
2020-01-07 10:20:26 +01:00
Tatiana Llorente
4cd1ca38a4
Ent 5091 unificacion de tamaño de letra en informes
2020-01-07 09:25:31 +01:00
marcos
b551f1a13c
update
2019-12-18 17:48:29 +01:00
marcos
f3ddec4436
updates
2019-12-18 15:30:23 +01:00
marcos
91fe85e90e
updates2
2019-12-18 15:15:25 +01:00
marcos
35136ada8e
minnor error
2019-12-17 15:25:28 +01:00
Tatiana Llorente
eca876212c
Ent 5095 visualizacion formato de fechas
2019-12-17 12:15:51 +01:00
alejandro-campos
d30c2c9b3b
Fix bug when updating ACL IP list
2019-12-13 14:17:25 +01:00
alejandro-campos
5880bec88a
changes in module data formatting when printed across the application and new setup options
2019-12-05 17:41:44 +01:00
Jose Gonzalez
6883240931
Added control for int values
2019-12-02 11:54:39 +01:00
Daniel Barbero Martin
ea2c5bc8c9
Fixed translate
2019-11-27 11:49:20 +01:00
daniel
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
fbsanchez
83590146b1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
2019-11-13 17:38:24 +01:00
Daniel Rodriguez
073ca73b2a
Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop'
...
Added token in visual styles to change the font size in items of reports - #4670
See merge request artica/pandorafms!2798
2019-11-12 18:09:39 +01:00
fbsanchez
72b1fb2b16
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
...
Conflicts:
pandora_console/include/javascript/pandora.js
modified: pandora_console/general/register.php
modified: pandora_console/godmode/agentes/configurar_agente.php
modified: pandora_console/godmode/agentes/module_manager_editor.php
new file: pandora_console/include/ajax/welcome_window.php
new file: pandora_console/include/class/WelcomeWindow.class.php
modified: pandora_console/include/constants.php
modified: pandora_console/include/functions_config.php
modified: pandora_console/include/javascript/pandora.js
new file: pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
marcos
e725a0185b
cambios semi finales
2019-10-24 16:56:13 +02:00
fbsanchez
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
fbsanchez
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
Tatiana Llorente
18679f90e5
Added token in visual styles to change the font size in items of reports - #4670
2019-10-09 16:24:37 +02:00
Daniel Rodriguez
c9cfbf0bf2
Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop'
...
Ent 4461 configuracion integracion integria
See merge request artica/pandorafms!2732
2019-09-26 14:34:50 +02:00
alejandro-campos
96622933fc
added new section in integria setup to configure different options for event responses and alert created tickets
2019-09-26 13:22:10 +02:00
Tatiana Llorente
5436df5575
Changed the word incident for ticket - #4461
2019-09-25 16:13:37 +02:00
Tatiana Llorente
84ae4a8391
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
...
Conflicts:
pandora_console/extras/mr/32.sql
2019-09-25 10:50:31 +02:00
Daniel Rodriguez
e03e83d565
Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop'
...
fixed error percentil label
See merge request artica/pandorafms!2734
2019-09-25 10:27:13 +02:00
fbsanchez
746f817fe4
Windows: Revisión general Pandora - Discovery
2019-09-24 19:07:55 +02:00
Daniel Barbero Martin
84d1979c9e
fixed error percentil label
2019-09-18 11:15:55 +02:00
alejandro-campos
87f8badc18
completed integria setup and incident creation and update
2019-09-17 13:38:17 +02:00
alejandro-campos
93b9c76f58
Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email
2019-09-10 10:50:53 +02:00
alejandro-campos
11cb53582c
backup changes
2019-09-02 17:01:41 +02:00
alejandro-campos
28cf43498e
lint change
2019-08-05 14:18:23 +02:00
alejandro-campos
9b8e3c540c
created integria integration setup
2019-08-05 13:42:01 +02:00
fbsanchez
c386a29b80
Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url
2019-07-12 09:38:28 +02:00
Daniel Barbero Martin
bd070b706b
fixed minor error
2019-07-11 12:45:52 +02:00
Alejandro Fraguas
26c606b0d5
Merge branch 'ent-3090-Personalizacion-saml-2' into 'develop'
...
Added more parameters to SAML configuration
See merge request artica/pandorafms!2506
2019-07-09 13:18:12 +02:00
fbsanchez
eb01e9baaf
public_url with force option
2019-07-02 14:17:53 +02:00
fbsanchez
a6327a16ad
Session expiration ignoring notifications checks
2019-07-01 12:46:09 +02:00
alejandro-campos
3d75e045f9
added new fields to saml configuration and added check to not allow user creation with all group in case an empty value was specified in group name attribute input
2019-06-27 17:42:29 +02:00
alejandro-campos
2a69e3a75e
Merge remote-tracking branch 'origin/develop' into ent-3090-Personalizacion-saml-2
2019-06-26 18:06:23 +02:00
alejandro-campos
f74b32fe3c
Added more parameters to SAML configuration
2019-06-14 10:34:51 +02:00
alejandro-campos
52b1c5e39b
fix bug: path of ssl certificate not being set on general settings
2019-06-13 13:18:17 +02:00
Daniel Rodriguez
81ac4e5bef
Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop'
...
Ent 3466 ad advanced perms fixed
See merge request artica/pandorafms!2194
2019-06-10 16:05:21 +02:00
alejandro-campos
89ff40e2b9
moved mail server setup to general setup
2019-06-10 09:43:27 +02:00
Alejandro Fraguas
45c58a7c72
Merge branch 'ent-4041-7980-bug-parametro-event_storm_protection' into 'develop'
...
Variability event_storm_protection check is added with empty data
See merge request artica/pandorafms!2428
2019-06-03 11:58:52 +02:00
Daniel Maya
552467286c
Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
...
# Conflicts:
# pandora_console/extras/mr/28.sql
2019-05-29 11:10:31 +02:00
Alejandro Gallardo Escobar
f5d5cbf5b8
VC item cache improvements.
...
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
2019-05-28 18:34:07 +02:00
Luis Calvo
5966367f8f
eHorus user level login conf added in user editor
2019-05-28 13:14:42 +02:00
Luis Calvo
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
fbsanchez
7b5ae40868
multiple fixes
2019-05-23 10:27:50 +02:00
marcos.alconada
86dabc6476
Variability event_storm_protection check is added with empty data
2019-05-17 11:31:02 +02:00
Luis Calvo
c527435a0e
eHorus user-login settings
...
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
2019-05-10 15:32:25 +02:00
marcos.alconada
b51cdb93df
arreglo con la vista del formulario
...
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
2019-05-10 15:00:21 +02:00
marcos.alconada
793304b52d
Se habilita el boton de ehorus
...
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
2019-05-10 12:26:09 +02:00
Luis Calvo
ecce1160e1
Added button to select ehorus conf type and box into user conf
2019-05-09 19:23:18 +02:00
marcos.alconada
e0729b6ca6
Se vuelve a crear la rama
...
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +02:00
Alejandro Gallardo Escobar
2d9b4908de
Visual Console Refactor: the legacy visual console is enabled by default
...
Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a
2019-04-25 14:08:55 +02:00
Alejandro Gallardo Escobar
998a66f654
Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client
...
Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b
2019-04-16 12:23:03 +02:00
manuel
db13ecbb39
Added token save profile user
...
Former-commit-id: 442a51cfbe7ac9730e9fd9c2c1ee16b6609e5f6a
2019-04-08 11:55:58 +02:00
daniel
89bbbd2893
Revert "fixed IPAM config"
...
This reverts commit 1fe1beb930
[formerly 39b80d2ca41c21a823cdec5948e30109a81eeb2a]
Former-commit-id: e11aec8e300db083b7ce04cb74d19de276e69eb7
2019-04-02 14:06:05 +02:00
Alejandro Fraguas
2461f826ce
Merge branch 'ent-3715-Pete_sql_en_mr_del_ipam' into 'develop'
...
fixed IPAM config
See merge request artica/pandorafms!2274
Former-commit-id: 95786e5f3fa31e8d8c663ee8f3488336c59d9b3c
2019-04-02 09:41:02 +02:00
fermin831
a2f5b8502a
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
Tatiana Llorente
fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
fermin831
2711eb59ea
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
Daniel Barbero Martin
1fe1beb930
fixed IPAM config
...
Former-commit-id: 39b80d2ca41c21a823cdec5948e30109a81eeb2a
2019-03-20 09:51:15 +01:00
fermin831
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
fbsanchez
750c64fbd7
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
Tatiana Llorente
71afb7a741
New login page
...
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
2019-03-11 10:07:22 +01:00
Fermin
dd8265f65e
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
2019-03-08 09:02:22 +01:00
fbsanchez
70e4e86cdf
Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
...
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
2019-03-05 18:58:26 +01:00
Tatiana Llorente
7be5d3e9e0
new header and menu
...
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
fbsanchez
9fd391a819
Make always basic checks while browsing pandora
...
Former-commit-id: db93bfdaa674cd2d632153825c37a8a41152dc2c
2019-03-04 14:57:57 +01:00
Tatiana Llorente
36fa0fc41f
new header and menu
...
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
Fermin
3f53541c5e
Added switch to enable NTA
...
Former-commit-id: 5fc3b47f8f9f92ac643db6a5dbe4fc320ca141f6
2019-03-01 13:38:48 +01:00
Fermin
f0a3f4e9d7
Added configurable purge tnetwork_matrix
...
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
2019-03-01 12:39:55 +01:00
Tatiana Llorente
34eedc5330
new header and menu
...
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
Tatiana Llorente
3e87c8e931
new header and menu
...
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
2019-02-26 10:43:59 +01:00
daniel
d4c46ec14f
fix minor error
...
Former-commit-id: 81b5c41c49a5e121c5ac34c12bfd5b1b7f5f943a
2019-02-26 08:44:50 +01:00
Tatiana Llorente
4c92375a58
new header and menu
...
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
2019-02-25 12:23:15 +01:00
Tatiana Llorente
526311d1c6
new header and menu
...
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
fbsanchez
4abf19722b
Minor fixes and improvements. Discovery
...
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
2019-02-22 18:12:01 +01:00
Luis Calvo
ea4b24de2e
Fixed ad advanced perms params saving
...
Former-commit-id: a0aa5b3b666b0a990dfb087029f6e0bb2929292e
2019-02-22 10:54:17 +01:00
daniel
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
fbsanchez
8c09b945c7
minor fix changed customer check
...
Former-commit-id: f2659c9e7780dcddaa9528b1aa13a4d61026c154
2019-02-19 11:14:48 +01:00
fbsanchez
85371424ee
Minor fixes and status check
...
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
2019-02-19 11:13:07 +01:00
Daniel Rodriguez
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
Alejandro Fraguas
01b8649812
Merge branch '1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica' into 'develop'
...
Added option in setup for unique main IP in agents - #1744
Closes pandora_enterprise#1744
See merge request artica/pandorafms!2114
Former-commit-id: 77e1bbae9a1a60bc51739d98948ca8af5d183f78
2019-02-18 12:16:20 +01:00
alejandro-campos
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
fermin831
0ecf2bb9c4
Added pandora db messages purgue
...
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
2019-02-13 14:43:55 +01:00
fbsanchez
681ad67028
ConsoleSuperviso - mailing support and minor fixes
...
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
2019-02-07 18:00:51 +01:00
fbsanchez
dc9decde42
ConsoleSupervisor
...
Former-commit-id: 3c40e628883f032a449862d0161659586819e6df
2019-02-07 16:24:49 +01:00
Tatiana Llorente
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
Tatiana Llorente
cc17cbf60f
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/include/functions_config.php
Former-commit-id: 3456fcc7a45639055010e67440601ac4fba547ec
2019-02-06 15:22:05 +01:00
artica
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es
4d4569cadb
Fixed error with slashes - #3426
...
Former-commit-id: 8dbead7acd73faa66e406cccf1fe81ed775eb933
2019-01-25 13:52:49 +01:00
daniel
687358d70c
add new token treshold IPAM
...
Former-commit-id: cc7858af6a83b0773fec3249e13cfbfb274f2fba
2019-01-23 17:33:06 +01:00
tatiana.llorente@artica.es
6f65c9876f
Added option in setup for unique main IP in agents - #1744
...
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
2019-01-09 16:20:24 +01:00
fermin831
0445e212fe
Added default_no_hierarchy to config global variable
...
Former-commit-id: 0daba928d7adc7a848bca04b04168d05a82ea609
2019-01-08 12:54:32 +01:00
danielmaya
b530447474
Added token metaconsole_deploy_inventory_plugin in functions_config
...
Former-commit-id: 9d819bb43ba4ce7869480411ae6f6cb9f1edbcce
2018-12-17 12:09:05 +01:00
alejandro-campos
c05b4c53e8
fix bug when updating path of ssl certificate in general setup
...
Former-commit-id: dfe466e64e18c7e3ea949f7786e0ef6343334260
2018-12-07 15:12:09 +01:00
daniel
a089a93477
fixed session bugs
2018-11-20 18:07:43 +01:00
vgilc
522a098d24
Merge branch '2615-bug-session-timeout' into 'develop'
...
time used for session cookie expiration set to gmt time
See merge request artica/pandorafms!1995
2018-11-19 17:30:11 +01:00
alejandro-campos
2c5cd6627b
time used for session cookie expiration set to gmt time
2018-11-19 16:33:27 +01:00
vgilc
c499a21cc2
Merge branch '2615-bug-session-timeout' into 'develop'
...
time used for session cookie set to timezone current time instead of gmt time
See merge request artica/pandorafms!1991
2018-11-19 13:29:01 +01:00
alejandro-campos
3ffab647cb
time used for session cookie set to timezone current time instead of gmt time
2018-11-19 13:21:25 +01:00
danielmaya
24fe48d5c5
Added token metaconsole_deploy_collection in the config
2018-11-19 12:12:10 +01:00
fbsanchez
5c3b3a0e66
adjusted replication_interval default
2018-11-16 12:46:10 +01:00
fbsanchez
50c3453415
change default values for event synch
2018-11-16 11:27:32 +01:00
daniel
d12a25866d
fixed translate php7 warning
2018-11-15 15:33:46 +01:00
daniel
b78c52caa4
fixed error Acess for Access
2018-11-15 13:22:54 +01:00
daniel
6174e622c8
create alert php7
2018-11-14 18:15:48 +01:00
daniel
bd2a3a82ec
silence error php7(not solution)
2018-10-19 12:25:01 +02:00