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

205 Commits

Author SHA1 Message Date
Daniel Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Barbero Martin a77699b251 fixed update legend hover chart pandora_enterprise#8895 2022-05-12 09:10:39 +02:00
vgilc 4b85e93490 Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop' 
Ent 8222 nueva grafica desde la vista de modulos histograma

See merge request artica/pandorafms!4637
 2022-01-25 10:28:18 +00:00
Daniel Barbero Martin 6be6b1a95d add new macros #3763 2022-01-19 12:18:23 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Daniel Barbero Martin f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez b609bbfdd9 Merge branch 'ent-7240-error-acl-graficas-tree-view' into 'develop' 
Fixed metaconsole ACL on module graphs view

See merge request artica/pandorafms!3987
 2021-05-10 08:15:50 +00:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
Calvo d0bddbe27c Fixed metaconsole ACL on module graphs view 2021-03-31 10:30:18 +02:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
daniel fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Daniel Barbero Martin aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
Daniel Barbero Martin 9b81da193b fix charts 2020-10-28 12:50:15 +01:00
daniel 48831b5032 add new options char 2020-10-05 12:04:46 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
Jose Gonzalez 7f45a2133d Added lost connection data in stat_win file 2020-09-21 17:40:54 +02:00
marcos 333f3ba9f0 show full graph 2020-04-06 18:18:39 +02:00
Daniel Rodriguez 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop' 
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
 2020-01-20 09:54:20 +01:00
marcos 1640c03fc3 first changes pandora.js to pandora_ui.js 2019-11-21 16:42:39 +01:00
Jose Gonzalez d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +02:00
Jose Gonzalez 3c609b4d6d Changed the mode of obtain the title 2019-09-19 13:17:29 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
Tatiana Llorente 80ed5dc9c1 Removed empty helps - #4183 2019-06-11 09:33:43 +02:00
fbsanchez b4dcf4a6f1 style review 2019-06-03 11:55:56 +02:00
Tatiana Llorente d68bb176cf Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento' 
Conflicts:
   pandora_console/include/styles/pandora.css
 2019-05-28 15:56:16 +02:00
Tatiana Llorente 2fd37b531e Visual changes in module graph - #4104 2019-05-27 17:37:57 +02:00
Tatiana Llorente 1eb1120c6e Rename class events_show_more_table to table_modal_alternate - #4102 2019-05-27 16:18:10 +02:00
Tatiana Llorente cb49de4d81 New menu module graph - #3617 2019-05-08 10:28:00 +02:00
Tatiana Llorente 5e0b53e3c2 New menu module graph - #3617 2019-05-08 09:35:28 +02:00
Tatiana Llorente 283be8f632 New menu module graph - #3617 2019-05-07 16:07:07 +02: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 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +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
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
manuel.montes 712103c308 Fixed bug in csv export graph 2018-09-27 17:35:52 +02:00
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
fermin831 04cfbe4ef9 Fixed acl in module graph view 2018-08-01 13:16:21 +02:00