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

17786 Commits

Author SHA1 Message Date
fbsanchez 6d21f71617 removed trace 2019-10-28 18:38:56 +01:00
fbsanchez 7d5b845e1f minor fixes 2019-10-28 18:37:01 +01:00
fbsanchez 7accbc97c4 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:36:19 +01:00
artica 3094d5af05 Updated version and build strings. 2019-10-28 12:35:59 +01:00
fbsanchez 74007ebf70 33 => 34, cleanup 2019-10-28 12:18:56 +01:00
fbsanchez ccf971c2eb Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:18:19 +01:00
fbsanchez d6681cedd1 33 => 34 2019-10-28 12:18:13 +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
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
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
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
Marcos Alconada 6963ce894b Merge branch 'develop' into 'ent-4836-menu-duplicado-en-reports-de-metaconsola' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.php
 2019-10-22 13:26:15 +02:00
marcos 70978f838c fixed visual error metaconsole 2019-10-22 13:22:13 +02:00
Daniel Rodriguez 0cf3e01f74 Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop' 
Ent 1880 umbrales inversos en negativo

See merge request artica/pandorafms!2818
 2019-10-22 12:56:21 +02:00
Alejandro Fraguas ee0eee06f6 Merge branch 'ent-4724-estilo-vista-pandora-wux' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2779
 2019-10-22 12:54:28 +02:00
marcos 79a1a1b2a3 add wux.css 2019-10-22 10:23:53 +02:00
artica f99616723b Auto-updated build strings. 2019-10-22 00:01:09 +02:00
manuel 312b1c7c40 Fixed bug in CSV export 2019-10-21 11:48:13 +02:00
Alejandro Fraguas 2884226e56 Merge branch 'ent-4369-Graficas-en-meta-mobile-sin-TIP' into 'develop' 
Ent 4369 graficas en meta mobile sin tip

See merge request artica/pandorafms!2780
 2019-10-21 11:03:53 +02:00
Daniel Rodriguez 547607c21e Merge branch 'ent-4794-Permiso-Manage-Users-no-funciona' into 'develop' 
Ent 4794 permiso manage users no funciona

See merge request artica/pandorafms!2804
 2019-10-21 10:48:36 +02:00
alejandro-campos f2dbcea183 fix indentation 2019-10-21 09:55:39 +02:00
alejandro-campos 6cf08dde1e Merge branch 'develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name 2019-10-21 09:43:43 +02:00
artica f72fde0fb5 Auto-updated build strings. 2019-10-21 00:01:07 +02:00
artica bb9d18b6d8 Auto-updated build strings. 2019-10-20 00:01:07 +02:00
artica 88248fd226 Auto-updated build strings. 2019-10-19 00:01:11 +02:00
Daniel Rodriguez 13898da4c1 Merge branch 'ent-4733-no-funciona-buscador-general-de-politicas' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2777
 2019-10-18 11:42:30 +02:00
artica 22af1a3654 Auto-updated build strings. 2019-10-18 00:01:11 +02:00
Daniel Rodriguez e5890b038d Merge branch 'ent-4069-Graphs-containers-in-Custom-graphs-error' into 'develop' 
Ent 4069 graphs containers in custom graphs error

See merge request artica/pandorafms!2787
 2019-10-17 14:20:06 +02:00