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

22593 Commits

Author SHA1 Message Date
fbsanchez a0c610d988 WS fixed audit origin address 2019-10-24 12:18:49 +02:00
fbsanchez 045d42d2bb quickShell auth 2019-10-24 12:05:00 +02:00
fbsanchez 276879d8ee clean cmd ws code style 2019-10-24 11:06:03 +02:00
fbsanchez 32cb12ca03 gotty refresh on ws restart 2019-10-24 11:04:38 +02:00
fbsanchez df576a3b86 ws gotty credentials and ws gotty proxy redirection 2019-10-24 10:59:08 +02:00
fbsanchez d34aa0917b WS tick interval, WS manager able to limit connections per session 2019-10-24 10:35:16 +02:00
fbsanchez 709f4cac81 WebSocket configuration, quickShell settings, quickShell proxied url compatibility 2019-10-23 19:56:48 +02:00
fbsanchez 0d67d23cb6 quickShell support for ws_proxy_url 2019-10-23 19:19:38 +02:00
fbsanchez 5cf7a0026e minor changes and init.d script for websocket engine 2019-10-23 15:23:35 +02:00
fbsanchez 66ceb93d04 minor changes and init.d script for websocket engine 2019-10-23 15:23:21 +02:00
fbsanchez 5b3fd5dd79 Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace 2019-10-22 17:34:41 +02:00
fbsanchez eb98f695f9 Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace 2019-10-22 17:34:34 +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
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
fbsanchez c963681098 Quick shell telnet improvements 2019-10-21 21:10:26 +02:00
fbsanchez 47e6f4adb5 Fix and control API sessions 2019-10-21 21:09:03 +02:00
fbsanchez 9d8bb880fa Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:50 +02:00
fbsanchez 6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
fbsanchez bb2faca479 ma 2019-10-21 12:18:42 +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
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
fbsanchez 1cf77cc8f1 WSProxy ACL check 2019-10-18 18:55:29 +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
fbsanchez e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +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
Alejandro Fraguas be29f1dd55 Merge branch 'ent-4746-boton-de-aspecto-raro-en-forgot-your-password' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2782
 2019-10-17 13:20:14 +02:00
Alejandro Fraguas cb269789a7 Merge branch 'ent-4818-cambio-en-plugin-tools' into 'develop' 
Updated file names to avoid collision

See merge request artica/pandorafms!2816
 2019-10-17 12:14:51 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
Daniel Rodriguez 2dfc2b7a8a Merge branch 'ent-3989-graficas-sql-metaconsola' into 'develop' 
Available in metaconsole sql charts in reports for metaconsole server

See merge request artica/pandorafms!2697
 2019-10-17 11:07:37 +02:00
Daniel Rodriguez 3cb80e5d32 Merge branch '4820-planned_downtimes_created-no-se-almacena-correctamente' into 'develop' 
Solved issue with date_from and dato_to missing time data

See merge request artica/pandorafms!2817
 2019-10-17 10:16:07 +02:00
Daniel Rodriguez e80ef83d66 Merge branch 'ent-4692-vodat-al-editar-un-item-de-un-custom-report-devuelve-la-pantalla-de-item-editor' into 'develop' 
When an item is updated, it is redirected to the item lists

See merge request artica/pandorafms!2755
 2019-10-17 10:13:40 +02:00
Daniel Rodriguez 269f1f2da4 Merge branch 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos' into 'develop' 
Ent 4720 redireccion erronea de meta a nodo desde eventos

See merge request artica/pandorafms!2771
 2019-10-17 09:54:31 +02:00
Tatiana Llorente 5264de2008 Merge branch 'develop' into 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos' 
Conflicts:
   pandora_console/operation/events/events.php
 2019-10-17 09:27:00 +02:00
artica 361f2022f4 Auto-updated build strings. 2019-10-17 00:01:10 +02:00
Daniel Rodriguez b6db2aa041 Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop' 
Fixed open and enterprise network map migration

See merge request artica/pandorafms!2745
 2019-10-16 19:03:24 +02:00
Jose Gonzalez 4a29057a1b Solved issue with date_from and dato_to missing time data 2019-10-16 16:41:22 +02:00
Alejandro Fraguas 039d854441 Merge branch 'ent-4784-Selector-de-intervalo-en-bulks-pule-el-conf-de-los-agentes-con-remote-dependiendo-de-la-opción-que-seleccionemos' into 'develop' 
Ent 4784 selector de intervalo en bulks pule el conf de los agentes con remote dependiendo de la opción que seleccionemos

See merge request artica/pandorafms!2800
 2019-10-16 14:16:13 +02:00
fbsanchez 5f2adbfb7a Updated file names to avoid collision 2019-10-16 13:40:46 +02:00