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

223 Commits

Author SHA1 Message Date
alejandro-campos 41c4ad8d90 Merge branch 'develop' into 3154-Agent-name-en-vistas-de-alertas-de-consola-movil 
Former-commit-id: aa3d44b06df07f90092f6bab50b2c6ef63660fc5
 2019-02-15 15:30:36 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
artica 7a9684f23c Changed the format of the .css files 
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
 2019-01-30 12:42:16 +01:00
Kike 65d4c5aab7 Included control for user set filter and admin set filter 
Former-commit-id: fe0ae14537a558e8f3ce423fd761a653ff8168e7
 2019-01-16 17:53:32 +01:00
Kike 133a5dc13e Merge remote-tracking branch 'origin/develop' into pandora_enterprise#2987 
Conflicts:
	pandora_console/include/functions_events.php


Former-commit-id: 2c85907168c27c3707955668209ae5df2af4f4a7
 2019-01-03 13:10:10 +01:00
alejandro-campos 279e94f452 agent named replaced by agent alias in mobile console's alerts view 
Former-commit-id: 4140bddcf5785f76a948bbe1ba0f694a58c9b50a
 2018-12-11 10:30:24 +01:00
vgilc a5f6bfe84f Merge branch 'ent-3147-mobile-console-pagination-bugfix' into 'develop' 
Mobile console pagination bugfix

See merge request artica/pandorafms!2017
 2018-11-23 12:54:53 +01:00
Alejandro Gallardo Escobar a7e78c30f3 Bugfix 2018-11-23 12:47:00 +01:00
Alejandro Gallardo Escobar ba0b2d8bd4 Fixed an object unserialize from the session 2018-11-23 10:33:18 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
daniel 743a41d29c fixed changes in pandora mobile 2018-10-30 12:30:10 +01:00
Kike da91b4d25f Solved errors in mobile events view 2018-10-29 16:16:03 +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
fermin831 4cb66c31f1 Fixed logo image on metaconsole login 2018-10-23 17:43:00 +02:00
fermin831 8cb2ff1d1b Fixed tactical view graph on mobile metaconsole 2018-10-23 17:41:14 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
danielmaya f952d5c70e tags_get_acl_tags revision 2018-10-08 17:45:26 +02:00
tatiana.llorente@artica.es 2dd10a4328 Added number of times an alert is fired - #2827 2018-10-02 12:35:20 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
fermin831 1096319faf Removed Networkmaps on mobile console 2018-09-13 15:48:26 +02:00
daniel 3fa4f44d68 fixed group view 2018-09-07 14:37:22 +02:00
daniel 6072cd3dc9 improve performance on group view 2018-09-06 15:28:22 +02:00
alejandro-campos 8e2f4b0eaa Implemented license validation for mobile console 2018-08-23 13:57:41 +02:00
fermin831 01b8ec8acb Deleted some unwanted traces 2018-08-08 13:20:15 +02:00
fermin831 18800feaae Refactorized snapshot link on node 2018-08-02 13:02:33 +02:00
tatiana.llorente@artica.es 965c6c839b Image for mode Quiet changed to blue - #2036 2018-06-26 12:31:23 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar 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
daniel 89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
daniel 97aaad0b02 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-01 14:04:46 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
fermin831 0acaf2312d [Rebranding] Mobile console head title 2018-05-29 13:26:47 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
daniel 16dca6860f Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
 2018-05-23 12:46:12 +02:00
fermin831 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
daniel 78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
Alejandro Gallardo Escobar 2e96c2bbd1 Fixed a SQL injection vulnerability 2018-05-21 15:19:25 +02:00
danielmaya 7783f81f59 Fixed mobile graph 2018-05-17 16:43:31 +02:00
Fermin 9cf7fee2c0 [Rebranding] Open mobile console 2018-05-11 14:24:26 +02:00
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
enriquecd 3b1c9e16a5 Fix pandroid index page - #1837 2018-02-07 16:56:21 +01:00
vgilc 0da39d386b Merge branch '1678-Qr-de-vista-de-agente-que-redireccione-a-vista-escritorio-en-modo-escritorio-del-navegador-movil' into 'develop' 
Redirect to desktop version pandora when scan agent view QR with a mobilephone…

See merge request artica/pandorafms!1165
 2018-01-29 13:38:25 +01:00
Alejandro Gallardo Escobar 85411c8948 [Pandora Console > Mobile] Redirect to the required page after login 2018-01-24 14:13:13 +01:00
vgilc 8ea951a4bb Merge branch 'ent-1520-error-en-grafica-de-agente-no-dinamica' into 'develop' 
Fixed non interactive status graphs

See merge request artica/pandorafms!1063
 2017-12-21 10:48:17 +01:00
vgilc 733564dcb1 Merge branch 'default-mobile-page' into 'develop' 
[Pandora Console > Mobile] Added support to the user's default page

See merge request artica/pandorafms!1091
 2017-12-21 10:41:24 +01:00