967 Commits

Author SHA1 Message Date
fbsanchez
70469c4909 Event list agent view 2019-05-28 18:03:01 +02:00
fbsanchez
99e485e96e toggle updated 2019-05-28 16:24:28 +02:00
fbsanchez
445db7c43b module list agent view 2019-05-28 16:20:24 +02:00
fbsanchez
348f0c2a65 agent view styling 2019-05-28 13:27:17 +02:00
fbsanchez
9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
fbsanchez
92ca217800 minor fixes in style view tasklist 2019-05-28 10:57:36 +02:00
fbsanchez
2cd19aa0cb updates styles 2019-05-28 10:47:31 +02:00
fbsanchez
bdd7cc1317 Flex agent view 2019-05-28 09:48:09 +02:00
fbsanchez
f57915285f review styles agent view 2019-05-27 22:36:55 +02:00
fbsanchez
f1499082fa agent view rebuilt 2019-05-27 21:30:46 +02:00
fbsanchez
954dd0b43a UI_toggle updated 2019-05-27 19:08:41 +02:00
fbsanchez
5be124f315 Styles review 2019-05-27 19:00:48 +02:00
fbsanchez
f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
Luis Calvo
fdd61e4f27 Fixed agent searh box 2019-05-17 16:36:21 +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
manuel
143def5d87 Added helps 2019-05-09 13:43:53 +02:00
manuel
f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
Tatiana Llorente
9f3c586b55 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
2019-05-03 13:11:26 +02:00
Tatiana Llorente
ab6658a450 Fixed pagination in modal windows - #3707
Former-commit-id: 090149ce7add4d30c8747e570a819c1b8025a0a6
2019-04-24 16:26:50 +02:00
Tatiana Llorente
313ff93c8c Fixed pagination in modal window to create dashboard - #3707
Former-commit-id: 6fbfff55e76cb88db890864ec36d6bc766f6e2c6
2019-04-24 15:38:46 +02:00
Daniel Barbero Martin
ac41e9255f helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
Tatiana Llorente
274c78f647 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: 8beb92aea96f37340434f4a2e5e8012058d52b0a
2019-04-17 10:49:02 +02:00
Tatiana Llorente
ed3155c053 New View Create/Update Agent - #3611
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
Tatiana Llorente
cfff9c065d New View Create/Update Agent - #3611
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
Tatiana Llorente
3da2f267a2 New design for the tables - #3707
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
2019-04-05 13:51:35 +02:00
Tatiana Llorente
aa640efc44 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
2019-04-05 13:19:42 +02:00
Tatiana Llorente
d91631e0e1 New design for the tables - #3707
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
Daniel Maya
faecabb1cc Fixed problem with openlayer
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
2019-04-03 12:54:36 +02:00
Tatiana Llorente
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
Tatiana Llorente
34598f391b Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
Tatiana Llorente
845cb85c55 New design for tables - #3707
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +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
alejandro-campos
ec999341ba change discovery headers and add breadcrumbs to them
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
Tatiana Llorente
a99c8b1a7b New view user edit
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +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
b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +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
daniel
b963395d01 fixed errors
Former-commit-id: 813a875e0f3d0dc3c1097ced987a5a45e8051046
2019-01-11 08:45:12 +01:00
vgilc
33f014695d Merge branch '3057-Agregar-token-barras-desplazamiento-en-vista-datos-de-modulo' into 'develop'
Fixed overflow in module data view

See merge request artica/pandorafms!1967

Former-commit-id: bfcf0c9c08953e1fa49e8731db808bc78ecc826b
2018-12-21 10:23:29 +01:00
fbsanchez
1b7f3b7251 Merge remote-tracking branch 'origin/develop' into fix/reverse-proxy
Former-commit-id: e621a700020a9da04f1a9ae50a1961638fd5ece3
2018-12-05 08:45:18 +01:00
vgilc
01cf7d8081 Merge branch '2888-Error-links-en-Show-link-to-public-dashboard' into 'develop'
Changed url for widgets in public dashboard - #2888

See merge request artica/pandorafms!1859
2018-11-30 13:12:30 +01:00
fbsanchez
08ea1b2283 minor fix ui_get_full_url 2018-11-19 14:15:34 +01:00
fbsanchez
b90da54c86 fixed public_url mandatory in MC environments 2018-11-19 13:16:53 +01:00
fbsanchez
60f9483e79 mandatory public_url if is set 2018-11-19 11:54:35 +01:00
daniel
2eb47c1251 fixed errors in custom fields view 2018-11-16 15:00:09 +01:00
manuel.montes
dd7e623782 Fixed overflow in module data view 2018-11-13 17:04:14 +01:00
daniel
1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
daniel
3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01:00
fbsanchez
39b6164526 snapshot viewer fix 2018-10-30 18:20:10 +01:00
vgilc
b1bf1d7b4b Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
2326 unificar vistas ux y wux en un mismo portal

See merge request artica/pandorafms!1917
2018-10-30 16:20:26 +01:00