Daniel Rodriguez
e6a5d7986f
Merge branch 'ent-5376-Inyecciones-SQL-vistas-por-Nokia-USA' into 'develop'
...
Fixed % with sprintf
See merge request artica/pandorafms!3039
2020-02-04 13:14:55 +01:00
Daniel Rodriguez
8b60daa9ba
Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
...
fix module string data with html special chars breaking html in page
See merge request artica/pandorafms!3042
2020-02-04 10:10:07 +01:00
alejandro-campos
73f3dfac85
fix module string data with html special chars breaking html in page
2020-01-31 11:53:42 +01:00
Daniel Maya
891c517611
Fixed % with sprintf
2020-01-30 13:02:33 +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
Daniel Barbero Martin
4a1801bc50
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-16 08:04:18 +01:00
Alejandro Campos
6dbe75169f
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-15 14:37:00 +01:00
Tatiana Llorente
28b585196b
Ent 5099 dobles interfaces en mapas de red no se visualizan
2020-01-15 14:11:36 +01:00
Alejandro Campos
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
Daniel Barbero Martin
14e4e37c2a
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-10 08:09:13 +01:00
Daniel Rodriguez
1cef8aa62f
Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
...
Changed the mode of obtain the title
See merge request artica/pandorafms!2743
2020-01-09 16:46:58 +01:00
Daniel Barbero
a933a091ea
styles fixed
2020-01-09 12:07:19 +01:00
Daniel Barbero
b40f5b17c1
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-09 09:43:57 +01:00
Daniel Rodriguez
c30e9eb1fe
Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop'
...
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red
See merge request artica/pandorafms!2896
2020-01-08 11:33:27 +01:00
Daniel Barbero Martin
c4f0305f9b
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-08 08:29:59 +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 Rodriguez
1ced09986e
Merge branch 'ent-5212-ventana-de-bienvenida-open' into 'develop'
...
Minor fix - opensource welcome icon
See merge request artica/pandorafms!2983
2020-01-07 09:38:20 +01:00
Daniel Barbero Martin
5e008e684d
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-02 17:45:52 +01:00
Alejandro Fraguas
ebe6e1109c
Merge branch 'ent-4467-barra-de-busqueda-como-interprete-de-ordenes' into 'develop'
...
Ent 4467 barra de busqueda como interprete de ordenes
See merge request artica/pandorafms!2934
2019-12-26 11:10:53 +01:00
marcos
04ed92523a
changed token VW to VR
2019-12-26 10:29:26 +01:00
Alejandro Fraguas
935d246a0d
Merge branch 'ent-5162-9263-Notificaciones-infinitas' into 'develop'
...
removed newsletter notification from messages list
See merge request artica/pandorafms!2978
2019-12-23 10:49:04 +01:00
fbsanchez
9ee102b365
already used ui_get_full_url
2019-12-19 20:02:29 +01:00
fbsanchez
abf4097e63
Minor fix - opensource welcome icon
2019-12-19 19:58:00 +01:00
marcos
43d08f354a
Ajustes CSS
2019-12-19 16:53:45 +01:00
marcos
87405ba318
add message no resoult found
2019-12-19 14:20:31 +01:00
marcos
e06c974e67
add acl's to order interpreter
2019-12-19 14:10:43 +01:00
alejandro-campos
c3daa7e803
removed newsletter notification from messages list
2019-12-19 10:42:41 +01:00
Daniel Barbero
2a92c9d38d
Fixed errors VC forms
2019-12-17 10:57:19 +01:00
marcos
de161d830c
add Traducction
2019-12-13 14:46:47 +01:00
marcos
3008651b65
add < list
2019-12-13 14:43:30 +01:00
marcos
4e712d1a45
fixed error
2019-12-13 14:25:33 +01:00
marcos
90d0be6ff1
fixed error
2019-12-13 14:22:50 +01:00
marcos
480673521c
Can select with keyboard list items
2019-12-13 14:08:44 +01:00
marcos
6a5dfb5ec9
refactor code
2019-12-12 17:16:09 +01:00
Daniel Barbero
63dd3c48f8
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/include/javascript/pandora.js
2019-12-12 16:32:32 +01:00
marcos
1f3fc1f908
add more pages in order interpreter
2019-12-12 16:27:11 +01:00
fbsanchez
ede4cedf62
Fix networkmap module key assignment
2019-12-11 16:42:50 +01:00
Daniel Rodriguez
f9c4a826d5
Merge branch 'ent-4982-Tree-View-Module-groups' into 'develop'
...
Added Group by in tree view
See merge request artica/pandorafms!2903
2019-12-10 13:46:27 +01:00
vgilc
7db5f8b9b1
Merge branch 'ent-4887-service-tree-view-no-carga' into 'develop'
...
Solved issue with query
See merge request artica/pandorafms!2858
2019-12-10 11:46:17 +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
marcos
1430e6ee11
Update orderinterpreter class and css
2019-12-05 16:10:31 +01:00
marcos
fbb1e53362
update orderinterpreter
2019-12-04 17:28:03 +01:00
marcos
1f97fcef40
update css and preg_match
2019-12-03 18:31:13 +01:00
marcos
7eec91b946
Show result in normal window
2019-12-03 18:19:32 +01:00
marcos
14b8379ccb
ajax call, controller, class, match result, return array inputs(example to return)
2019-12-03 15:11:16 +01:00
marcos
d4720c2260
add firts changes
2019-12-03 13:59:03 +01:00
Daniel Barbero Martin
e6afe84940
Fixed pdf
2019-11-27 15:22:39 +01:00
daniel
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
Daniel Maya
791454ee87
Added Group by in tree view
2019-11-21 10:22:51 +01:00
Tatiana Llorente
5dc9843e89
Fixed bug with shape in fictional nodes in network maps
2019-11-19 16:53:12 +01:00
Alejandro Fraguas
27bdf04735
Merge branch 'ent-4774-welcome-to-pandorafms' into 'develop'
...
first changed to welcome window
See merge request artica/pandorafms!2822
2019-11-14 16:05:22 +01:00
Alejandro Fraguas
0199c6312a
Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop'
...
refactoriced diagnostics pandoraFMS
See merge request artica/pandorafms!2809
2019-11-14 11:49:23 +01:00
Daniel Barbero Martin
750e6e789c
fixed minor error
2019-11-14 09:58:10 +01:00
Daniel Barbero Martin
879884e6c3
fixed errors
2019-11-14 09:52:56 +01:00
Daniel Barbero Martin
86162b4c66
fixed errors
2019-11-14 08:53:45 +01:00
Daniel Barbero Martin
42fc81a408
fixed errors
2019-11-13 17:50:22 +01:00
fbsanchez
65d02d4529
Merge remote-tracking branch 'origin/ent-EDF' into ent-4774-welcome-to-pandorafms
2019-11-13 17:40:45 +01:00
fbsanchez
345eb48fd7
save the green lines
2019-11-13 17:38:48 +01:00
fbsanchez
83590146b1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
2019-11-13 17:38:24 +01:00
Daniel Barbero Martin
8645b01828
fixed errors
2019-11-13 16:43:32 +01:00
Daniel Barbero Martin
a0db941b1e
fixed errors
2019-11-13 15:52:09 +01:00
fbsanchez
6677b6a5ab
hide report in welcomewindow if not enterprise customer
2019-11-13 14:32:34 +01:00
Daniel Rodriguez
f844c660af
Merge branch 'ent-4766-feedback-de-ayudas' into 'develop'
...
add feedback
See merge request artica/pandorafms!2813
2019-11-13 13:43:08 +01:00
fbsanchez
b11dbc639f
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
...
Conflicts:
pandora_console/general/header.php
2019-11-13 12:20:29 +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
Daniel Barbero Martin
fa6bc254a1
Fixed errors
2019-11-12 16:22:58 +01:00
fbsanchez
b9633933e1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
2019-11-12 14:17:45 +01:00
fbsanchez
53954ec853
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 14:26:23 +01:00
fbsanchez
0c5af7ea24
minor fixes
2019-11-11 13:46:42 +01:00
fbsanchez
0b610cd8ba
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 13:39:08 +01:00
fbsanchez
430af38fa6
minor fixes in flow control
2019-11-11 13:38:27 +01:00
fbsanchez
cf0a06f216
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
2019-11-07 19:41:36 +01:00
fbsanchez
36ae77a33c
minor fix
2019-11-07 19:41:23 +01:00
fbsanchez
a8bdb68cac
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
2019-11-07 19:40:23 +01:00
fbsanchez
4905b18888
Fulfill help path and mail check
2019-11-07 19:39:50 +01:00
fbsanchez
c4779f6f91
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
2019-11-07 18:33:51 +01:00
fbsanchez
cb131c7895
Some CDE and styling in help feedback
2019-11-07 18:33:03 +01:00
fbsanchez
763ec6772c
Help feedback style improved
2019-11-07 17:26:32 +01:00
fbsanchez
ef14de075e
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-07 14:06:07 +01:00
fbsanchez
5fe515a3ed
Fixed welcome flow
2019-11-07 14:05:42 +01:00
fbsanchez
7c68595241
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-07 10:43:24 +01:00
fbsanchez
d080f1d6a7
Welcome pack
2019-11-07 10:42:46 +01:00
fbsanchez
ed6dd2983f
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
...
Conflicts:
pandora_console/include/javascript/pandora.js
2019-11-05 15:21:21 +01:00
fbsanchez
58cbc3c738
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
2019-11-05 15:17:09 +01:00
Daniel Barbero Martin
ebb7cbfe6c
Fix styles css
2019-11-05 15:12:24 +01:00
fbsanchez
b1d4bfe149
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
...
Conflicts:
pandora_console/pandoradb_data.sql
2019-11-05 11:16:26 +01:00
Jose Gonzalez
f584ac7835
Solved issue with query
2019-11-04 17:45:56 +01:00
fbsanchez
3eb0a6bb95
minor fixes after internal meeting
2019-10-30 18:33:33 +01:00
fbsanchez
72b1fb2b16
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
...
Conflicts:
pandora_console/include/javascript/pandora.js
modified: pandora_console/general/register.php
modified: pandora_console/godmode/agentes/configurar_agente.php
modified: pandora_console/godmode/agentes/module_manager_editor.php
new file: pandora_console/include/ajax/welcome_window.php
new file: pandora_console/include/class/WelcomeWindow.class.php
modified: pandora_console/include/constants.php
modified: pandora_console/include/functions_config.php
modified: pandora_console/include/javascript/pandora.js
new file: pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
fbsanchez
c07baa614f
Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF
2019-10-29 17:00:57 +01:00
fbsanchez
383967f68a
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
2019-10-29 16:56:01 +01:00
fbsanchez
0a53c0b915
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
2019-10-29 16:50:46 +01:00
marcos
8174b4f2eb
add help option in welcome window
2019-10-29 10:38:22 +01:00
Daniel Barbero Martin
f6fd5cc21f
Add image feedback
2019-10-29 09:13:48 +01:00
marcos
57bfc364ae
add modal confirmation window
2019-10-28 18:57:10 +01:00
fbsanchez
ccf971c2eb
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
2019-10-28 12:18:19 +01:00
Daniel Barbero
c4aea1ac59
add styles validation form of modal
2019-10-25 13:28:01 +02:00
Daniel Barbero
22a2b7cd0b
Add feedback phpInfo
2019-10-25 10:43:03 +02:00
Daniel Barbero Martin
3dee6888d6
fix
2019-10-24 17:42:37 +02:00
marcos
e725a0185b
cambios semi finales
2019-10-24 16:56:13 +02:00
Daniel Barbero Martin
f06a55c6bb
continue feedback mail
2019-10-23 19:50:57 +02:00
marcos
b35c9dd96d
ajust changes
2019-10-22 16:42:13 +02:00
marcos
f14c4966e3
changes
2019-10-22 13:10:15 +02:00
marcos
ca49cefb0d
fixed
2019-10-22 12:19:25 +02:00
marcos
ee97ed8a5e
segunda ronda
2019-10-21 18:36:02 +02:00
Daniel Barbero
e37af1598a
continue feedback diagnostics
2019-10-21 18:11:04 +02:00
fbsanchez
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
Daniel Barbero
b8d03e98c3
pdf diagnostic
2019-10-18 15:23:23 +02:00
marcos
353246f9f6
first changed to welcome window
2019-10-18 10:30:19 +02:00
Daniel Barbero Martin
4e56f6751a
Continue work diagnostics
2019-10-17 15:17:28 +02:00
Marcos Alconada
e7a948bb71
Update HelpFeedBack.class.php
2019-10-16 11:03:21 +02:00
Marcos Alconada
1a77e3e381
Update HelpFeedBack.class.php
2019-10-15 18:11:50 +02:00
Marcos Alconada
d04544fa66
Update HelpFeedBack.class.php
2019-10-15 16:34:01 +02:00
Marcos Alconada
03ada6fb1f
Update HelpFeedBack.class.php
2019-10-15 16:28:12 +02:00
Marcos Alconada
f8636e77cc
Update HelpFeedBack.class.php
2019-10-15 12:45:40 +02:00
marcos
a31e66a9bd
add feedback
2019-10-15 12:16:50 +02:00
Daniel Barbero Martin
13a72426cd
fixed diagnostics
2019-10-14 17:21:38 +02:00
Daniel Barbero
66bad65550
refactoriced diagnostics pandoraFMS
2019-10-11 14:55:20 +02:00
Tatiana Llorente
dd2ace99e1
Check permissions to reset a network map - #4728
2019-10-11 13:51:52 +02:00
Daniel Barbero
8af72c1c9d
add Remote CMD
2019-10-09 17:26:06 +02:00
fbsanchez
d09c071684
discovery ACL
2019-10-09 15:45:02 +02:00
Daniel Rodriguez
bd7ee945f7
Merge branch 'ent-4454-No-aparece-el-icono-con-color-de-warning-en-el-Service-Tree-View' into 'develop'
...
Fixed bad image for warning status - #4454
See merge request artica/pandorafms!2629
2019-10-07 19:21:53 +02:00
Daniel Rodriguez
dc01b3e22e
Merge branch 'ent-4679-notificacion-supervisor-server-no-actualizado' into 'develop'
...
Added notify when Console and Server have version mismatch
See merge request artica/pandorafms!2770
2019-10-07 15:59:16 +02:00
Daniel Rodriguez
b2157f4b32
Merge branch 'ent-4051-tree-view-module-groups-duplica-modulos' into 'develop'
...
add condition in query
See merge request artica/pandorafms!2710
2019-10-03 16:41:15 +02:00
fbsanchez
79dca2fe6b
Php OO form load
2019-10-02 18:37:50 +02:00
Jose Gonzalez
5294e2f627
Now the supervisor control all servers and not only one
2019-09-30 15:40:40 +02:00
Jose Gonzalez
d878958502
Added notify when Console and Server have version mismatch
2019-09-30 12:48:46 +02:00
fbsanchez
746f817fe4
Windows: Revisión general Pandora - Discovery
2019-09-24 19:07:55 +02:00
fbsanchez
7d52614064
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora
2019-09-24 11:25:53 +02:00
Jose Gonzalez
d7ca703c99
Cleaned the javascript call
2019-09-20 10:53:09 +02:00
marcos.alconada
83e5c14b1d
add condition in query
2019-09-09 12:54:16 +02:00
Jose Gonzalez
bb25679344
Added ui_get_full_url in all links
2019-09-04 14:12:38 +02:00
Jose Gonzalez
3d03faed9a
Solved some issues
2019-08-06 14:56:57 +02:00
Tatiana Llorente
4e927e1ee5
Fixed bad image for warning status - #4454
2019-08-01 10:36:15 +02:00
Jose Gonzalez
dd77429aea
Solved issue with status names
2019-07-29 17:22:16 +02:00
Luis Calvo
94250cb870
Fixed minor bug
2019-07-15 17:46:59 +02:00
Luis Calvo
a0ad1f2681
Merge remote-tracking branch 'origin/develop' into ent-4035-add-serialize-precision-value-notification
2019-07-15 15:04:13 +02:00
Daniel Barbero Martin
bd070b706b
fixed minor error
2019-07-11 12:45:52 +02:00
fbsanchez
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
marcos.alconada
340e253901
Add global config to method getFirstLevel() to remove warning check_acl error
2019-06-17 13:38:05 +02:00
fbsanchez
ecc2fef8f6
event validation/in process
2019-06-13 12:30:09 +02:00
fbsanchez
48e6fef0b7
Event filters
2019-06-11 12:58:18 +02:00
fbsanchez
c741020538
styles review
2019-06-04 13:57:55 +02:00
fbsanchez
9a12b34847
Updates styling
2019-05-28 12:13:29 +02:00
Daniel Rodriguez
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
Alejandro Fraguas
ce359bfaf6
Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop'
...
Ent 3937 eliminar echos y prints de las subclases de wizard
See merge request artica/pandorafms!2430
2019-05-21 12:11:53 +02:00
fbsanchez
5e9b2479eb
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
2019-05-20 13:11:39 +02:00
Luis Calvo
105695f1bd
Added notification for serialize_precicion value
2019-05-17 18:29:38 +02:00
alejandro-campos
54d3eefa43
lint changes
2019-05-17 14:27:59 +02:00
alejandro-campos
e746a49158
lint changes
2019-05-17 14:26:44 +02:00
Luis Calvo
1bfd91725e
Changed <img> to hmtl_print_image
...
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
2019-05-16 17:13:14 +02:00
fbsanchez
e7dbb55392
Minor fixes
...
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +02:00
alejandro-campos
13b32003b3
save changes ticket 3937
...
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
fbsanchez
d871b599ef
General fixes and UM comm updates
...
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
fbsanchez
8004e096fd
MR 28 and minor fixes
...
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
2019-05-14 18:09:34 +02:00
fbsanchez
53e9113b7e
UM notifications MR update
...
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
2019-05-14 17:15:28 +02:00
Tatiana Llorente
f5114918b5
Unify the styles of Discovery with Pandora - #4004
2019-05-09 08:45:55 +02:00
Daniel Maya
c31948b7c2
Fixed netflow node name
...
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
2019-04-30 17:30:57 +02:00
Daniel Maya
4b73518804
Fixed node name in netflow map
...
Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8
2019-04-26 09:54:38 +02:00
Alejandro Fraguas
194f4400f7
Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
...
Ent 3647 revision estilos discovery con la nueva linea de estilos
See merge request artica/pandorafms!2370
Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
alejandro-campos
01d1fb1c11
fixed visual bug
...
Former-commit-id: f2714283dd1f81c87505cdde349c33c6dd9bdc0b
2019-04-22 18:17:39 +02:00
alejandro-campos
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
fbsanchez
8978b49a8b
minor fix while setting node_radius by default
...
Former-commit-id: 37b603adc1eb025c84b4e6d298815894be8adcf6
2019-04-22 09:33:51 +02:00
fbsanchez
cbdd8e7104
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
2019-04-22 09:01:24 +02:00
Daniel Barbero Martin
d5b1ac5565
fixed map IPAM
...
Former-commit-id: a1334a1691a3e861f2510ac7d440f5730928ad9a
2019-04-08 18:28:27 +02:00
Daniel Barbero
4808e4ae97
fixed errors map ipam
...
Former-commit-id: 9a1e5460ab40d22135edc75f2adf186f8d56f3d4
2019-04-05 16:43:36 +02:00
Tatiana Llorente
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
fbsanchez
11b2fbc245
WIP db
...
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
2019-04-02 16:25:29 +02:00
fbsanchez
b0a6ea7415
WIP atomic JS map. Minor fix to keep working
...
Former-commit-id: fee809008311942f1d9ad14aea70ba78e3d6eb3a
2019-03-29 20:52:51 +01:00
fbsanchez
4854d4b2df
WIP atomic JS map
...
Former-commit-id: 95736d11295948e5dc20aefcf1293b7882729588
2019-03-29 20:31:55 +01:00
fbsanchez
086ee0620e
minor fix
...
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
2019-03-27 18:31:02 +01:00
fermin831
7b901be5fa
Changed default font size name on NetworkMap class
...
Former-commit-id: b1437a7e03eba758d83386166db0063a5fcaf12f
2019-03-27 12:42:54 +01:00
fermin831
b2f046e4d6
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
fermin831
9ee095406b
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
2019-03-27 11:59:25 +01:00
fbsanchez
3c853ff508
widget networkmap simple working
...
Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee
2019-03-27 11:47:09 +01:00
fbsanchez
3038de3a9d
minor fixes
...
Former-commit-id: 73dbbaa42f3b6120400da688dee7a0499bf31796
2019-03-27 11:06:57 +01:00
Daniel Barbero Martin
5504741a9d
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: d734637dea22b18b1d30a3d8575cd45500558e29
2019-03-26 18:48:49 +01:00
fbsanchez
08a240746c
breadcrum improvement discovery
...
Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad
2019-03-26 17:28:31 +01:00
fbsanchez
3316d19bd3
minor fix
...
Former-commit-id: ff5da555c29cdde5d632e090f2b9ac779ead262f
2019-03-26 17:00:20 +01:00
fbsanchez
2d1463ee0c
minor fixes networkmaps
...
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
2019-03-26 16:46:32 +01:00
alejandro-campos
a0f4eb1910
change discovery page title
...
Former-commit-id: 81bf2dc3d489acc1871f6c4cd385fc0f1c1b43aa
2019-03-26 16:10:03 +01:00
alejandro-campos
ec999341ba
change discovery headers and add breadcrumbs to them
...
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
fermin831
f880d9202a
Adde no popup configuration token to avoid to show tooltips
...
Former-commit-id: d5b6260a065b40dfbc498db077a610c35a9e0fb3
2019-03-26 15:27:45 +01:00
Ramon Novoa
c25143c27e
Add a notification for 'limited mode'.
...
Former-commit-id: dce72c7a9ea452029e5650a2012ff35cc6eca9b8
2019-03-26 11:53:03 +01:00
fbsanchez
dad791b887
relationship management JS
...
Former-commit-id: 82216265dece0e5d9f77a82b1b22d6ff00265ee1
2019-03-25 15:52:15 +01:00
fbsanchez
e1a4250d01
NetworkClass RC1
...
Former-commit-id: bd30ce824e0f50e9684e32268bea396a84ff6744
2019-03-25 11:09:22 +01:00
fbsanchez
b5401a500c
minor fixes
...
Former-commit-id: 30e4d5dffa78834088d8644168d4d64b13cf8b08
2019-03-25 11:02:16 +01:00
fbsanchez
eac0d66056
refresh holding area in networkmap
...
Former-commit-id: 17492041e3c14d15a6cf96b522ab368e9a2b7974
2019-03-22 19:16:45 +01:00
fbsanchez
face622e9e
reset-map fixed
...
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
2019-03-22 18:27:12 +01:00
fbsanchez
091e2db13a
minor fix
...
Former-commit-id: 55b56db7a7ca1eee5d48731269d2894425037e3b
2019-03-22 16:00:01 +01:00
fbsanchez
732fdafc14
custom text in links
...
Former-commit-id: 31b851b5c296e8beb135a60f6b67ee8a073a28ea
2019-03-22 15:08:44 +01:00
fbsanchez
e31607a4e0
custom link colors
...
Former-commit-id: 9aa8f8114494d8b8fd8f010fa5066142fd104f70
2019-03-22 15:06:01 +01:00
fbsanchez
9ef66a11c4
custom link colors
...
Former-commit-id: 44a7df6e814679cfff1a0489374c25edcc9ab52c
2019-03-22 15:00:02 +01:00
fbsanchez
4910da5e31
minor fix map_filter builder
...
Former-commit-id: 0ef6bcaa84163f21fe0d6bcd869a7b8646581893
2019-03-22 14:57:29 +01:00
fbsanchez
a4c048dd29
minor fix
...
Former-commit-id: 1ccd9e446645362fb9b305a699527c5aa2c20369
2019-03-22 14:43:55 +01:00
fbsanchez
bc1195e78e
minor fix
...
Former-commit-id: b100cf9398a52a443f934632794da991ea4f2342
2019-03-22 14:30:50 +01:00
fbsanchez
3d71d17440
minor fix
...
Former-commit-id: 3d00cc3810df66e79ac69a71ee48df1c9c6b326e
2019-03-22 14:27:53 +01:00
fbsanchez
64c4514ace
minor fix orphans while no pandora node
...
Former-commit-id: 067f83b5cd8fc87922c61622873b60753edebf2d
2019-03-22 13:16:26 +01:00
fbsanchez
80ecb58f8f
minor fix orphans while no pandora node
...
Former-commit-id: a9f053624ba5c38a08c3589689d4a56cfcfcff37
2019-03-22 13:04:53 +01:00
fbsanchez
0d301cd8ed
minor fix orphans while no pandora node
...
Former-commit-id: 5c21ffec17ba10d77921961c6c813b116449d3a0
2019-03-22 13:02:57 +01:00