fbsanchez
|
fe42a8782b
|
Updated messages in centralised environment status check
|
2021-09-23 11:16:48 +02:00 |
Daniel Rodriguez
|
b02ecc7cae
|
Merge branch 'ent-7473-11796-mala-representacion-de-percentil-en-graficas-personalizadas' into 'develop'
fixed error with percentiles in graphs
See merge request artica/pandorafms!4312
|
2021-09-21 13:18:18 +00:00 |
Jose Gonzalez
|
423bd106d5
|
Fix issues
|
2021-09-01 16:57:48 +02:00 |
José González
|
215c0e3cc1
|
Branding
|
2021-08-30 16:24:51 +02:00 |
José González
|
f31d156a46
|
Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta
|
2021-08-27 13:00:37 +02:00 |
Jose Gonzalez
|
1bba211086
|
Fix issue with redeclaration of functions_metaconsole.php
|
2021-08-18 15:07:34 +02:00 |
Junichi Satoh
|
cadaca669f
|
Fixed SNMP interfaces wizard against 32bit counter devices.
|
2021-08-10 12:08:28 +09:00 |
marcos
|
2494db3ff0
|
fixed error with percentiles in graphs
|
2021-07-20 10:18:08 +02:00 |
fbsanchez
|
0cec3afba0
|
Deactivated nodes if not unified
|
2021-07-19 13:47:43 +02:00 |
José González
|
784d9b0121
|
Added rebranding features
|
2021-07-16 13:17:25 +02:00 |
fbsanchez
|
760522aeff
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
|
2021-06-28 11:03:09 +02:00 |
fbsanchez
|
36f6ad4ee2
|
Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios
Conflicts:
pandora_console/include/styles/meta_dashboards.css
|
2021-06-28 10:37:49 +02:00 |
fbsanchez
|
4c2ac234b8
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
pandora_console/extras/mr/48.sql
pandora_console/godmode/servers/plugin.php
|
2021-06-24 14:37:30 +02:00 |
Luis
|
497ecb329d
|
Changed new wiki url on helps
|
2021-06-24 12:31:15 +00:00 |
fbsanchez
|
390bf14761
|
cover for bulk service operations in mc/node
|
2021-06-22 15:32:15 +02:00 |
fbsanchez
|
94cd4c96dd
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/javascript/pandora_ui.js
|
2021-06-14 17:37:01 +02:00 |
fbsanchez
|
cdad04f9cd
|
Update the DB schema when upgrading from RPMs.
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
|
2021-06-14 11:56:42 +00:00 |
Daniel Barbero Martin
|
97595ad973
|
Wip command center
|
2021-06-03 10:16:29 +02:00 |
Daniel Barbero Martin
|
a1ca4abe8f
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
|
2021-05-27 08:22:43 +02:00 |
Daniel Rodriguez
|
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 |
Daniel Barbero Martin
|
a0982cd260
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/users/profile_list.php
|
2021-05-18 08:39:06 +02:00 |
alejandro.campos@artica.es
|
9cde8c345f
|
removed deprecated incident permissions
|
2021-05-13 13:33:45 +02:00 |
Calvo
|
6ad371e4ab
|
Email test working with data in text fields
|
2021-04-29 16:04:51 +02:00 |
Daniel Barbero Martin
|
c28ea4cc9a
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
|
2021-04-15 08:40:58 +02:00 |
Daniel Rodriguez
|
1d6c7c6eed
|
Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop'
SAML login in mobile console
See merge request artica/pandorafms!3733
|
2021-04-14 07:39:29 +00:00 |
Daniel Barbero Martin
|
aa31ed8f58
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
|
2021-04-13 08:34:05 +02:00 |
Daniel Barbero Martin
|
fcf449439b
|
WIP command center
|
2021-04-07 12:43:04 +02:00 |
fbsanchez
|
6e4212129b
|
Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
pandora_console/include/styles/dashboards.css
pandora_console/mobile/operation/visualmap.php
pandora_console/mobile/operation/visualmaps.php
|
2021-04-07 10:28:44 +02:00 |
Daniel Barbero Martin
|
01f801cb4f
|
fixed minor error
|
2021-03-30 17:49:15 +02:00 |
fbsanchez
|
a3e571ff50
|
Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect
Conflicts:
pandora_console/godmode/users/user_list.php
|
2021-03-26 13:52:01 +01:00 |
Daniel Rodriguez
|
2422813a29
|
Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop'
visual fixes in agent view graphs
See merge request artica/pandorafms!3884
|
2021-03-10 15:56:15 +00:00 |
Jose Gonzalez
|
f0dd360786
|
Fixed merge
|
2021-03-09 12:56:59 +01:00 |
alejandro.campos@artica.es
|
0a8c478c47
|
visual fixes in agent view graphs
|
2021-03-08 17:48:59 +01:00 |
Daniel Rodriguez
|
da15dfc69c
|
Merge branch 'ent-5347-Mensaje-de-aviso-de-información-actualizada-erróneo-al-cambiar-el-idioma' into 'develop'
Ent 5347 mensaje de aviso de información actualizada erróneo al cambiar el idioma
See merge request artica/pandorafms!3698
|
2021-03-01 10:41:39 +00:00 |
fbsanchez
|
40e97f6cf6
|
Removed warnings
|
2021-02-09 10:25:08 +01:00 |
fbsanchez
|
e711239c69
|
Added port, limited base OID (default) removed timeout (browser) capturing error to message
|
2021-02-08 17:42:41 +01:00 |
fbsanchez
|
5a38d31a6d
|
Wizard (interfaces) backend performance improved
|
2021-02-04 13:11:47 +01:00 |
fbsanchez
|
0ddc1929fa
|
multiple fixes
|
2021-02-02 11:25:26 +01:00 |
Jose Gonzalez
|
93a4d92a72
|
Modified line for solve linter error
|
2021-01-18 14:56:36 +01:00 |
alejandro-campos
|
366d02f203
|
Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3
|
2021-01-14 09:22:06 +01:00 |
fbsanchez
|
3eb4af5fd7
|
Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
pandora_console/mobile/operation/visualmap.php
pandora_console/mobile/operation/visualmaps.php
|
2021-01-07 10:59:02 +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 |
fbsanchez
|
025288d9fe
|
Fixes on VC navigation (mobile)
|
2020-12-21 18:10:46 +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 |
Daniel Maya
|
7ec1978f41
|
Fixed update_user
|
2020-12-09 11:48:32 +01:00 |
Luis
|
aeb7a7e9c6
|
Add decimal separator to all pandora csv
|
2020-12-01 11:56:15 +01:00 |
Jose Gonzalez
|
649442f794
|
Updated copyrights
|
2020-11-27 13:52:35 +01:00 |
fbsanchez
|
8bcbe0ab77
|
Fixed agent details in MC
|
2020-11-16 19:16:25 +01:00 |
Daniel Rodriguez
|
83233b6192
|
Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop'
groups_get_children and propagate update
See merge request artica/pandorafms!3545
|
2020-10-29 12:36:49 +01:00 |
alejandro-campos
|
def59508ae
|
changed behavior of all group acl check and fixed acl vulnerabilities
|
2020-10-22 12:00:44 +02:00 |
fbsanchez
|
6b25ae6004
|
improved agent_module report (CSV)
|
2020-10-21 13:23:17 +02:00 |
Daniel Barbero Martin
|
6c16587b40
|
fixed legend avg network interfaces
|
2020-10-20 12:58:25 +02:00 |
daniel
|
148384f8fb
|
phantomjs performance
|
2020-10-13 18:24:10 +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 |
alejandro-campos
|
2915a3bd35
|
fixed email test
|
2020-10-06 11:07:46 +02:00 |
daniel
|
a5d5a45cac
|
add render graph to reports
|
2020-10-02 14:16:55 +02:00 |
alejandro-campos
|
0345d36d08
|
fixed open online update
|
2020-09-01 08:12:57 +02:00 |
Alejandro Fraguas
|
2d25c19a5f
|
Merge branch 'ent-6139-formatos-fecha-no-muestran-bien' into 'develop'
Fixed and added strfdate formats
See merge request artica/pandorafms!3383
|
2020-08-05 11:51:01 +02:00 |
daniel
|
2c535bb747
|
Fixed labels mode classic
|
2020-07-21 15:06:41 +02:00 |
Luis Calvo
|
4b1d586ef0
|
Fixed and added strfdate formats
|
2020-07-16 14:07:29 +02:00 |
Daniel Barbero Martin
|
595339613b
|
fixed weight legend
|
2020-06-29 15:37:37 +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
|
8ebf7b34f2
|
Merge branch 'ent-5910-bug-sql-query-report-illegal-words' into 'develop'
Modified match for forbidden words. Now not allows spaces or scaped chars....
Closes pandora_enterprise#5910
See merge request artica/pandorafms!3277
|
2020-06-15 18:03:36 +02:00 |
Daniel Rodriguez
|
394ba9e94f
|
Merge branch 'ent-5695-Strings-en-informes-Disponibilidad-y-SLA' into 'develop'
Fixed error functions date default type
See merge request artica/pandorafms!3230
|
2020-06-15 08:28:27 +02:00 |
Daniel Rodriguez
|
b0d774524a
|
Merge branch 'ent-5545-Valores-feos-en-graficas-de-agentes' into 'develop'
Fixed values legend charts sparse
See merge request artica/pandorafms!3245
|
2020-06-11 14:02:47 +02:00 |
alejandro-campos
|
ab61cf1fc5
|
changed console and audit log locations
|
2020-06-08 10:48:48 +02:00 |
Jose Gonzalez
|
c6b1e92bda
|
Modified match for forbidden words. Now not allows spaces or scaped chars. Other cases must not be problemathic
|
2020-06-08 08:44:24 +02:00 |
Manuel Montes
|
611291c217
|
Ent 5428 revision total de ayudas hint wiki
|
2020-05-29 11:37:06 +02:00 |
Daniel Barbero Martin
|
f2f1eaf58e
|
Fixed values legend charts sparse
|
2020-05-26 14:44:52 +02:00 |
Daniel Barbero Martin
|
ab8916a0da
|
Fixed error functions date default type
|
2020-05-22 09:39:10 +02:00 |
Tatiana Llorente
|
fabace239d
|
Ent 5675 textos del sistema de licencias
|
2020-05-12 12:54:20 +02:00 |
daniel
|
709201bf23
|
dashboards
|
2020-03-26 12:29:38 +01:00 |
Tatiana Llorente
|
ec57540fb0
|
Ent 5432 libreria de modulos de pandora integrada en consola
|
2020-02-27 11:20:24 +01:00 |
daniel
|
ac6ca52c45
|
Fixed resulution charts
|
2020-02-27 10:52:01 +01:00 |
marcos
|
e28415250c
|
remove entities from reports
|
2020-02-26 15:18:42 +01:00 |
vgilc
|
a0ea52983b
|
Revert "Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'"
This reverts merge request !2519
|
2020-02-26 14:27:19 +01:00 |
marcos
|
f25aacf108
|
fixed erro2
|
2020-02-21 10:58:04 +01:00 |
Daniel Maya
|
ae015fa00f
|
Fixed width in availability graph
|
2020-02-05 16:40:01 +01:00 |
Daniel Rodriguez
|
bdb8d309ad
|
Merge branch 'ent-5359-8945-Logo-y-nombre-de-Pandora-FMS-al-fallar-la-base-de-datos' into 'develop'
fix to display pandora tab subtitle based on condition and display rebranding...
See merge request artica/pandorafms!3025
|
2020-02-03 14:06:38 +01:00 |
alejandro-campos
|
d21068e368
|
fix to display pandora tab subtitle based on condition and display rebranding product name in case database connection failed
|
2020-01-24 13:52:09 +01:00 |
Daniel Barbero Martin
|
6c6403336f
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-23 08:14:24 +01:00 |
marcos
|
18a3a747bd
|
add wiki url alerts correlation
|
2020-01-22 12:24:15 +01:00 |
Daniel Barbero Martin
|
89e83e38e0
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
pandora_console/include/javascript/pandora.js
|
2020-01-21 08:28:00 +01:00 |
Alejandro Campos
|
e7769b8bf4
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/extras/mr/35.sql
|
2020-01-20 12:00:42 +01:00 |
Daniel Barbero Martin
|
536af6f33a
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-19 11:37:18 +01:00 |
Daniel Rodriguez
|
96eebe4310
|
Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop'
Added port option on server configuration to be used when connecting to execution server
See merge request artica/pandorafms!3012
|
2020-01-17 14:40:58 +01:00 |
Daniel Barbero Martin
|
d5e21499c2
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-16 14:08:07 +01:00 |
Tatiana Llorente
|
0980c9a74a
|
Ent 5261 cambio de control de intervalo en alertas
|
2020-01-16 13:50:39 +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
|
5eb2953810
|
Added port option on server configuration to be used when connecting to execution server
|
2020-01-14 15:43:17 +01:00 |
Daniel Barbero Martin
|
60bd600392
|
module graph convert to image base 64
|
2020-01-13 13:31:23 +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 |
daniel
|
3e58746cd5
|
Fixed errors PDF images relative routes
|
2019-12-17 18:18:00 +01:00 |
Daniel Barbero
|
a203da5a26
|
Fixed errors
|
2019-12-13 16:01:24 +01:00 |
daniel
|
3dbdfdb6eb
|
Fix Landscape reports
|
2019-12-11 15:07:38 +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 |
daniel
|
960326b980
|
Add menu omnishell
|
2019-11-21 18:21:46 +01:00 |
Daniel Barbero Martin
|
7103317bc2
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
Conflicts:
pandora_console/general/header.php
pandora_console/include/styles/pandora.css
|
2019-11-13 12:12:17 +01:00 |
alejandro-campos
|
a06f56a413
|
added function to convert cidr prefixes to mask
|
2019-10-23 17:22:18 +02:00 |
Daniel Barbero Martin
|
4e56f6751a
|
Continue work diagnostics
|
2019-10-17 15:17:28 +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
|
f73cd80336
|
minor changes in integria integration
|
2019-09-23 15:16:31 +02:00 |
alejandro-campos
|
9bf2980f01
|
fix minor bugs in integria integration
|
2019-09-23 12:48:20 +02:00 |
alejandro-campos
|
0df2447770
|
added comment management and fixed some errors in incident edition
|
2019-09-20 12:37:47 +02:00 |
Tatiana Llorente
|
8acdde9f3a
|
Added date filter - #4642
|
2019-09-18 18:19:29 +02:00 |
Tatiana Llorente
|
eb271a93eb
|
Added button for export to csv - #4642
|
2019-09-18 15:32:36 +02:00 |
Daniel Barbero Martin
|
84d1979c9e
|
fixed error percentil label
|
2019-09-18 11:15:55 +02:00 |
alejandro-campos
|
f2a6dbb60e
|
Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria
|
2019-09-17 14:56:54 +02:00 |
alejandro-campos
|
87f8badc18
|
completed integria setup and incident creation and update
|
2019-09-17 13:38:17 +02:00 |
Tatiana Llorente
|
027f9fd9d4
|
New view - List of Integria IMS tickets - #4642
|
2019-09-17 12:59:29 +02:00 |
Tatiana Llorente
|
ca6fe42298
|
Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria
|
2019-09-13 12:00:04 +02:00 |
alejandro-campos
|
11cb53582c
|
backup changes
|
2019-09-02 17:01:41 +02:00 |
Daniel Rodriguez
|
c46686981e
|
Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop'
modified function to export audit csv to decode entities as separator
See merge request artica/pandorafms!2692
|
2019-08-30 14:29:44 +02:00 |
alejandro-campos
|
f423ddc42f
|
modified function to export audit csv to decode entities as separator
|
2019-08-30 09:42:58 +02:00 |
Alejandro Fraguas
|
fadccf0ff3
|
Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop'
Fixed bug in public visual console view
See merge request artica/pandorafms!2672
|
2019-08-26 13:12:31 +02:00 |
manuel
|
e439e7349f
|
Fixed bug in public visual console view
|
2019-08-21 09:22:13 +02:00 |
Jose Gonzalez
|
5ab2bfacbd
|
Modified date formatting to avoid entities
|
2019-07-25 15:43:46 +02:00 |
Jose Gonzalez
|
5cdfb871a1
|
Modified the divider in print_audit_csv function
|
2019-07-25 15:35:57 +02:00 |
Daniel Barbero Martin
|
7fa95d3e43
|
PHP-FPM
|
2019-07-17 17:20:09 +02:00 |
fbsanchez
|
fc0d9463d5
|
Fixed
|
2019-06-25 12:07:56 +02:00 |
Daniel Rodriguez
|
265202f1ed
|
Merge branch 'ent-4136-button-styles' into 'develop'
Review 1
See merge request artica/pandorafms!2470
|
2019-06-20 16:35:12 +02:00 |
fbsanchez
|
4424189632
|
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
|
2019-06-19 10:51:34 +02:00 |
fbsanchez
|
24025ebb74
|
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
|
2019-06-18 17:48:03 +02:00 |
fbsanchez
|
419a90d69c
|
wip event list
|
2019-06-07 17:35:13 +02:00 |
Daniel Maya
|
419b3f4fb1
|
Fixed module_manager with Agent limit surpassed or license expired
|
2019-06-03 10:47:54 +02:00 |
fbsanchez
|
eb5ee75d33
|
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
|
2019-06-03 09:18:49 +02:00 |
fbsanchez
|
94153b823f
|
Help links
|
2019-05-30 11:25:09 +02:00 |
fbsanchez
|
9eecc414dd
|
cps changes - switch core touched - test this commit carefully
|
2019-05-27 14:12:53 +02:00 |
fbsanchez
|
4fe7680694
|
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
|
2019-05-22 15:33:13 +02:00 |
fbsanchez
|
bd88cbd42d
|
1st approach simplifying MC management
|
2019-05-22 15:31:59 +02:00 |
manuel
|
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 |
Alejandro Fraguas
|
3548070ec1
|
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop'
Add new message to News board
See merge request artica/pandorafms!2415
Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
|
2019-05-14 17:56:43 +02:00 |
marcos.alconada
|
35c7ea1f48
|
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
|
2019-05-14 17:14:02 +02:00 |
marcos.alconada
|
bc849c16fb
|
Only one image for welcome new board
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
|
2019-05-14 17:13:44 +02:00 |
manuel
|
827ebcfbc5
|
Fix helps
Former-commit-id: c4c666d8552f153a8d29320d655d27da50fa4267
|
2019-05-14 13:09:49 +02:00 |
manuel
|
b89751e647
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
|
2019-05-14 11:50:07 +02:00 |
Alejandro Fraguas
|
8ff62a58ce
|
Merge branch 'ent-3695-ipam-oids' into 'develop'
IPAM vlan wizard ExtremeXOS
See merge request artica/pandorafms!2409
Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5
|
2019-05-14 11:30:55 +02:00 |
manuel
|
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 |
Daniel Barbero Martin
|
ab2bf737d5
|
Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas
Conflicts:
pandora_console/include/functions.php
Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
|
2019-05-10 12:18:10 +02:00 |
manuel
|
43ce4f9883
|
Added helps
|
2019-05-09 17:20:27 +02:00 |
manuel
|
143def5d87
|
Added helps
|
2019-05-09 13:43:53 +02:00 |
Daniel Rodriguez
|
ac101af72f
|
Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop'
Added module units in module graphs
See merge request artica/pandorafms!2237
|
2019-05-08 16:36:43 +02:00 |
fbsanchez
|
9bc5a2d346
|
IPAM vlan wizard ExtremeXOS
|
2019-05-08 14:17:40 +02:00 |
manuel
|
b2b4372c9d
|
Added helps
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
|
2019-05-07 11:34:09 +02:00 |
manuel
|
00b5fc0a2c
|
Added helps
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
|
2019-05-06 16:59:31 +02:00 |
Daniel Barbero Martin
|
3fcd854ae6
|
fixed error labels graphs and weight in chart
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
|
2019-05-06 16:43:59 +02:00 |
manuel
|
b1dd6edc64
|
Added changes in helps
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
|
2019-04-30 12:28:11 +02:00 |
manuel
|
7045e59e87
|
Added changes in helps
Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c
|
2019-04-30 10:44:53 +02:00 |