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

22877 Commits

Author SHA1 Message Date
Daniel Barbero c4aea1ac59 add styles validation form of modal 2019-10-25 13:28:01 +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
Ramon Novoa d3971a3f90 Encode the agent alias with HTML entities. 
Ref pandora_enterprise#3584
 2019-10-25 11:08:47 +02:00
Daniel Barbero 22a2b7cd0b Add feedback phpInfo 2019-10-25 10:43:03 +02:00
artica 86fd1275be Auto-updated build strings. 2019-10-25 00:01:11 +02:00
Daniel Barbero Martin 3dee6888d6 fix 2019-10-24 17:42:37 +02:00
Tatiana Llorente 38b3490e4e Changed color of constant to severity minor in events 2019-10-24 17:42:27 +02:00
Jose Gonzalez c4c7d916e7 Applying of better way for save config 2019-10-24 17:21:21 +02:00
marcos e725a0185b cambios semi finales 2019-10-24 16:56:13 +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
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
Jose Gonzalez 29bcd379f7 Added changes for liking with visual consoles 2019-10-24 11:53:35 +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
artica 38dfa5cf35 Auto-updated build strings. 2019-10-24 00:01:09 +02:00
fbsanchez 709f4cac81 WebSocket configuration, quickShell settings, quickShell proxied url compatibility 2019-10-23 19:56:48 +02:00
Daniel Barbero Martin de22fb70e3 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-23 19:51:49 +02:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
fbsanchez 0d67d23cb6 quickShell support for ws_proxy_url 2019-10-23 19:19:38 +02:00
alejandro-campos a06f56a413 added function to convert cidr prefixes to mask 2019-10-23 17:22:18 +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
Daniel Rodriguez 48fa310aa9 Merge branch 'ent-4819-No-funciona-llamada-API-get-events' into 'develop' 
Ent 4819 no funciona llamada api get events

See merge request artica/pandorafms!2827
 2019-10-23 15:53:30 +02:00
Tatiana Llorente 31c36dc015 Ent 4819 no funciona llamada api get events 2019-10-23 15:53:30 +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
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 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
marcos b35c9dd96d ajust changes 2019-10-22 16:42:13 +02:00
Jose Gonzalez a6d1f3a544 Another minor fix applied 2019-10-22 16:23:46 +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
Jose Gonzalez 305dfa441d Minor fix applied 2019-10-22 14:03:24 +02:00