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
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
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
7a9684f23c
Changed the format of the .css files
...
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
9d557ced84
Merge branch '2855-Buscador-en-la-vista-de-modulo-de-grupos' into 'develop'
...
implemented search filters for module group and agent group in module groups view
See merge request artica/pandorafms!1956
Former-commit-id: 622169f4682d7197e6551e96568f6ff17f313f08
2018-12-21 10:32:45 +01:00
b9fd907933
Merge branch '2992-Realtime-Graph-decimales' into 'develop'
...
Implemented limitation decimals in y-axis realtime graphs
See merge request artica/pandorafms!1941
Former-commit-id: 0ca73da98323fa3880cccd96d12150228ce2dead
2018-12-21 10:25:57 +01:00
5c0f85a4bb
fix bug when searching non existing agent group in module groups view
2018-12-20 15:37:00 +01:00
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
420adb4630
implemented search filters for module group and agent group in module groups view
2018-11-12 13:02:37 +01:00
a3f4bfaa3d
Implemented limitation decimals in y-axis realtime graphs
2018-11-07 13:57:47 +01:00
0978be9b51
fixed errors php7
2018-10-30 14:43:27 +01:00
08a8165b93
Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop'
...
Added number of times an alert is fired - #2827
See merge request artica/pandorafms!1823
2018-10-29 09:15:32 +01:00
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
3ed5b97e1d
Merge branch '2455--6064-Error-Insert-data-nombre-de-XML-mal-construido' into 'develop'
...
Fixed bug in the construction of the name of the xml file
See merge request artica/pandorafms!1737
2018-10-25 13:20:05 +02:00
e7663fc5f0
Fixed booleans realtime graphs
2018-10-17 19:20:22 +02:00
16be9488c8
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/include/functions_graph.php
2018-10-11 13:06:17 +02:00
2693bbe209
Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
...
Conflicts:
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
a59ecc7ef3
fixed minor error counters alert fired in module_group view
2018-10-05 11:55:06 +02:00
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
0ce7d3a2ed
fixed errors php7
2018-10-04 17:17:39 +02:00
7ffeaaf50b
[Tags performance] fermin revision 1
2018-10-03 11:13:52 +02:00
942c5391f9
Fixed agents/modules view. it shows nothing if there are no agents and modules selected
2018-10-03 10:31:45 +02:00
2dd10a4328
Added number of times an alert is fired - #2827
2018-10-02 12:35:20 +02:00
28b879f058
[Tags performance] Added TODOS to revise agents_get_modules
2018-10-02 09:48:29 +02:00
995bfe0fad
Removed unused code
2018-10-01 17:04:00 +02:00
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
453fb3f67b
TODO List
2018-09-27 13:30:32 +02:00
26c08d9309
refactoriced view module_groups
2018-09-20 15:51:36 +02:00
5f732d035b
Now the integer numbers of the Y axis of the realtime graphs are shorter
2018-09-17 13:13:10 +02:00
a721eadcbd
Fixed bug in the construction of the name of the xml file
2018-09-07 08:36:06 +02:00
69545d7ed8
Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop'
...
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios
See merge request artica/pandorafms!1708
2018-08-27 09:10:00 +02:00
399c9c2d58
[Secondary groups] Fixed agent/modules view
2018-08-21 13:33:16 +02:00
28336d3e1a
Update realtime_graphs.js
2018-08-20 09:53:11 +02:00
5934f141a8
Fixed the incremental realtime charts
2018-08-17 13:17:27 +02:00
568484cf6e
Fixed the incremental mode of the realtime charts and overall improvements
2018-08-02 14:59:10 +02:00
7da00bca8a
Fixed bug in realtime_graphs.php
2018-06-18 11:12:38 +02:00
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
fac3e21829
Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone
2018-06-11 16:40:10 +02:00
badfd83b0d
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/graphs/fgraph.php
2018-06-06 11:57:02 +02:00
89a481c452
fixed errors in graphs
2018-06-06 11:18:39 +02:00
f8aa351987
Fixed line graph and box item when exporting visual consoles
2018-06-05 15:14:27 +02:00
89aa85626c
Fixed export and import visual consoles
2018-06-04 15:56:17 +02:00
88e060893a
Merge branch 'develop' into 2106-intracom-rebranding
...
Conflicts resolved:
pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
2f8cdb5ea5
Added check_login to plugin registration
2018-05-28 11:31:09 +02:00
3f1a1a816b
Fixed id_agente lost in insert_data
2018-05-24 17:24:53 +02:00
43447bbee4
[Rebranding] Minor ended fixed
2018-05-23 18:19:24 +02:00
e71fd399fb
Merge branch 'develop' into 2106-intracom-rebranding
...
Conflicts:
pandora_console/godmode/admin_access_logs.php
pandora_console/include/javascript/functions_pandora_networkmap.js
2018-05-22 19:29:46 +02:00
cada865042
Fixed XSS vulnerability
2018-05-18 11:00:41 +02:00
Tatiana Llorente
artica
vgilc
alejandro-campos
daniel
manuel.montes
fermin831
danielmaya
Alejandro Gallardo Escobar
manuel.montes
fbsanchez