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

790 Commits

Author SHA1 Message Date
fbsanchez f4290e52fe Minor fix notif. ball margins 
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
 2019-03-13 15:55:24 +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
Tatiana Llorente aaf5d7bf89 New view user edit 
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
 2019-03-12 12:24:33 +01:00
Tatiana Llorente 29f00dd1da New login page 
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
 2019-03-12 11:09:12 +01:00
Tatiana Llorente c5722d2e10 New view user edit 
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
 2019-03-12 10:59:44 +01:00
Tatiana Llorente 9a702a90a1 New view user edit 
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
 2019-03-12 08:56:45 +01:00
fermin831 a321a7465d Merge branch 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/include/functions_netflow.php
	pandora_console/operation/network/network_report.php

Former-commit-id: 4aa57202e051f4d9e8df95b000c54ac162021668
 2019-03-11 13:19:17 +01:00
Tatiana Llorente 71afb7a741 New login page 
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
 2019-03-11 10:07:22 +01:00
Fermin dd8265f65e Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
 2019-03-08 09:02:22 +01:00
fermin831 471770ec85 Reduced icon size on netflow explorer 
Former-commit-id: 6d16a2583dcdbf62386b29662a914a538bae9275
 2019-03-07 19:16:24 +01:00
fbsanchez 3e39e727b6 WIP: Unified class NetworkMapClass 
Former-commit-id: 6e6f4afb70be008602f51dfbd383bb855613e084
 2019-03-07 18:57:48 +01:00
fermin831 1f89cccbbe Change item link filter by image filter in network/flow explorer 
Former-commit-id: 521cca18646273361711e75ad85f64a9b9988046
 2019-03-07 15:10:38 +01:00
daniel 00283a5c6a progress task list 
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
 2019-03-07 14:45:26 +01:00
fbsanchez aef10cf649 Fixed grown in notifications 
Former-commit-id: c563f2388d27d4fffbcfaf34fbd1c4d83ad4ef84
 2019-03-06 19:39:07 +01:00
fbsanchez 40bc938000 notifications font color and some minor changes 
Former-commit-id: d56c7ed04a10ef693867df7709002169f865bbc3
 2019-03-06 16:38:06 +01:00
fbsanchez 825128e31e WIP: minor updates in notification wrapper 
Former-commit-id: 1dd6fcf1ca43cc9d3b0c633c7bd6487240c2b5bf
 2019-03-05 19:10:44 +01:00
fbsanchez 63ee3b0329 wip: style checks 
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
 2019-03-05 19:02:23 +01:00
fbsanchez 70e4e86cdf Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2 
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
 2019-03-05 18:58:26 +01:00
Daniel Maya e26c81aa6c Fixed images and reset map in networkmap 
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
 2019-03-05 15:33:27 +01:00
Tatiana Llorente 7be5d3e9e0 new header and menu 
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
 2019-03-05 12:54:11 +01:00
Fermin a01319464e Added link with params html component and modify the network report 
Former-commit-id: d95cfe164d67e70d5135feb68169bb825ee2d83a
 2019-03-05 10:08:07 +01:00
Tatiana Llorente 36fa0fc41f new header and menu 
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
 2019-03-04 08:39:56 +01:00
Tatiana Llorente 34eedc5330 new header and menu 
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
 2019-02-26 11:20:17 +01:00
Tatiana Llorente 3e87c8e931 new header and menu 
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
 2019-02-26 10:43:59 +01:00
Tatiana Llorente 6ec148c59c new header and menu 
Former-commit-id: 4375597f0b77ccc577fa486c409e214a7ba00362
 2019-02-25 12:28:41 +01:00
Tatiana Llorente 4c92375a58 new header and menu 
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
 2019-02-25 12:23:15 +01:00
Tatiana Llorente 526311d1c6 new header and menu 
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
 2019-02-25 11:54:46 +01:00
fbsanchez 8b5f50f883 Discovery minor fixes 
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
 2019-02-22 19:18:07 +01:00
fbsanchez b1aa0fe2f2 Merge from develop 
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
 2019-02-22 12:30:27 +01:00
fbsanchez 4148387c50 Updates discovery 
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
 2019-02-21 13:05:48 +01:00
manuel ad3e2b88bf Minor fixes Wiz.Discovery 
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
 2019-02-21 11:19:38 +01:00
fbsanchez 08c6d782a4 Add menuentry discovery 
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
 2019-02-20 18:24:32 +01:00
fbsanchez 4834561e87 Wiz. minor fixes 
Former-commit-id: b3963bf5994a8f9829922e0a1b0be3a20fc54fba
 2019-02-20 14:38:00 +01:00
fbsanchez a63e497497 Wiz. Added textarea input 
Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23
 2019-02-20 11:11:26 +01:00
manuel ea70c0846c Added href in wizard 
Former-commit-id: 9b6b9e66d14257163f14bc904d5b13c6de9f9912
 2019-02-19 16:34:11 +01:00
fbsanchez 85371424ee Minor fixes and status check 
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
 2019-02-19 11:13:07 +01:00
manuel 938408ada9 Added wizard 
Former-commit-id: d47389f000b9295c21d9a56ed0138913d0045b76
 2019-02-19 08:58:30 +01:00
fbsanchez c49c8bc0b5 discovery minor style changes 
Former-commit-id: ea572c9d797214cbfc6f1b9ff2025f0c4819b4ed
 2019-02-15 18:44:59 +01:00
fbsanchez 5093094d7d H&D tasklist and some visual changes 
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
 2019-02-15 18:05:59 +01:00
manuel 32d34cd09b Changed styles in host and devices 
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
 2019-02-15 14:02:32 +01:00
fbsanchez f777c59a83 WIP: H&D skel files css wiz&discov 
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
 2019-02-15 10:00:23 +01:00
fbsanchez 7df9d4f78b WIP: H&D merge 
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
 2019-02-14 17:14:01 +01:00
fbsanchez 8acb658266 WIP: H&D 
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
 2019-02-14 13:27:49 +01:00
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
fbsanchez 5b4cadf138 minor style fix 
Former-commit-id: ca2dcf89672832b7796c9b9cc555d36d9db503ec
 2019-02-13 17:16:12 +01:00
fbsanchez f75a292b34 minor fixes/updates in notifications UI 
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
 2019-02-13 16:40:37 +01:00
fermin831 855822f61e Fixed arrow on notifications area 
Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931
 2019-02-13 12:44:30 +01:00
fermin831 fe50d6caff Open toasts and messages into new window 
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
 2019-02-13 11:09:15 +01:00
fermin831 48724fe033 Added onclick to notification-item's 
Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9
 2019-02-12 16:46:21 +01:00
fermin831 cc2b2709f9 Show the notifications with AJAX 
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
 2019-02-12 16:25:59 +01:00
fbsanchez 166c3bbe88 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora 
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
 2019-02-12 12:41:11 +01:00
fbsanchez 42dc0c60be supervisor 
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
 2019-02-12 11:41:21 +01:00
fbsanchez 851050f04e message_edit.css added 
Former-commit-id: f4e88b813dc1b39e50b0f997ace3768a10f406f1
 2019-02-11 19:48:20 +01:00
fermin831 c355a581ff Added toasts to notifications 
Former-commit-id: 7429bf8d9c4f4e8bb16549172a59c33d22185821
 2019-02-11 17:53:37 +01:00
daniel 4aae62ba36 Fixed error in reports 
Former-commit-id: d3ad6cd8e1dd052fedc3dfe65bd5938537033f34
 2019-02-11 17:05:05 +01:00
Fermin d5d58e5b2b Added outter shadow to notifications messages box 
Former-commit-id: 1eed4b4f2ef7d58dbab73ccb2628bb0ef9ffc7ca
 2019-02-08 18:53:28 +01:00
Fermin 0124bd0a17 Added real notifications (not AJAX jet) 
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
 2019-02-08 14:23: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
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
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
fermin831 37d02ddf59 Added disabled status to switches 
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
 2019-02-06 18:18:48 +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
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
fermin831 7df3fe2dac Added functionallity to Add element on notification global config 
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
 2019-02-05 17:40:44 +01:00
fermin831 8811257762 Popup to add groups and sources to global notification configuration 
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
 2019-02-05 13:36:16 +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
fermin831 50030b6933 Added notify all users and disable on first load 
Former-commit-id: d193a8375ce00f3f2cf2c1fc181d4eef47c92eb2
 2019-02-01 14:48:52 +01:00
fermin831 315a51c5e7 Added only read selector global notification setup 
Former-commit-id: bd6262cda30c0bb5a63b106e6c3832efbcfc63b9
 2019-02-01 13:46:58 +01:00
fermin831 01bc0775bc Added notification global configuration (only enable and disable) 
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
 2019-01-31 19:13:51 +01:00
fermin831 b589826c86 Added HTML switch element 
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
 2019-01-31 19:11:59 +01:00
fermin831 397f2964da Added messages notification ball 
Former-commit-id: c44a99cf63bc7451890389e4d234fd8aa7b62cbc
 2019-01-31 15:16:56 +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