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

17803 Commits

Author SHA1 Message Date
Daniel Rodriguez b7d8323583 Merge branch 'ent-3687-get-agents-id-name-by-alias-api-cli' into 'develop' 
Added API and cli function get_agents_id_by_alias

See merge request artica/pandorafms!2802
 2019-11-05 17:08:32 +01:00
Daniel Rodriguez 0f2d30698c Merge branch 'ent-4872-Cambiar-titulo-a-archivo-XML-de-los-templates-de-reports' into 'develop' 
Ent 4872 cambiar titulo a archivo xml de los templates de reports

See merge request artica/pandorafms!2862
 2019-11-05 17:03:53 +01:00
Daniel Rodriguez 0e628a365d Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop' 
Ent 4625 cambiar titulo a archivo csv de la vista de eventos

See merge request artica/pandorafms!2783
 2019-11-05 16:57:23 +01:00
Daniel Rodriguez dd86598298 Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop' 
Fixed visual bug in general report item

See merge request artica/pandorafms!2854
 2019-11-05 16:43:52 +01:00
Daniel Rodriguez 01ba485401 Merge branch 'ent-4859-8959-SNMP-console-filter-warning-critical-critical-normal' into 'develop' 
fix bug in snmp console filter

See merge request artica/pandorafms!2844
 2019-11-05 14:01:35 +01:00
Daniel Rodriguez 98d36cfc6d Merge branch 'ent-4896-General-Report-en-Plantillas-no-tiene-bien-la-hora' into 'develop' 
Ent 4896 general report en plantillas no tiene bien la hora

See merge request artica/pandorafms!2855
 2019-11-05 13:33:27 +01:00
Tatiana Llorente 945383b8ec Changed name of xml report 2019-11-05 12:43:08 +01:00
Daniel Rodriguez a1b879d065 Merge branch 'ent-4728-Desactivar-Restart-Map-para-usuarios-sin-permisos' into 'develop' 
Ent 4728 desactivar restart map para usuarios sin permisos

See merge request artica/pandorafms!2805
 2019-11-04 18:45:57 +01:00
Tatiana Llorente c83b85c225 Ent 4801 error informes pdf csv 2019-11-04 18:41:03 +01:00
Alejandro Fraguas 777bbdd180 Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop' 
Added feature sample_agent

See merge request artica/pandorafms!2826
 2019-11-04 17:54:33 +01:00
Alejandro Fraguas 648778fffe Merge branch 'ent-4810-No-funcionan-los-templates-de-consolas-visuales' into 'develop' 
Ent 4810 no funcionan los templates de consolas visuales

See merge request artica/pandorafms!2814
 2019-11-04 12:40:04 +01:00
Tatiana Llorente 28e2702a48 Changed condition for general reports with last value checked 2019-11-04 12:00:12 +01:00
Alejandro Fraguas cf3bcefddf Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop' 
Fixed planned downtime acl

See merge request artica/pandorafms!2829
 2019-11-04 11:25:17 +01:00
manuel d0c2c0d1eb Fixed visual bug in general report item 2019-11-04 10:39:16 +01:00
alejandro-campos 14230d218a fix bug in snmp console filter 2019-10-29 16:14:33 +01:00
Luis Calvo 64e80e6fee Fixed error message 2019-10-29 10:32:59 +01:00
Luis Calvo 7f01f3d014 Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli 2019-10-29 10:23:46 +01:00
artica 6f3e42e732 Auto-updated build strings. 2019-10-29 00:01:13 +01:00
artica 3094d5af05 Updated version and build strings. 2019-10-28 12:35:59 +01:00
Alejandro Fraguas ffb9b9052c Merge branch 'ent-4848-phantomjs-se-queda-congelado' into 'develop' 
Ent 4848 phantomjs se queda congelado

See merge request artica/pandorafms!2837
 2019-10-28 11:53:47 +01:00
Daniel Rodriguez 08247c1952 Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop' 
changed pandora api functions to include possibility of using agent alias when...

See merge request artica/pandorafms!2819
 2019-10-28 11:25:38 +01:00
alejandro-campos b16ef248d6 minor fixes in cli and api functions 2019-10-28 09:48:52 +01:00
artica 88a56a1f22 Auto-updated build strings. 2019-10-28 00:01:08 +01:00
artica 874ac0c630 Auto-updated build strings. 2019-10-27 00:01:07 +02:00
artica 8a03486dfc Auto-updated build strings. 2019-10-26 00:01:09 +02:00
fbsanchez 21dd69706d web2image 2019-10-25 13:16:06 +02:00
fbsanchez 440874d436 More controls for phantom web2image 2019-10-25 12:51:33 +02:00
fbsanchez a2e96270a7 Avoid close cron sessions while gc 2019-10-25 12:24:02 +02:00
fbsanchez 2a24e22335 Avoid close cron sessions while gc 2019-10-25 12:23:00 +02:00
artica 86fd1275be Auto-updated build strings. 2019-10-25 00:01:11 +02:00
Jose Gonzalez c4c7d916e7 Applying of better way for save config 2019-10-24 17:21:21 +02:00
Jose Gonzalez b0db7c729d Solved minor issues 2019-10-24 16:23:58 +02:00
Jose Gonzalez 742329336e Added link with visual consoles 2019-10-24 14:30:34 +02:00
alejandro-campos ee587a3117 Merge remote-tracking branch 'origin/develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name 2019-10-24 13:21:08 +02:00
alejandro-campos a4988fe9af modified get_events functions in functions_api 2019-10-24 13:18:26 +02:00
Jose Gonzalez 29bcd379f7 Added changes for liking with visual consoles 2019-10-24 11:53:35 +02:00
artica 38dfa5cf35 Auto-updated build strings. 2019-10-24 00:01:09 +02:00
Alejandro Fraguas 5364ef0fa1 Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into 'develop' 
Fix and control API sessions

See merge request artica/pandorafms!2830
 2019-10-23 16:12:19 +02:00
Tatiana Llorente 31c36dc015 Ent 4819 no funciona llamada api get events 2019-10-23 15:53:30 +02:00
Alejandro Fraguas 8fd6f28070 Merge branch 'ent-4851-Cambio-de-color-en-la-union-de-agentes-del-GIS-map' into 'develop' 
Changed color

See merge request artica/pandorafms!2831
 2019-10-23 12:28:04 +02:00
Daniel Rodriguez 39b3a00276 Merge branch 'ent-4690-revision-completa-de-informes-templates-en-meta' into 'develop' 
Fixed bugs in reports

See merge request artica/pandorafms!2796
 2019-10-23 11:41:07 +02:00
Daniel Maya c01a856826 Changed color 2019-10-23 11:17:16 +02:00
artica 1470241783 Auto-updated build strings. 2019-10-23 00:01:11 +02:00
fbsanchez 9edb77d288 proper logout (api) 2019-10-22 20:48:45 +02:00
fbsanchez ccfd944ad7 Fix and control API sessions 
Conflicts:
	pandora_console/include/lib/User.php

	modified:   pandora_console/include/api.php
	modified:   pandora_console/include/chart_generator.php
	new file:   pandora_console/include/lib/User.php
	modified:   pandora_console/include/load_session.php
	modified:   pandora_console/include/web2image.js
 2019-10-22 17:33:50 +02:00
Luis Calvo 33d26144f1 Fixed planned downtime acl 2019-10-22 16:00:01 +02:00
manuel bbeb750e46 Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta 
Conflicts:
	pandora_console/include/functions_graph.php
 2019-10-22 15:51:38 +02:00
manuel deb217906c Fixed bug in templates 2019-10-22 15:41:13 +02:00
Daniel Rodriguez f234e0c4a3 Merge branch 'ent-4836-menu-duplicado-en-reports-de-metaconsola' into 'develop' 
fixed visual error metaconsole

See merge request artica/pandorafms!2828
 2019-10-22 14:23:20 +02:00
Daniel Rodriguez 552d8758e8 Merge branch 'ent-4815-html-en-los-csv' into 'develop' 
Fixed bug in CSV export

See merge request artica/pandorafms!2824
 2019-10-22 14:22:42 +02:00