Daniel Barbero
d5108efb0d
fixed error update manager delete files
...
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
Daniel Barbero Martin
a1aa480421
add delete files in update manager
...
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +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
fbsanchez
d7983bec4e
WIP NetworkMap class
...
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +01:00
Daniel Rodriguez
ae006026bf
Merge branch '3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local' into 'develop'
...
fixed error in snmp browser change server
See merge request artica/pandorafms!2236
Former-commit-id: a6a45ffe82e01f49139d80e09a954cceb245ce12
2019-03-11 11:54:58 +01:00
daniel
00283a5c6a
progress task list
...
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +01:00
daniel
f79400ecfb
Merge remote-tracking branch 'origin/develop' into ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva
...
Former-commit-id: 76e5afc943bd05e89a82efbe091db42d1e0a4e8d
2019-03-07 08:32:40 +01:00
daniel
d722c39393
add custom net scan
...
Former-commit-id: 61df342754f17b2ecfe3ad06055e9c5b73617d03
2019-03-06 17:14:32 +01:00
Daniel Maya
e26c81aa6c
Fixed images and reset map in networkmap
...
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
2019-03-05 15:33:27 +01:00
daniel
9d7c6854a8
fixed error in snmp browser change server
...
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
daniel
8780571a74
add new functionality in event response
...
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +01:00
samucarc
8f24c0cb18
Fixed conflict in CLI apply_policy
...
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
Alejandro Fraguas
441fb979e1
Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
...
Ent 3210 nueva vista de servicios
See merge request artica/pandorafms!2195
Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
alejandro-campos
7791639b35
fix bad image routes
...
Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3
2019-02-26 13:31:35 +01:00
alejandro-campos
db5d2ceee1
fix bad routes in services treeview
...
Former-commit-id: 27bfcca5a7e0f7c3929e2a1f449c0f1d318891c9
2019-02-25 17:04:07 +01:00
alejandro-campos
faae9c58b3
implement services tree view
...
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
2019-02-22 14:09:27 +01:00
alejandro-campos
eb56fd566c
implemented services treeview
...
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
manuel
00cba4cbc9
Fixed bug in filtered modules by tag
...
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
samucarc
6a9e69adb1
Added changes
...
Former-commit-id: 0d0de6dba065aaaa5bbfc4b9f9790e4ef1b92b7d
2019-02-13 12:21:31 +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
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
tatiana.llorente@artica.es
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
alejandro-campos
1ed90180c9
disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
...
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
alejandro-campos
5a8e46d608
modify the way event responses are executed in event list
...
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
Alejandro Campos
4f7733d8e8
Merge branch '2923-unit-y-post-process-no-se-guardan' into 'develop'
...
fixed bug: failing load of post process and unit fields in plugin component in module creation
See merge request artica/pandorafms!1912
Former-commit-id: 659495290305079e9932ab60b5fef924ef6089ed
2019-01-09 10:31:44 +01:00
fbsanchez
c6b9122cfc
minor fix in control messages format and processing
...
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
Alejandro Gallardo Escobar
3c317c182d
Default value given to a textPath's startOffet attribute to fix an error
2018-12-04 16:42:19 +01:00
Alejandro Gallardo Escobar
a4f2a65e3a
Fixed the initial zoom and center of the networkmaps
2018-12-03 16:12:43 +01:00
vgilc
48c83430ec
Merge branch '3071_Fallo_en_mapa_GIS' into 'develop'
...
Fixed error in agent table in GIS map
See merge request artica/pandorafms!1970
2018-11-30 13:05:10 +01:00
daniel
726cabb578
fixed minor error jquery
2018-11-23 10:47:57 +01:00
daniel
2eb47c1251
fixed errors in custom fields view
2018-11-16 15:00:09 +01:00
daniel
0a097d185d
fixed errors in custom fields view
2018-11-16 11:58:49 +01:00
samucarc
dc6a293b52
Fixed error in agent table in GIS map
2018-11-14 11:53:12 +01:00
daniel
1c1df4b5f7
fixed errors css jqueryui
2018-11-07 17:09:42 +01:00
daniel
267f83cc4c
add datatabes
2018-11-07 13:25:02 +01:00
daniel
7d54858b45
delete files dont use
2018-11-07 13:24:07 +01:00
alejandro-campos
74016c928f
fixed bug: failing load of post process and unit fields in plugin component in module creation
2018-10-30 10:20:31 +01:00
vgilc
1973a5fe54
Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
...
WUX-UX integration
See merge request artica/pandorafms!1890
2018-10-26 14:42:23 +02:00
fbsanchez
c06bd4207e
estilos popup
2018-10-25 16:40:45 +02:00
fbsanchez
8619adbf4c
estilos popup
2018-10-25 15:42:20 +02:00
fbsanchez
85051924b7
estilos popup
2018-10-25 14:01:12 +02:00
vgilc
82f6e3cb95
Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop'
...
Fixed group and set_center
See merge request artica/pandorafms!1880
2018-10-25 11:43:38 +02:00
vgilc
4f406d8702
Merge branch '2876-No-se-guardan-datos-Network-components' into 'develop'
...
Fixed bug in the data collection of network component when creating its corresponding module
See merge request artica/pandorafms!1865
2018-10-25 10:58:03 +02:00
danielmaya
f10a661cd6
Fixed group and set_center
2018-10-23 12:36:20 +02:00
manuel.montes
aa0c4b41e7
Fixed bug in the data collection of network component when creating its corresponding module
2018-10-17 13:31:14 +02:00
fermin831
14afe2ff88
Added message 'Please, select an agent first'
2018-10-17 12:35:11 +02:00
fermin831
de10de03f7
[Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first
2018-10-10 17:42:33 +02:00
fermin831
28f9e152e7
[Tags performance] Fixed tags filter and removed unwanted code
2018-10-09 10:56:02 +02:00
Fermin
1e4c570541
[Tags performance] check agents_get_modules in networkmap and removed unused code
2018-10-05 10:44:24 +02:00
danielmaya
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
daniel
0c853a83d1
add new tree view edition group
2018-09-18 09:28:22 +02:00
daniel
f317f3e736
fixed errors in graph min and max warning and critical for edition module
2018-07-17 11:26:25 +02:00
slerena
082e9c6185
Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop'
...
Add visual animation to popup modal windows - #1781
See merge request artica/pandorafms!1284
2018-06-25 18:59:34 +02:00
daniel
e07da64c5d
fixed minor errors size stat-win
2018-06-12 16:54:45 +02:00
daniel
f85a8b513a
fixed errors
2018-06-08 14:30:15 +02:00
daniel
89a481c452
fixed errors in graphs
2018-06-06 11:18:39 +02:00
daniel
dd57ddbd3c
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions.php
pandora_console/include/styles/pandora.css
2018-05-28 17:54:53 +02:00
fermin831
063865e179
[Rebranding] Refactorized logos preview in nodo
2018-05-24 12:50:24 +02:00
daniel
16dca6860f
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/graphs/flot/pandora.flot.js
2018-05-23 12:46:12 +02:00
fermin831
e71fd399fb
Merge branch 'develop' into 2106-intracom-rebranding
...
Conflicts:
pandora_console/godmode/admin_access_logs.php
pandora_console/include/javascript/functions_pandora_networkmap.js
2018-05-22 19:29:46 +02:00
daniel
25666e1bff
fixed errors
2018-05-22 10:50:38 +02:00
vgilc
58370449dd
Merge branch 'ent-2200-Unreachable-host-en-respuestas-de-eventos' into 'develop'
...
Removed unreachable host from events responses
See merge request artica/pandorafms!1450
2018-05-22 10:00:37 +02:00
fermin831
0e3db1eb80
[Rebranding] Added custom logo to network maps central node
2018-05-21 18:26:28 +02:00
fermin831
80aeded931
[Rebranding] Central node in network maps
2018-05-14 12:58:22 +02:00
Alejandro Gallardo Escobar
7d6e50814f
Merge branch 'develop' into ent-2215-cut-node-names-networkmap
2018-05-10 12:41:28 +02:00
Alejandro Gallardo Escobar
9af7b75e3e
The node names of the networkmap are reduced if they are too long
2018-05-10 11:46:49 +02:00
vgilc
220ea8d319
Merge branch 'ent-2103-wms-map-server' into 'develop'
...
Added a new GIS map source type called WMS
See merge request artica/pandorafms!1469
2018-05-09 10:28:30 +02:00
vgilc
d746af9c28
Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop'
...
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso
See merge request artica/pandorafms!1442
2018-05-09 10:24:19 +02:00
fermin831
27b2d55371
Fixed Flip Flop threshold change value on component loading via AJAX
2018-04-30 17:48:49 +02:00
Alejandro Gallardo Escobar
cc06dfe876
Added a new GIS map source type called WMS
2018-04-27 12:17:42 +02:00
danielmaya
03b5cbdb62
Fixed issue in networkmap
2018-04-26 12:29:11 +02:00
danielmaya
708cd1020b
Fixed repeated relationships in networkmap
2018-04-26 10:40:16 +02:00
fermin831
5429ebb8de
Removed unreachable host from events responses
2018-04-25 19:04:52 +02:00
fermin831
675e8deb47
Added function display_confirm_dialog with custom dialog
2018-04-25 12:32:58 +02:00
danielmaya
118f32e12e
Fixed duplicate relationships in networkmap
2018-04-24 10:28:34 +02:00
fermin831
d6a695f793
Modified round decimals to avoid round string values
2018-04-19 19:17:04 +02:00
fermin831
4d78256937
Fixed Y-axis label decimals
2018-04-17 11:54:52 +02:00
vgilc
6a948c238e
Merge branch '1454-Mostrar-o-no-agentes-y-módulos-no-iniciados-en-tree-view' into 'develop'
...
Filter by not init agents and modules in tree view - #1454
See merge request artica/pandorafms!1397
2018-04-05 16:35:12 +02:00
danielmaya
7327998985
Fixed raw_text undefined in networkmap
2018-04-03 12:25:51 +02:00
enriquecd
8d39ae54fa
Filter by not init agents and modules in tree view - #1454
2018-03-28 17:07:57 +02:00
fermin831
1001240cf4
[SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details
2018-03-15 16:03:46 +01:00
fermin831
e9932daf19
[Tree view] Substitute items by groups
2018-03-15 12:06:07 +01:00
fermin831
74f899736f
[Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work
2018-03-12 15:17:59 +01:00
fermin831
28755d90a0
[Tree View] Fixed snapshot preview in metaconsole
2018-03-02 10:58:37 +01:00
enriquecd
18f3020785
Change fixed header and fixed menu positions - #1844
2018-02-28 19:02:54 +01:00
fermin831
80ecb6f366
[Console Tree view] Added counter
2018-02-27 11:46:28 +01:00
vgilc
7be55b4427
Merge branch '1735-Faltan-campos-en-edición-de-módulos-en-operaciones-masivas' into 'develop'
...
Add new fileds to massive module edition - #1735
See merge request artica/pandorafms!1295
2018-02-26 10:42:55 +01:00
fermin831
cef3cb2ae0
[Console Plugins][Console Recon Scripts] Fixed deletion macro
2018-02-22 16:13:25 +01:00
enriquecd
7f7916a18d
Add new fileds to massive module edition - #1735
2018-02-13 12:29:55 +01:00
enriquecd
c889776f44
Add visual animation to popup modal windows - #1781
2018-02-08 16:51:58 +01:00
danielmaya
eb38025b19
Fixed colour bug in interface link
2018-02-08 16:20:29 +01:00
vgilc
b0fc04c8f3
Merge branch '1751-Posición-de-los-agentes-en-el-mapa-de-red-dev' into 'develop'
...
Fixed raw_text in networkmap
See merge request artica/pandorafms!1238
2018-01-29 13:35:20 +01:00
vgilc
482204b525
Merge branch '1734-No-se-pueden-ver-opciones-avanzadas-en-módulos-generic_data_string' into 'develop'
...
Fix advanced options toggle for data string modules - #1734
See merge request artica/pandorafms!1237
2018-01-29 13:24:37 +01:00
danielmaya
72aefbd96d
Fixed colour link and delete link
2018-01-22 16:17:10 +01:00
danielmaya
877607e63e
Fixed draw link without color
2018-01-10 11:42:17 +01:00
danielmaya
8968e10dab
Fixed raw_text in networkmap
2018-01-09 18:54:14 +01:00
enriquecd
ca5032b4f6
Fix advanced options toggle for data string modules - #1734
2018-01-09 12:16:11 +01:00
vgilc
db55901bf5
Merge branch '1437-Mejorar-pantalla-de-introducción-de-licencia-open' into 'develop'
...
Change license windows style - #1437
See merge request artica/pandorafms!1048
2017-12-21 10:58:46 +01:00
danielmaya
87e2f4f3f9
Fixed filter in gis maps
2017-12-04 11:41:52 +01:00
vgilc
75c8b1ae8f
Merge branch '1537-errores-al-reiniciar-el-mapa-de-red-dev' into 'develop'
...
Added fix to reset map function
See merge request artica/pandorafms!1140
2017-12-01 09:31:21 +01:00
daniel
a0bdab9b83
Merge branch 'develop' into 1483-Cuadro_de_umbrales
...
Conflicts:
pandora_console/godmode/agentes/module_manager_editor_common.php
pandora_console/godmode/modules/manage_network_components_form_common.php
2017-11-30 16:29:00 +01:00
Arturo Gonzalez
92d054695d
Added fix to reset map function
2017-11-30 16:00:32 +01:00
vgilc
6ff9eb054c
Merge branch '1083-linea-de-color-cuando-uno-de-los-modulos-de-la-relacion-no-esta-bien-dev' into 'develop'
...
Added link color
See merge request artica/pandorafms!1049
2017-11-29 13:28:17 +01:00
vgilc
7beb05f8db
Merge branch '1369-interface-graphs-when-interface-is-not-init-in-networkmaps-dev' into 'develop'
...
Fixed filter to show interface graph or not
See merge request artica/pandorafms!957
2017-11-29 13:27:39 +01:00
vgilc
8e71f632e8
Merge branch '1537-new-option-in-networkmaps-to-reset-the-map-dev' into 'develop'
...
Added new option to networkmap, reset
See merge request artica/pandorafms!1035
2017-11-29 13:27:00 +01:00
Arturo Gonzalez
21bbfb557b
Added lost code
2017-11-27 15:00:59 +01:00
vgilc
62ffb46763
Merge branch '1471-fallo-enlace-publico-dashboards' into 'develop'
...
Fixed public dashboard permissions
See merge request artica/pandorafms!1004
2017-11-23 09:03:07 +01:00
fermin831
0f814c0b63
Added public dashboard authentication to some components
2017-11-21 16:59:49 +01:00
Arturo Gonzalez
fa50ac5cdf
Added link color
2017-11-10 11:05:53 +01:00
enriquecd
845db988e8
Change license windows style - #1437
2017-11-10 10:13:24 +01:00
Arturo Gonzalez
7b956e8ef6
Added new option to networkmap, reset
2017-11-07 15:05:31 +01:00
vgilc
2d87172558
Merge branch 'vulnerabilidad-en-consola' into 'develop'
...
Resolve: Vulnerabilidad en consola
See merge request artica/pandorafms!1020
2017-11-06 17:41:45 +01:00
Alejandro Gallardo Escobar
ac70caac71
[Console] Fixed XSS vulnerabilities
2017-11-06 15:20:24 +01:00
danielmaya
7c78cd2a34
Fixed password entities in snmp walk
2017-11-03 13:18:00 +01:00
Arturo Gonzalez
0b63fc22f9
Added lost code in limbo, come back to the heaven darling
2017-10-26 13:28:08 +02:00
Arturo Gonzalez
b5faf010b0
Fixed filter to show interface graph or not
2017-10-24 10:07:07 +02:00
daniel
a9a817df79
fixed error d3 in firefox
2017-10-23 14:05:21 +02:00
vgilc
d181edc471
Merge branch '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' into 'develop'
...
New feature. Dynamic units
See merge request !818
2017-10-04 17:41:37 +02:00
Arturo Gonzalez
65bfedf404
Fixed id of pandora node
2017-10-03 10:32:22 +02:00
Daniel Maya
d7f3e1ecde
New feature. Dynamic units
2017-09-14 12:10:41 +02:00
vgilc
6bf85a0789
Merge branch '1070-disable-interface-links-in-fictional-nodes-dev' into 'develop'
...
Removed interface link function in fictional nodes
See merge request !644
2017-09-11 09:35:35 +02:00
daniel
d74a3f74b4
Merge branch 'develop' into 1056-pandora-wux-grid-server
2017-09-01 10:51:54 +02:00
daniel
fe2a2a36e8
fixed minor errors in WUX
2017-08-30 16:09:11 +02:00
daniel
b078d48918
fixed errors in wux
2017-08-30 09:47:57 +02:00
Arturo Gonzalez
88834d6ea1
Added a first version of snmp browser with a proxy server
2017-08-24 16:26:58 +02:00
Arturo Gonzalez
ffed7359bc
Added execution in server proxy to event response commands
2017-08-24 13:25:03 +02:00
daniel
c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713
, reversing
changes made to f5da86ac0a
.
2017-08-23 09:35:17 +02:00
daniel
8232911713
merge develop
2017-08-22 18:39:34 +02:00
daniel
7e649b78b3
wux new form
2017-08-09 11:29:16 +02:00
Arturo Gonzalez
6b30accd11
Added new function to redirect with dbclick when fictinal have a map link
2017-07-25 15:38:28 +02:00
Enrique Camargo
0ff56b0856
Update openlayers.pandora.js
2017-07-13 12:07:53 +02:00
enriquecd
c9219107bf
Hold mark labels font size when autorefresh and fix drag map font size bug - #1115
2017-07-12 18:49:39 +02:00
Arturo Gonzalez
ba829e78ce
Removed interface link function in fictional nodes
2017-07-05 09:07:55 +02:00
Arturo Gonzalez
474957249b
Added correct button declaration
2017-06-07 10:29:01 +02:00
enriquecd
ced8050317
Decode html entities in module plugin selector for edit bulk operation - #959
2017-06-05 12:50:22 +02:00
vgilc
3aa4fc7315
Merge branch '943-header-refresh-no-stops-in-events-view-dev' into 'develop'
...
Removed old code that breaks the autorefresh pause
See merge request !538
2017-06-01 09:32:42 +02:00
vgilc
1d6747c353
Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop'
...
807 module massive operations with tag filter dev
See merge request !476
2017-05-31 17:42:09 +02:00
Arturo Gonzalez
4ba94f065e
Removed old code that breaks the autorefresh pause
2017-05-31 16:40:10 +02:00
artu30
a78b5cc60d
Merge branch 'develop' into '777-translations-dev'
...
# Conflicts:
# pandora_console/godmode/update_manager/update_manager.offline.php
# pandora_console/include/functions_update_manager.php
2017-05-22 17:51:21 +02:00
artu30
b5d3893c41
Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev'
...
# Conflicts:
# pandora_console/include/javascript/pandora_visual_console.js
2017-05-22 17:38:49 +02:00
Arturo Gonzalez
f58a9151f7
Fixed bad merge, thx branches
2017-05-22 17:37:21 +02:00
Arturo Gonzalez
309e9e900e
Added margin top value to images when have lines
2017-05-22 17:31:29 +02:00
vgilc
4cee2eaea8
Merge branch '836-bad-parents-line-position-in-visual-console-dev' into 'develop'
...
836 bad parents line position in visual console dev
See merge request !448
2017-05-17 17:48:53 +02:00
Arturo Gonzalez
d49f1f9916
Added tags filter to mosule massive operations (agent selection first)
2017-05-17 10:41:30 +02:00
Arturo Gonzalez
0346b49f1e
Fixed jquery request
2017-05-16 10:42:41 +02:00
Arturo Gonzalez
6f40069aa9
Added a new system to draw lines in visual console when element have an image
2017-05-09 17:29:17 +02:00
Arturo Gonzalez
eb1dafe807
Fixed lines in visual console
2017-05-09 12:40:22 +02:00
Arturo Gonzalez
ba312476e3
Changed help section in cascade protection help button and fixed help language.
2017-04-27 15:49:23 +02:00
Arturo Gonzalez
6aab4e60ae
Added buttons text to translate them
2017-04-26 09:50:42 +02:00
vgilc
1e5cf2d44e
Merge branch '409-change-font-size-of-map-gis' into 'develop'
...
Gis Maps Feature: When scrolling in map, change font-size of labels.
See merge request !360
2017-04-25 16:27:37 +02:00
enriquecd
7f927bfdd3
Change strings in minor release update manager / open / 2 - #486
2017-04-24 13:14:14 +02:00
vgilc
41e30eb39b
Merge branch '546-widgets-de-dashboard-open' into 'develop'
...
Resolve jquery library bug (holagram dashboard) - #546
See merge request !289
2017-04-18 16:01:22 +02:00
m-lopez-f
f8d3c8804e
Gis Maps Feature: When scrolling in map, change font-size of labels.
2017-04-10 17:46:32 +02:00
Arturo Gonzalez
640fee4b82
Added lost url to um open online
2017-04-05 16:23:30 +02:00
Arturo Gonzalez
629439f271
Added some modifications to adapt um and rr in meta
2017-04-05 10:26:12 +02:00
vgilc
3f27e0a306
Revert "Merge branch 'remove-traces-debug' into 'develop'"
...
This reverts merge request !266
2017-04-04 13:48:11 +02:00
vgilc
6b2cdb9784
Merge branch 'remove-traces-debug' into 'develop'
...
remove debug console.log traces.
See merge request !266
2017-04-04 13:47:41 +02:00
Arturo Gonzalez
12203f9c2b
Added time improvements to networkmaps
2017-04-03 14:20:11 +02:00
vgilc
6fbd8b9978
Merge branch '673-674-networkmap_visual_changes' into 'develop'
...
Added visual changes to module nodes in networkmap and added a new option to change the node name
See merge request !334
2017-04-03 13:53:17 +02:00
enriquecd
3d89007adb
Reposition of footer after load ajax elements in networkmap dialog - #112
2017-03-31 14:16:52 +02:00
Arturo Gonzalez
5f29a8f831
Added visual changes to module nodes in networkmap and added a new option to change the node name
2017-03-31 13:18:28 +02:00
Arturo Gonzalez
a67d40a447
Added a few modifications to move the footer when nodes table is too long and recolocate interface text with every movement to see it well
2017-03-30 15:56:00 +02:00
Arturo Gonzalez
a8b7f055f4
Added a lot of changes to networkmaps
2017-03-28 14:37:40 +02:00
Arturo Gonzalez
bcb8968bec
Added a few modifications to networkmaps
2017-03-28 11:32:58 +02:00
Arturo Gonzalez
a0d9ddd8e6
Added some changes to networkmap
2017-03-27 17:55:17 +02:00
Arturo Gonzalez
27e8ddcdaf
Added AMA edges to list of links with the same parent and children
2017-03-27 16:37:26 +02:00
Arturo Gonzalez
311143067a
Fixed identical text to multiple links delimiter
2017-03-27 16:28:24 +02:00
Arturo Gonzalez
9512d61e16
Added interface text to add i.link or u.link
2017-03-27 16:03:25 +02:00
Arturo Gonzalez
949fbc3660
Added the second interface text
2017-03-27 15:33:27 +02:00
Arturo Gonzalez
fc7afffb2c
Added curved lines to networkmap to support more than 1 MM edges between the same node
2017-03-27 14:28:11 +02:00
Arturo Gonzalez
2c3412a8a2
Init to show all mm links (between the same agent)
2017-03-24 12:47:28 +01:00
Arturo Gonzalez
277a3b656d
Fixed mr and um mix in um online open
2017-03-24 11:22:30 +01:00
enriquecd
e2567f7b6a
Resolve jquery library bug (holagram dashboard) - #546
2017-03-22 12:06:29 +01:00
Arturo Gonzalez
6731eb7da4
Fixed async error
2017-03-21 15:13:04 +01:00
Arturo Gonzalez
8ae921402c
Added mr folder cleaner
2017-03-21 14:48:12 +01:00
Arturo Gonzalez
b64afb7d6f
Added a few changes to um and rr
2017-03-21 10:39:39 +01:00
Arturo Gonzalez
c9fd56df75
Fixed errors in um online open
2017-03-17 14:22:04 +01:00
Arturo Gonzalez
8fc433f2a8
Added code to control the ocassional errors
2017-03-17 14:13:45 +01:00
Arturo Gonzalez
750203033f
Added minor fixes to um open
2017-03-17 14:05:53 +01:00
Arturo Gonzalez
89727824a4
Fixed error in um online open
2017-03-17 13:56:38 +01:00
Arturo Gonzalez
aebbc783df
Added changes to um online open to integrate mr
2017-03-17 13:27:06 +01:00
Arturo Gonzalez
011517f61d
Fixed "cancel" text in offline um dialogs
2017-03-17 11:29:31 +01:00
daniel
060e8f1ddc
merge develop
2017-03-17 10:12:53 +01:00
Arturo Gonzalez
25fb6bd894
Added minor fixes to rr
2017-03-17 09:57:10 +01:00
Arturo Gonzalez
5a1192c412
Added more changes to um online open with mr
2017-03-17 09:19:55 +01:00
Arturo Gonzalez
ff596fa797
Added a lot of changes in update manager online open to integrate with mr
2017-03-17 09:19:55 +01:00
Arturo Gonzalez
5f72dbafcc
Debug UM and RR system
2017-03-17 09:19:55 +01:00
Arturo Gonzalez
e7b811c39d
Fixed error in um offline oum path to get mrs.
2017-03-17 09:02:40 +01:00
Arturo Gonzalez
e713b843dc
Added a message whe system have a mr pending
2017-03-16 19:18:42 +01:00
Arturo Gonzalez
831b5e2c7d
Added a lot of modifications to integrate mr with um
2017-03-16 19:14:33 +01:00
Arturo Gonzalez
01b9572edc
Added more changes to um online open with mr
2017-03-16 18:23:07 +01:00
Arturo Gonzalez
b9702a5b00
Added a lot of changes in update manager online open to integrate with mr
2017-03-16 18:07:19 +01:00
Arturo Gonzalez
51cd53b3b3
Debug UM and RR system
2017-03-16 10:46:41 +01:00
m-lopez-f
b937db8f35
remove debug console.log traces.
2017-03-16 09:10:22 +01:00
daniel
e252135979
merge develop
2017-03-15 17:09:40 +01:00
Arturo Gonzalez
d9d01a453a
Added a last modifications to um offline and online open
2017-03-15 13:53:44 +01:00
Arturo Gonzalez
0db1dc50c7
Added a lot of code to um offline and online open.
2017-03-15 13:20:05 +01:00
daniel
a87839bd07
login page
2017-03-15 10:12:18 +01:00
Daniel Maya
f4350aed6b
Ticket 477. Fixed some bug in the visual console
2017-03-14 15:54:46 +01:00