daniel
|
4d4b8bbc0d
|
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 792472b0cc9b3f1ae56894c53407419c7fbd573e
|
2019-02-07 10:30:23 +01:00 |
Tatiana Llorente
|
f05011956f
|
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
pandora_console/install.php
Former-commit-id: cbe20ba58ef82cd1d8c833f34b20e74f16062434
|
2019-02-07 09:02:56 +01:00 |
|
Tatiana Llorente
|
4c2215a3db
|
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
|
2019-02-07 08:59:45 +01:00 |
|
Tatiana Llorente
|
8e20aab9f5
|
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
Conflicts:
pandora_console/install.php
Former-commit-id: 71af17b203571dacf4f5e1976a0a8599d5b8730d
|
2019-02-07 08:43:18 +01:00 |
|
daniel
|
f14684b22d
|
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup.php
Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
|
2019-02-07 07:58:33 +01:00 |
artica
|
1f3fe51f69
|
Auto-updated build strings.
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
|
2019-02-07 00:01:40 +01:00 |
samucarc
|
d82529438c
|
Fixed commit
Former-commit-id: 6b2f2ee955c63da4e73fa0e2bef4c10496ea42eb
|
2019-02-06 20:12:17 +01:00 |
|
samucarc
|
da14bbb66e
|
Fixed commit
Former-commit-id: 2d03897bfb48d40a85b24b9f7ee573dd1fadd7e2
|
2019-02-06 20:08:39 +01:00 |
|
samucarc
|
9c623148f5
|
Fixed conflict
Former-commit-id: 02b3e0656041e5bdadf295177f0c29a81abf8c3f
|
2019-02-06 19:14:46 +01:00 |
|
samucarc
|
fcb9275d11
|
Fixed conflict
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
|
2019-02-06 19:09:09 +01:00 |
Daniel Rodriguez
|
f098b72fe4
|
Merge branch 'ent-3274-Retoque-visual-vista-SNMP-interfaces' into 'develop'
Fixed height in slicesbar graph of table interface snmp - #3274
See merge request artica/pandorafms!2144
Former-commit-id: c4e83cd7a6525aae2a567a90b3fb7d4d1ebb70bf
|
2019-02-06 18:56:47 +01:00 |
manuel.montes
|
bf7e7f1e5c
|
Fixed merge errors
Former-commit-id: 30312c4b1ae7a3615576abbae90776f278586f27
|
2019-02-06 18:11:50 +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 |
Daniel Maya
|
f1f929bfe4
|
Merge branch 'develop' into 'ent-3392-7367-estado-de-elemento-incorrecto-en-consola-visual'
# Conflicts:
# pandora_console/include/functions_visual_map.php
Former-commit-id: 07e2add1d1e20f292d7bae05bcaa6452c92e4543
|
2019-02-06 17:37:23 +01:00 |
|
Daniel Maya
|
152d55fa8c
|
Merge branch 'develop' into 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada'
# Conflicts:
# pandora_console/godmode/massive/massive_edit_modules.php
Former-commit-id: 6d14e617f32575291898c9ce1bebde1e8b212691
|
2019-02-06 17:04:02 +01:00 |
|
manuel.montes
|
d113bfbeb8
|
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 57658aa74a36e6ca9bc53af58e3732e895cf977c
|
2019-02-06 17:02:58 +01:00 |
|
Daniel Maya
|
c1ee43a064
|
resolved conflicts
Former-commit-id: 6934eb56d50cfaa16a978472de044cfe135e906a
|
2019-02-06 17:00:15 +01:00 |
Alejandro Fraguas
|
9f7ab61766
|
Merge branch '3358-Mejora-en-la-aplicación-de-estilos' into 'develop'
3358 mejora en la aplicación de estilos
See merge request artica/pandorafms!2161
Former-commit-id: ef392bbd62ec9df99964d2057e23e35e334cb6c7
|
2019-02-06 16:34:00 +01:00 |
|
manuel.montes
|
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 |
|
daniel
|
b58f96ec42
|
Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
Conflicts:
pandora_console/install.php
Former-commit-id: 292ab3a98f7b2dffef8e0198298af74a6b619df2
|
2019-02-06 16:04:37 +01:00 |
|
daniel
|
19c5a1c844
|
fixed error pdf
Former-commit-id: 2a81a654df0c216951c61f36ff31a05ce5f7e29a
|
2019-02-06 15:58:36 +01:00 |
|
Tatiana Llorente
|
b805fe594e
|
Merge remote-tracking branch 'origin/develop' into ent-3274-Retoque-visual-vista-SNMP-interfaces
Conflicts:
pandora_console/include/functions_reporting_html.php
Former-commit-id: d096025f7a166160598f9fb26fe17c60809c9c3e
|
2019-02-06 15:34:06 +01:00 |
|
samucarc
|
a3aca91765
|
Fixed WMI passwords when encrypted
Former-commit-id: 7cadbe954ddd7c6878a58a7fbae13ab984ddb736
|
2019-02-06 15:26:43 +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 |
|
Tatiana Llorente
|
b8aab972c9
|
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
pandora_console/godmode/groups/group_list.php
Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
|
2019-02-06 15:14:22 +01:00 |
|
artica
|
c0a23889ab
|
Auto-updated build strings.
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
|
2019-02-06 00:01:29 +01:00 |
|
daniel
|
418d497291
|
fixed errors pdf
Former-commit-id: f7ad69f6b5e0910e5f31464ddfe94593529ef6a7
|
2019-02-05 10:40:24 +01:00 |
|
Tatiana Llorente
|
9baa3dcfa2
|
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
|
2019-02-05 09:23:53 +01:00 |
|
artica
|
97259bc285
|
Auto-updated build strings.
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
|
2019-02-05 00:01:28 +01:00 |
|
Daniel Rodriguez
|
06e87d2b36
|
Merge branch 'ent-3248-6352-anadir-compatibilidad-snmp-v3-a-servidor-snmp-enterprise' into 'develop'
Add SNMPv3 support to the Enterprise SNMP Server.
See merge request artica/pandorafms!2122
Former-commit-id: 49fd3b38b38d95f6b457dbf83d46f6ba52e94e1e
|
2019-02-04 17:00:25 +01:00 |
|
Alejandro Fraguas
|
67ab08fc41
|
Merge branch 'ent-3344-7304-procesado-de-XML-con-acentos' into 'develop'
added accent compatibility Dataserver
See merge request artica/pandorafms!2109
Former-commit-id: 7e7479c3d82aeb398fb0c76fe7df61d8522af2b3
|
2019-02-04 14:05:40 +01:00 |
|
daniel
|
20e0508e01
|
fixed pdf report
Former-commit-id: 515b8f06f3584c6aaa1a32ea29a2f555e7afccad
|
2019-02-04 12:10:52 +01:00 |
|
Alejandro Fraguas
|
ec97e54dec
|
Merge branch 'ent-3338-Bulk-operations-Module-operations' into 'develop'
Changed the order of actions
See merge request artica/pandorafms!2139
Former-commit-id: 13b7155ec497027e521f3a9b2147b9e24692e0db
|
2019-02-04 11:22:43 +01:00 |
|
manuel.montes
|
0a94ac9eb0
|
Merge branch 'develop' into ent-3338-Bulk-operations-Module-operations
Conflicts:
pandora_console/godmode/massive/massive_operations.php
Former-commit-id: b673fb9521259653d6f0386e6d9ab5add276380f
|
2019-02-04 11:00:50 +01:00 |
|
Daniel Rodriguez
|
74d9b18c87
|
Merge branch 'cursed-format-change' into 'develop'
Cambio del formato de estilo visual del código
See merge request artica/pandorafms!2156
Former-commit-id: 9b05490414194e58adbcd6a79a20c93eff40c9a4
|
2019-02-04 10:18:05 +01:00 |
Alejandro Gallardo Escobar
|
4c735762dc
|
Merge branch 'develop' into cursed-format-change
Former-commit-id: a986a0245f7f0cce5ea7fc3c33503bc53e85242a
|
2019-02-04 09:11:39 +01:00 |
|
artica
|
af1f081e5c
|
Auto-updated build strings.
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
|
2019-02-04 00:01:33 +01:00 |
|
artica
|
934533141e
|
Auto-updated build strings.
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
|
2019-02-03 00:01:26 +01:00 |
|
artica
|
24e799f18e
|
Auto-updated build strings.
Former-commit-id: 0e390ddd2b2294dbd043bc7c94dd9a82c228c80f
|
2019-02-02 00:01:29 +01:00 |
|
Alejandro Gallardo Escobar
|
d38236091b
|
Format fixes
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
|
2019-02-01 09:55:29 +01:00 |
|
artica
|
62461525e8
|
Auto-updated build strings.
Former-commit-id: 899c65040831974e16b76b37348dea7d428a7af3
|
2019-02-01 00:01:36 +01:00 |
|
Alejandro Gallardo Escobar
|
229c60c5cc
|
Merge branch 'develop' into cursed-format-change
Former-commit-id: a3dfd193c81af0ebe0549dc2a9c953aac98b5f68
|
2019-01-31 09:42:10 +01:00 |
|
artica
|
d6667354fc
|
Auto-updated build strings.
Former-commit-id: 166da74dd65e72a242b58cf10f4c564496b76fe9
|
2019-01-31 00:01:24 +01:00 |
|
daniel
|
c5d5fd4164
|
Merge branch 'fix/mr_value_731' into 'develop'
fixed mr token
See merge request artica/pandorafms!2158
Former-commit-id: c6134a2d1911471335704d231d0b479ae5c94bd7
|
2019-01-30 17:15:57 +01:00 |
|
daniel
|
d0fe6c9ecf
|
fixed mr token
Former-commit-id: ab5615c8eb0f1a2b153934b807d23804f4fd5562
|
2019-01-30 17:11:48 +01:00 |
|
daniel
|
9af1680e15
|
fixed error php7 info install and RPM
Former-commit-id: 4c38ee93e01d2ff88bb0d3dc563cf7bbbbcd9946
|
2019-01-30 16:57:07 +01:00 |
|
artica
|
b3da2803a4
|
Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
|
2019-01-30 16:18:44 +01:00 |
Ramon Novoa
|
2626605030
|
Validate alerts at the time agents/modules are modified.
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
|
2019-01-30 12:58:31 +01:00 |
|
artica
|
7a9684f23c
|
Changed the format of the .css files
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
|
2019-01-30 12:42:16 +01:00 |
|
artica
|
dc238cf74a
|
Changed the format of the .js and .html files
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
|
2019-01-30 12:27:18 +01:00 |