76628117fa
Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs'
...
# Conflicts:
# pandora_console/operation/messages/message_edit.php
2021-05-25 13:50:17 +00:00
5d70226b13
fix category, Os, tags, user_edit synch
2021-05-18 11:02:00 +02:00
ec6cb4d532
fix category, Os, tags, user_edit synch
2021-05-18 10:57:21 +02:00
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
9cde8c345f
removed deprecated incident permissions
2021-05-13 13:33:45 +02:00
9c234eef85
Ent 7087 mensaje duplicado en los test mails
2021-05-11 13:48:09 +00:00
89dcde6ca7
Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop'
...
minor changes
See merge request artica/pandorafms!4107
2021-05-11 07:40:24 +00:00
ac0ef3c61c
Merge branch 'ent-7475-Mejor-interfaz-de-configuracion-en-integracion-Integria' into 'develop'
...
minor change in integria ims setup
See merge request artica/pandorafms!4104
2021-05-11 07:39:16 +00:00
6faefa4afa
Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
...
Unified downtime name as scheduled downtime
See merge request artica/pandorafms!4001
2021-05-10 09:06:43 +00:00
f25256a74d
Unified downtime name as scheduled downtime
2021-05-10 09:06:43 +00:00
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
aa4769d331
minor changes
2021-05-05 13:02:53 +02:00
d358fd894d
minor change in integria ims setup
2021-05-05 11:03:32 +02:00
dbb7fe364f
Added standard headers
2021-04-30 14:35:54 +02:00
6ad371e4ab
Email test working with data in text fields
2021-04-29 16:04:51 +02:00
c57ca2a2b8
fixed error with creation and updating gis maps
2021-04-27 11:44:55 +00:00
ada6bccfd6
changed request protocol
2021-04-15 12:12:06 +02:00
0fc3cb8714
Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop'
...
Multicolumn setup for performance and visual settings
See merge request artica/pandorafms!3921
2021-04-06 17:47:39 +00:00
fdc4133eaa
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
2021-03-25 10:20:02 +01:00
79914082e9
Ent 6850 quitar nta
2021-03-24 15:16:13 +00:00
e0aa1bfc68
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/styles/pandora.css
2021-03-22 09:59:07 +01:00
04bae1b4fb
fixed visual errors
2021-03-18 17:05:50 +00:00
2862afb7f5
Multicolumn setup for performance and visual settings
2021-03-16 13:00:24 +01:00
f765493ce7
revert selector theme
2021-03-16 11:24:05 +01:00
5bae2be954
Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop'
...
Ent 6898 integracion integria en pandora
See merge request artica/pandorafms!3898
2021-03-12 13:18:25 +00:00
b4927d6071
minor fix
2021-03-12 12:46:27 +01:00
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01: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
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
5913313bae
Increased number of possible custom fields for Integria action
2021-03-10 10:28:27 +01:00
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
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
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
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
86cd01418f
fixed string
2021-02-26 09:41:53 +01:00
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
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
0fb3ba9232
System status notifications filtered by subtype
2021-02-19 13:36:29 +01:00
5a38d31a6d
Wizard (interfaces) backend performance improved
2021-02-04 13:11:47 +01:00
b7bf265cb4
changed ssl/tls to ssl
2021-02-03 11:09:38 +01:00
bcb2447edb
WIP Historical database manager (setup)
2021-01-27 13:03:57 +01:00
c7706a6bfa
WIP Historical database manager (setup)
2021-01-27 12:35:37 +01:00
1fc1752b01
Solved merge
2021-01-12 13:26:48 +01:00
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
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
f8dd8da8c8
Forgotten file
2020-12-18 12:34:39 +01:00
5f0d686034
Changed Network Tools for External Tools
2020-12-18 12:31:44 +01:00
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
76da033775
fix legend pdf chart verticals
2020-12-17 16:58:20 +01:00
7d5f4f8f65
WIP: Backup upload
2020-12-17 16:51:05 +01:00
959fbd4764
WIP: Backup upload
2020-12-17 13:04:21 +01:00
6da8f33e20
WIP
2020-12-16 14:26:32 +01:00
010dc65dd4
WIP: Backup upload
2020-12-16 14:09:54 +01:00
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
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
3a0f14e7bd
Ent 5835 9693 error al exportar csv el log view parte 2
2020-12-02 10:13:22 +01:00
aeb7a7e9c6
Add decimal separator to all pandora csv
2020-12-01 11:56:15 +01:00
76ce47fea1
disabled Title (header) in open
2020-11-30 12:48:25 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
1ce48c812f
updated 2fa all user
2020-11-26 18:11:30 +01:00
af863a45de
updates
2020-11-26 16:25:21 +01:00
c824972c8c
updates
2020-11-26 11:02:48 +01:00
5476c96941
update fix
2020-11-25 13:40:37 +01:00
e3e9736fc5
show and hide
2020-11-25 13:07:38 +01:00
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
73f931d516
show and hide 2fa swtich
2020-11-25 10:50:06 +01:00
481dd07e1b
requiered subject on create news
2020-11-25 10:38:38 +01:00
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
a767b6c133
Fixes in history db settings and improved pandora_db tool
2020-11-23 20:16:11 +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
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
241c90f201
fixed security vulnerability
2020-11-03 15:58:53 +01:00
53362f6424
update branch
2020-10-13 15:04:33 +02: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
848f60229a
updates on 2FA all users feature
2020-10-06 17:02:58 +02:00
2915a3bd35
fixed email test
2020-10-06 11:07:46 +02:00
1b5ccfb20a
Add new token chart fit to content
2020-10-05 17:03:30 +02:00
e5fe9d5c29
feature 2FA_all_users
2020-10-05 12:29:51 +02:00
2187f9d0c9
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
a5d5a45cac
add render graph to reports
2020-10-02 14:16:55 +02:00
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
f8666adf0f
F2 feature
2020-09-30 14:20:57 +02:00
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
9d0becc012
Added other password fields
2020-09-29 10:12:49 +02:00
6a21a668bf
Added control for reveal passwords
2020-09-29 09:44:20 +02:00
f69166bd53
Updates style width group selector
2020-09-28 18:04:46 +02:00
ef043a169a
Increased number of max macro data fields from 15 to 20
2020-09-25 10:47:36 +02:00
422b0ac71d
Merge branch 'ent-6050-tamano-de-la-ventana-de-front-page-for-custom-reports-muy-pequeno-en-los-visual-styles' into 'develop'
...
Ent 6050 tamano de la ventana de front page for custom reports muy pequeno en los visual styles
See merge request artica/pandorafms!3446
2020-09-22 11:11:26 +02:00
5c511bb88e
Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
2020-09-17 16:57:56 +02:00
4c8414cda5
Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop'
...
Solved issue with TinyMCE status bar. Now can view it properly
See merge request artica/pandorafms!2910
2020-09-17 15:14:33 +02:00
867fccf604
Custom id improvements
2020-09-17 14:38:01 +02:00
0e3c10a698
Merge
2020-09-17 10:35:18 +02:00
b97014f577
Cleaned traces
2020-09-16 17:40:18 +02:00
9ac9a75658
Fixed mistake with update in os list
2020-09-16 14:47:33 +02:00
eaa4924a0f
Fixed visual bug
2020-09-09 17:16:25 +02:00
58f521e8b5
Avoid XSS in Edit OS form.
2020-09-09 15:28:11 +02:00
85d8e1f796
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql
# pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
cbc8630dfc
Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion
2020-07-23 16:52:24 +02:00
2c535bb747
Fixed labels mode classic
2020-07-21 15:06:41 +02:00
5e039adb26
Solve the issue for alerts, os names and tags
2020-07-07 11:05:19 +02:00
534aa8c7c5
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
2020-07-06 14:31:55 +02:00
63df6c15f0
Merge branch 'develop' into ent-6030-Problema-codificacion
2020-07-01 16:39:00 +02:00
faaf14bfd4
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/extras/mr/39.sql
pandora_console/include/lib/Module.php
2020-06-30 17:04:33 +02:00
02bffc7e0d
Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop'
...
changed console and audit log locations
See merge request artica/pandorafms!3278
2020-06-25 15:28:13 +02:00
a8671078f1
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/install.php
2020-06-25 11:25:43 +02:00
5aef38dd72
Merge branch 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' into 'develop'
...
fixes in reports front page default setup
See merge request artica/pandorafms!3250
2020-06-24 12:43:23 +02:00
549a17a428
Ent 5470 se duplican los sistemas operativos
2020-06-23 14:45:04 +02:00
9ce4c90456
Merge branch 'develop' into 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles'
...
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
2020-06-23 10:04:24 +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
476ebe70a7
fixes in reports front page default setup
2020-05-28 14:47:36 +02:00
ec57540fb0
Ent 5432 libreria de modulos de pandora integrada en consola
2020-02-27 11:20:24 +01:00
7564249207
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-02-17 16:15:29 +01:00
1cca736953
Merge branch 'ent-4788-Icono-GIS-en-Setup-desaparecido' into 'develop'
...
Ent 4788 icono gis en setup desaparecido
See merge request artica/pandorafms!2843
2020-02-05 12:35:50 +01:00
76ed257287
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-21 15:23:26 +01:00
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
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
3f26f2ef6f
fix bug when deleting custom units and changed default value for byte multiplier
2020-01-15 16:00:33 +01:00
dcd2aae3c5
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-14 10:28:55 +01:00
db49db3711
report font not depending of custom report front enabled
2020-01-13 18:21:48 +01:00
665e9e4c98
Show gis icon only if enabled gis
2020-01-08 15:57:18 +01:00
f61ba42dd7
Resolve conflicts
2020-01-08 15:48:07 +01:00
7701ff7ad1
Resolve conflicts
2020-01-08 15:44:59 +01:00
eb222cc82f
Merge remote-tracking branch 'origin/develop' into ent-4788-Icono-GIS-en-Setup-desaparecido
...
Conflicts:
pandora_console/godmode/setup/setup.php
2020-01-08 15:41:45 +01:00
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
7c952eaaa8
changes visual setup
2020-01-07 10:56:37 +01:00
4cd1ca38a4
Ent 5091 unificacion de tamaño de letra en informes
2020-01-07 09:25:31 +01:00
168dfcf32d
minnor error
2019-12-17 15:23:01 +01:00
eca876212c
Ent 5095 visualizacion formato de fechas
2019-12-17 12:15:51 +01:00
24838cad0f
Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop'
...
Added compact mode to show timestamp - #4233
See merge request artica/pandorafms!2688
2019-12-16 11:48:09 +01:00
b71752ea03
Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop
2019-12-16 11:23:06 +01:00
b38c396837
Change date in hover in compact mode
2019-12-13 13:40:19 +01:00
a558152cb2
minor fix
2019-12-13 13:20:44 +01:00
ad6ea431bf
minor fix, hide quickshell settings while disabled
2019-12-13 13:13:09 +01:00
bd1954ce38
Setup Websocket engine, unified
2019-12-13 13:11:38 +01:00
3b5ebd0bf7
Better quickshell integration and fixes
2019-12-13 11:46:44 +01:00
a364af3b2d
Grouped report items on styles conf. Fixed font bug
2019-12-11 18:32:49 +01:00
3dbdfdb6eb
Fix Landscape reports
2019-12-11 15:07:38 +01:00
5880bec88a
changes in module data formatting when printed across the application and new setup options
2019-12-05 17:41:44 +01:00
d181d5357b
Created function for initialize TinyMCE
2019-11-26 13:19:28 +01:00
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
898945d47f
Added icon for gis maps connections in tabs of setup
2019-10-29 13:26:36 +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
18679f90e5
Added token in visual styles to change the font size in items of reports - #4670
2019-10-09 16:24:37 +02:00
5e0b7fc2b7
fixed integria logo redirection in integria setup
2019-09-27 09:07:09 +02:00
2ec562fcc0
changed help in setup integria
2019-09-26 13:36:14 +02:00
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
ad01cd0303
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-26 09:48:13 +02:00
91f90d07d6
minor fixes in integria integration
2019-09-26 09:44:58 +02:00
5436df5575
Changed the word incident for ticket - #4461
2019-09-25 16:13:37 +02:00
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
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
f73cd80336
minor changes in integria integration
2019-09-23 15:16:31 +02:00
9153330832
minor changes in integria integration
2019-09-23 14:47:08 +02:00
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
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
1177cce25f
added attached files section to incident edition
2019-09-19 10:24:43 +02:00
73a341912f
Changed caption Expires
2019-09-18 13:35:11 +02:00
87f8badc18
completed integria setup and incident creation and update
2019-09-17 13:38:17 +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
11cb53582c
backup changes
2019-09-02 17:01:41 +02:00
8fd1f3c99e
Added compact mode to show timestamp - #4233
2019-08-29 10:07:50 +02:00
97353bbfed
backup changes
2019-08-08 13:36:12 +02:00
9b8e3c540c
created integria integration setup
2019-08-05 13:42:01 +02:00
bfc267691b
Merge branch 'ent-3105-comportamiento-public_url' into 'develop'
...
Ent 3105 comportamiento public url
See merge request artica/pandorafms!2568
2019-07-12 13:02:42 +02:00
c386a29b80
Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url
2019-07-12 09:38:28 +02:00
fd24398219
Fixed several minor visual bugs - #4347
2019-07-11 14:46:41 +02:00
0f280494a0
Changed images for divs to show preview in visual styles - #4195
2019-07-09 09:33:49 +02:00
eb01e9baaf
public_url with force option
2019-07-02 14:17:53 +02:00
0ea5b7ff1b
Merge branch 'ent-4196-Eliminar-funcionalidad-QR-Code-in-header' into 'develop'
...
Removed option to show qr code in header - #4196
See merge request artica/pandorafms!2494
2019-06-26 12:04:00 +02:00
8f2feac676
Added DESTDIR in license.php
2019-06-18 11:35:59 +02:00
e4139874dd
Removed option to show qr code in header - #4196
2019-06-11 18:00:41 +02:00
89ff40e2b9
moved mail server setup to general setup
2019-06-10 09:43:27 +02:00
16d34bf584
Merge branch 'ent-3643-mensaje-duplicado-con-info-de-la-db_history-en-performance' into 'develop'
...
ticket resolved, duplicated sentece
See merge request artica/pandorafms!2239
2019-05-30 15:33:27 +02:00
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
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
6fdd88ab65
Fixed errors on eHorus user level conf
2019-05-28 17:19:13 +02:00
5966367f8f
eHorus user level login conf added in user editor
2019-05-28 13:14:42 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
dd8af874fa
Merge branch 'ent-1668-update-manager' into 'develop'
...
license forms sync MC-N
See merge request artica/pandorafms!2441
2019-05-23 10:36:43 +02:00
2cfe4378c2
license forms sync MC-N
2019-05-22 18:50:51 +02:00
979f11ca8f
Merge branch 'ent-1668-update-manager' into 'develop'
...
Ent 1668 update manager
See merge request artica/pandorafms!2420
2019-05-22 15:25:49 +02:00
ada49966e0
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
77fc1abe89
minor style updates and fixes in safe-output
2019-05-20 18:16:21 +02:00
5e9b2479eb
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
2019-05-20 13:11:39 +02:00
e7dbb55392
Minor fixes
...
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +02:00
702926cf85
solved merge conflict mr 28.sql
...
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
2019-05-16 10:15:46 +02:00
d871b599ef
General fixes and UM comm updates
...
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
be20163073
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
...
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2421
Former-commit-id: cf20d4985c6de38e1eab8bdd23ddb32708cc57ba
2019-05-14 17:38:55 +02:00
ff8abf9b40
updated function for show and hide ehorus form
...
Former-commit-id: 91c91ee7b1014dfa4d8f7719cb848ae4770199f5
2019-05-14 15:34:22 +02:00
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
14717a6c6d
Fixed merge conflict
...
Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
2019-05-13 15:15:14 +02:00
895588ebe0
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
2019-05-13 15:00:35 +02:00
27096276ec
agent view user acces ehorus
...
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
2019-05-13 15:00:29 +02:00
ecacf2d3f5
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
...
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2403
Former-commit-id: 183212d8ad2e9cab574800000ac71576d7ae75ae
2019-05-13 14:54:25 +02:00
c527435a0e
eHorus user-login settings
...
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
2019-05-10 15:32:25 +02:00
b51cdb93df
arreglo con la vista del formulario
...
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
2019-05-10 15:00:21 +02:00
793304b52d
Se habilita el boton de ehorus
...
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
2019-05-10 12:26:09 +02:00
44b14debdc
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
2019-05-10 09:38:31 +02:00
ecce1160e1
Added button to select ehorus conf type and box into user conf
2019-05-09 19:23:18 +02:00
9b51928e35
Added HTML edit feature, needed because TinyEdit adds lot's of HTML and is not practical. You need to edit the contents in HTML. Is not a security issue, because only admin can edit this news contents.
...
Former-commit-id: 4039346ffe4fc2628f515b4cdaeaf1655377e74b
2019-05-09 16:01:51 +02:00
e0729b6ca6
Se vuelve a crear la rama
...
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +02:00
99f5cab83d
fixed filemanager
2019-05-08 10:55:20 +02:00
f5759abcad
Merge branch 'develop' into ent-3468-Ayudas_online
2019-05-08 09:35:32 +02:00
a92f81272a
Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop
2019-05-07 15:05:03 +02:00
00b5fc0a2c
Added helps
...
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
2019-05-06 16:59:31 +02:00
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
c1272035cc
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
fa0da4504e
Fixed bug connection ok when db connection returns null
...
Former-commit-id: d2d6ea104bea4a0d0b4ffb2c64818428ee6ad703
2019-04-22 12:00:06 +02:00
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
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
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
448a5e64ea
Fixed disabled custom logo in open version
...
Former-commit-id: 4b5cd56af623bd6485111240be0bb0e11a0a3162
2019-03-25 16:46:17 +01:00
fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01: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
ccb669a204
Fixed minor errors in setup_ehorus
...
Former-commit-id: ed0ba17641714a87446b4db88d933d7b176e531e
2019-03-11 09:37:08 +01:00
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
1020ec1bd7
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
Former-commit-id: c193f6995a3a4115270cf45d635e310bf0f8cd3a
2019-03-07 13:45:56 +01:00
35633d181b
Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/install.php
Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6
2019-03-05 13:20:59 +01:00
450eccee7f
ticket resolved, duplicated sentece
...
Former-commit-id: bf419c14b79b633bb2894a34a91f74b32551549e
2019-03-05 13:17:21 +01:00
7be5d3e9e0
new header and menu
...
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
2ceba76d22
Fixed ldap conf tooltips
...
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
2019-03-05 09:09:24 +01:00
488be0d602
Changed radio buttons by checkbox switch
...
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
2019-03-04 13:12:01 +01:00
12a287f322
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
pandora_console/install.php
Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
36fa0fc41f
new header and menu
...
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
3f53541c5e
Added switch to enable NTA
...
Former-commit-id: 5fc3b47f8f9f92ac643db6a5dbe4fc320ca141f6
2019-03-01 13:38:48 +01:00
f0a3f4e9d7
Added configurable purge tnetwork_matrix
...
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
2019-03-01 12:39:55 +01:00
c886dd1dfa
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
...
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
2019-02-26 12:31:37 +01:00
875d7ecaba
Unified sizes of the checkbox switch
...
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
34eedc5330
new header and menu
...
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
4c92375a58
new header and menu
...
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
2019-02-25 12:23:15 +01:00
526311d1c6
new header and menu
...
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
300626e551
Merge remote-tracking branch 'origin/develop' into ent-3499-Numero_de_respuestas_de_eventos_masivas
...
Former-commit-id: 4a8482ccef3661c83553dff8f5533c29321f95f2
2019-02-20 15:38:15 +01:00
094a5c17d8
Merge branch '3222-Deshabilitar-doble-autenticacion-si-no-esta-activada' into 'develop'
...
disable double authentication option on user edit when disabled in authentication setup
See merge request artica/pandorafms!2054
Former-commit-id: b60f3ec06935ad6b6e456e556c9a281539e42e19
2019-02-20 09:56:49 +01:00
2e78012e40
Fix double authentication check in meta authentication setup
...
Former-commit-id: 37fea3368898f58fafda9c485b93bf07c8ad81fa
2019-02-19 13:13:13 +01:00
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +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
bb83f4ba4a
avoid to show notification if disabled by user
...
Former-commit-id: d00b09c9e608c51223f7192ad85408976fac5baa
2019-02-18 17:08:23 +01:00
34cf0bd837
minor fix acl check in notifications
...
Former-commit-id: 3ee0004f0c8ab507ed2301b77117ca945fb4e826
2019-02-18 14:01:17 +01:00
José González
Daniel Barbero Martin
Alejandro Campos
Daniel Maya
Daniel Rodriguez
Luis
José González
Marcos Alconada
fbsanchez
Jose Gonzalez
manuel.montes
Alejandro Fraguas
Tatiana Llorente
artica
Alejandro Gallardo Escobar
slerena
Ramon Novoa
fermin831