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

445 Commits

Author SHA1 Message Date
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
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
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
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
fbsanchez a58bde2118 fixed UX historical snapshot viewer 2018-10-30 16:12:48 +01:00
Ramon Novoa 6353af0482 Merge remote-tracking branch 'github/develop' into develop 2018-10-29 13:20:48 +01:00
vgilc 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
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
vgilc 9b4eeb5c84 Merge branch '2723-Fallo-hint-en-eventos' into 'develop' 
new function that adds a border to the image if the status is warning - #2723

See merge request artica/pandorafms!1743
 2018-10-25 12:07:58 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
tatiana.llorente@artica.es 6adcba4b39 Changed url for widgets in public dashboard - #2888 2018-10-15 16:12:16 +02:00
Ramón Novoa 3e584747b3
Merge pull request #104 from sofwerx/https-proxy 
Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()
 2018-10-11 09:34:26 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
vgilc 5668857914 Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop' 
2479 errores en vista de alertas de meta

See merge request artica/pandorafms!1821
 2018-10-02 15:37:08 +02:00
tatiana.llorente@artica.es 2dd10a4328 Added number of times an alert is fired - #2827 2018-10-02 12:35:20 +02:00
alejandro-campos 1c2743797e Revert "fixed conflict" 
This reverts commit 1d726d59f3.
 2018-10-01 18:16:55 +02:00
alejandro-campos 1d726d59f3 fixed conflict 2018-10-01 15:34:36 +02:00
alejandro-campos 6b14754137 fixed conflict 2018-10-01 15:30:43 +02:00
vgilc 706a3ca4c0 Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop' 
fixed bug in meta alert view: action field (other than default) not showing

See merge request artica/pandorafms!1621
 2018-10-01 14:45:16 +02:00
alejandro-campos 0c899f5078 Merge branch 'develop' into 2479-Errores-en-vista-de-alertas-de-meta 
Conflicts:
	pandora_console/include/functions_ui.php
 2018-10-01 14:03:30 +02:00
vgilc 62dcf0f342 Merge branch '2459_No_se_ve_el_icono_por_defecto_del_widget_de_bienvenida' into 'develop' 
Fixed welcome icone

See merge request artica/pandorafms!1640
 2018-10-01 12:38:49 +02:00
vgilc ad5581f0c2 Merge branch '2491-Alert-view-meta' into 'develop' 
fixed bug in meta alert view: agent names not showing in table

See merge request artica/pandorafms!1618
 2018-09-28 10:39:52 +02:00
tatiana.llorente@artica.es d36c10fa08 new function that adds a border to the image if the status is warning - #2723 2018-09-10 13:22:02 +02:00
Alejandro Gallardo Escobar 1de746ab69 Fixed a problem with the autocomplete agent cache 2018-08-17 15:03:24 +02:00
fermin831 18800feaae Refactorized snapshot link on node 2018-08-02 13:02:33 +02:00
vgilc fcda8f56f9 Merge branch '2460-tu-zona-horaria-es-distinta-pero-igual' into 'develop' 
fixed bug: when system timezone is equal to your timezone, dont show the…

See merge request artica/pandorafms!1645
 2018-08-01 15:20:08 +02:00