tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,431 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

675 Commits

Author SHA1 Message Date
Daniel Barbero 444b5c4bfd Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF 
Conflicts:
	pandora_console/install.php


Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f
 2019-02-14 07:51:53 +01:00
daniel 4aae62ba36 Fixed error in reports 
Former-commit-id: d3ad6cd8e1dd052fedc3dfe65bd5938537033f34
 2019-02-11 17:05:05 +01:00
daniel 16c742bd83 fixed report pdf 
Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5
 2019-02-08 14:10:19 +01:00
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
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 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
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 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
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
daniel 20e0508e01 fixed pdf report 
Former-commit-id: 515b8f06f3584c6aaa1a32ea29a2f555e7afccad
 2019-02-04 12:10:52 +01:00
artica 7a9684f23c Changed the format of the .css files 
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
 2019-01-30 12:42:16 +01:00
daniel 335abb9abc fixed error css 
Former-commit-id: d2be8c4cf4306cb51c9b3854cbe06d4c80119d8b
 2019-01-25 09:54:53 +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 fb46197c1f fixed minor error button 
Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf
 2019-01-23 15:30:46 +01:00
manuel.montes fd2dcb3281 Changed radio buttons by toogle switch checkbox 
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
 2019-01-17 17:28:23 +01:00
vgilc 1b4cd37d5f Merge branch 'ent-2997-color-cloud-vc-items' into 'develop' 
Add the Color Cloud item to the Visual Console

See merge request artica/pandorafms!2075

Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
 2018-12-12 17:43:39 +01:00
tatiana.llorente@artica.es f98b3e2ea5 Fixed error in submit - #3153 
Former-commit-id: a1c21457db7a4d4d6297fd0935b8beada7cde63c
 2018-12-10 15:18:53 +01:00
Alejandro Gallardo Escobar b0998003a3 Added a new icon 
Former-commit-id: b4eb7f9aaf16d9ea3b0bb0339c1a70ee162aa259
 2018-12-10 09:19:26 +01:00
tatiana.llorente@artica.es 2cb494bfe7 Show popup before drop database - #3153 2018-12-04 15:41:36 +01:00
vgilc d2c048b2dc Merge branch '2890-Texto-en-Active-incident-on-this-agent' into 'develop' 
Added css rule for links in the th tables with databox class- #2890

See merge request artica/pandorafms!1844
 2018-11-30 13:11:45 +01:00
daniel a5346a7ae3 fixed error login double 2018-11-21 17:38:11 +01:00
daniel 34ea7cfbcb fixed position select autocomplete agent jqui 2018-11-15 15:19:43 +01:00
tatiana.llorente@artica.es a6b8929a37 Added jquery-ui styles to css - #2784 2018-11-13 16:48:06 +01:00
tatiana.llorente@artica.es 719e502a27 Revert "Added jquery-ui styles to css - #2784" 
This reverts commit fdda5793d2.
 2018-11-13 16:34:27 +01:00
tatiana.llorente@artica.es fdda5793d2 Added jquery-ui styles to css - #2784 2018-11-13 16:27:57 +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
tatiana.llorente@artica.es 233b9c2c70 Well centered message modal window - #2768 2018-11-02 13:07:38 +01:00
vgilc 17286414c7 Merge branch '2619_Group_View' into 'develop' 
Added warning and normal status agents in group view

See merge request artica/pandorafms!1799
 2018-10-29 09:16:33 +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 172ac187a2 estilos popup 2018-10-25 15:58:06 +02:00
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
vgilc 4dd2cd434c Merge branch '2726-Botones-background-en-Visual-consoles' into 'develop' 
Changed colors for buttons - #2726

See merge request artica/pandorafms!1797
 2018-10-25 12:05:56 +02:00
vgilc cf9bf2b4e2 Merge branch '2768-Mensajería-interna' into 'develop' 
Fixed borders of tables with classes databox and data - #2768

See merge request artica/pandorafms!1786
 2018-10-25 11:54:50 +02:00
tatiana.llorente@artica.es 8f2472dcf8 Added css rule for links in the th tables with databox class- #2890 2018-10-09 12:38:59 +02:00
vgilc ca67f52fb4 Merge branch '2670-Nuevo-widget-dashboard-system-group-status' into 'develop' 
2670 nuevo widget dashboard system group status

See merge request artica/pandorafms!1795
 2018-10-02 17:25:19 +02:00
alejandro-campos 62548c7f94 Merge branch 'develop' into 2670-Nuevo-widget-dashboard-system-group-status 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-10-02 17:11:02 +02:00
alejandro-campos e5e81e55d7 edited css class ui-widget-content 2018-10-01 17:58:29 +02:00
vgilc f73b4a55e6 Merge branch '2741-Refactorizar_vista_module_groups' into 'develop' 
refactoriced view module_groups

See merge request artica/pandorafms!1788
 2018-10-01 10:59:09 +02:00
vgilc d933a966eb Merge branch '2478-Logo-meta' into 'develop' 
changed background of meta visual setup logo previews

See merge request artica/pandorafms!1641
 2018-09-28 10:50:13 +02:00
samucarc 638c4f8bc7 Added warning and normal status agents in group view 2018-09-21 15:10:30 +02:00
tatiana.llorente@artica.es 028cca0d66 Changed colors for buttons - #2726 2018-09-21 12:59:15 +02:00
daniel 26c08d9309 refactoriced view module_groups 2018-09-20 15:51:36 +02:00
tatiana.llorente@artica.es e49c0e3ae7 Fixed a minor mistake in thead - #2768 2018-09-20 12:18:31 +02:00
tatiana.llorente@artica.es bc38468e6c Fixed borders of tables with classes databox and data - #2768 2018-09-20 11:50:47 +02:00
alejandro-campos 6d28b386d1 changed styles for system group status widget 2018-09-17 18:56:38 +02:00
alejandro-campos 89a4e3667f Added styles for new widget system group status 2018-09-13 19:08:45 +02:00