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

3334 Commits

Author SHA1 Message Date
Arturo Gonzalez 4d469426a5 Added specs from MPulido 2017-09-05 11:46:44 +02:00
Arturo Gonzalez 3a9895b97b Added min size to the field 2017-09-04 16:58:55 +02:00
vgilc 09f92b51ae Merge branch '832-server-proxy-final-details-dev' into 'develop' 
Added last specifications to pandora exec proxy

See merge request !775
 2017-09-04 16:33:11 +02:00
Arturo Gonzalez 018f449fc8 Added last specifications to pandora exec proxy 2017-09-04 16:02:58 +02:00
daniel a04e02570f Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-04 14:09:08 +02:00
daniel f0862e1c5b fixed minor errors in WUX 2017-09-04 12:09:19 +02:00
Arturo Gonzalez 4ebc081855 Added image to planned downtime 2017-09-04 10:26:30 +02:00
nramon 13894ba403 Merge branch '832-server-proxy-details-dev' into 'develop' 
Added details to agent wizard and secundary servers

See merge request !770
 2017-09-01 11:36:53 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
Arturo Gonzalez a80f62003c Added details to agent wizard and secundary servers 2017-09-01 10:44:26 +02:00
enriquecd ac0820b9b4 change url in preview qr code in agent view - #1229 2017-08-31 15:57:34 +02:00
enriquecd f6c6e2a6ba Add show_statistics option for group item - #1245 2017-08-31 15:09:04 +02:00
nramon 17201b5dd8 Merge branch '1190-Error-in-module-cascade-selector-dev' into 'develop' 
Do the autocomplete field correct

See merge request !761
 2017-08-31 11:36:44 +02:00
slerena 0a11d3d086 Merge branch '1228-massive-module-deletes-all-modules-with-any-tag-dev' into 'develop' 
Fixed "any" filter with selects unknown and not init modules in massive delete operation

See merge request !756
 2017-08-30 17:50:15 +02:00
Arturo Gonzalez 0eabf7a0ce Do the autocomplete field correct 2017-08-30 15:52:28 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
slerena 9c4eb3086e Merge branch '832-exec-proxy-dev' into 'develop' 
832 exec proxy dev

See merge request !755
 2017-08-29 16:11:03 +02:00
Arturo Gonzalez 32ad745c62 Added filter when id groups comes empty 2017-08-29 11:32:25 +02:00
Arturo Gonzalez 8daa66d6ee Added option to set exec proxy in server 2017-08-29 11:14:42 +02:00
fbsanchez 9a8e80bf68 Updates wux_module to web_analysis 2017-08-28 19:55:01 +02:00
Arturo Gonzalez 0e7b00f26e Added correct user and fixed db error 2017-08-28 16:38:30 +02:00
Arturo Gonzalez fc0db16d5e Fixed "any" filter with selects unknown and not init modules in massive delete operation 2017-08-28 15:47:16 +02:00
Arturo Gonzalez bab1f14a31 Added remote command execute to agent wizard 2017-08-28 12:44:51 +02:00
enriquecd 8b718371f9 Fix agent view qr mobile code - #1229 2017-08-24 16:09:04 +02:00
Arturo Gonzalez f021bedb5c Added proxy servers to events response form 2017-08-24 12:34:06 +02:00
Arturo Gonzalez 2521727ee1 Added ssh check connection 2017-08-24 11:05:10 +02:00
Arturo Gonzalez dce27f3ac2 Added new items to satellite editor view 2017-08-23 15:01:09 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
daniel f5da86ac0a no apply policies in wux 2017-08-22 11:39:21 +02:00
vgilc 453838942e Merge branch '122-mensaje-de-error-en-gestion-de-usuarios-ext-3871-v7-0' into 'develop' 
If result param is null not show bad result message when delete,disable user - #122

See merge request !368
 2017-08-18 13:18:08 +02:00
vgilc 7d1a7103ad Merge branch '1190-Fallo-al-buscar-módulos-de-agente-en-protección-en-cascada-dev' into 'develop' 
Fixed issue to search agent modules in cascade protection

See merge request !717
 2017-08-18 13:05:01 +02:00
vgilc 7ce67ef053 Merge branch '1090-bad-event-custom-field-dev' into 'develop' 
Removed event custom field (id)

See merge request !649
 2017-08-18 13:04:12 +02:00
vgilc 93c03da3fe Merge branch '1091-Fixed-key-sensitive-search-in-agents-list-dev' into 'develop' 
Fixed search field in agents list

See merge request !650
 2017-08-18 13:01:01 +02:00
vgilc d858d4840a Merge branch '1111-Columna-email-error-en-vista-de-informes-dev' into 'develop' 
Fixed email column

See merge request !668
 2017-08-18 12:44:26 +02:00
vgilc 870be2c4ea Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop' 
Fixed issue with cascade_protection_module

See merge request !720
 2017-08-18 12:34:31 +02:00
Daniel Maya 3c18f706fa fixed errors in visual console on simple value 2 2017-08-16 10:38:02 +02:00
daniel 4b26cf119c fixed errors visual console 2017-08-16 10:38:02 +02:00
Hirofumi Kosaka 70a226540e "Massive Operations" had remained at Pandora Console. #161 2017-08-14 12:03:35 +09:00
Daniel Maya 5973ec7545 fixed errors in visual console on simple value 2 2017-08-11 11:48:25 +02:00
daniel 33ccab173e fixed errors visual console 2017-08-11 09:13:26 +02:00
daniel 1d7d55a451 fixed errors in form wux 2017-08-09 13:27:51 +02:00
daniel 788cb8cbd8 fixed errors in form wux 2017-08-09 12:08:52 +02:00
daniel 7e649b78b3 wux new form 2017-08-09 11:29:16 +02:00
daniel be0a91ed2c fixed minor error sql delete module 2017-08-09 10:35:57 +02:00
daniel 4cbd005137 fixed error in graph container 2017-08-08 12:07:28 +02:00
Daniel Maya 3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +02:00
daniel 6a2d3a7011 fixed minor error 2017-08-07 17:02:56 +02:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +02:00
Hirofumi Kosaka 76c951183c [bug fix] deleting a module had caused unextected alert deletion. #156 2017-08-02 15:41:44 +09:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
 2017-07-28 10:30:17 +02:00
vgilc e2a175327e Merge branch '1140-Gráficas_con_entities' into 'develop' 
fixed errors entities in mail

See merge request !682
 2017-07-28 10:21:04 +02:00
vgilc 333171c2b6 Merge branch '1124-4288-agrupar-graficas-combinadas-ii_open' into 'develop' 
fixed errors in graph container

See merge request !688
 2017-07-28 10:19:15 +02:00
Arturo Gonzalez 02ce575d9f Added a last fix 2017-07-27 12:39:38 +02:00
Arturo Gonzalez 39f4b48d84 Added some changes about update modules from local component with macros 2017-07-27 11:08:19 +02:00
enriquecd 240b6e017f Adapt historical_db checkbox for sql reports to sql templates - #1157 2017-07-26 13:50:55 +02:00
Arturo Gonzalez 82b6904289 Changed some lines in configurar_agente 2017-07-26 13:36:42 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
daniel 741cc05268 fixed errors in graph container 2017-07-24 10:53:04 +02:00
daniel 66d9dd9d27 fixed errors entities in mail 2017-07-20 13:36:16 +02:00
enriquecd 31a8995176 Fix restore element width when press double click over data image simple_value - #412 2017-07-19 19:02:20 +02:00
Arturo Gonzalez 1ff3202c43 Added the last things to the new vc item (module events) 2017-07-19 10:36:24 +02:00
Daniel Maya d29aa2c246 Fixed email column 2017-07-18 13:07:25 +02:00
Arturo Gonzalez 329050b02b Fixed error 2017-07-18 12:26:29 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' 
# Conflicts:
#   pandora_console/extras/mr/4.sql
 2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
Arturo Gonzalez e9e10d3a79 Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev 
pandora_console/include/functions_visual_map.php
	pandora_console/include/functions_visual_map_editor.php
 2017-07-18 11:57:13 +02:00
Enrique Camargo 1e7fbc443e Merge branch 'develop' into '412-consola-visual-Módulo-imagen' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-07-17 10:39:20 +02:00
Daniel Maya c13644951f update agent 2017-07-17 09:22:28 +02:00
Arturo Gonzalez d57508f09e Added sla_auto_graph item to vc first version 2017-07-13 16:23:16 +02:00
Arturo Gonzalez 8f2b4fb783 Added more changes to the first version 2017-07-13 13:25:28 +02:00
vgilc 54b90c75fe Merge branch '1019-Editar-modulo-no-muestra-nombre' into 'develop' 
Fix module editor can not show name with quotes - #1019

See merge request !587
 2017-07-13 13:17:34 +02:00
vgilc f10e67342d Merge branch '844-Error-en-la-posición-al-crear-un-elemento-con-imagen-en-las-consolas-visuales' into 'develop' 
Fix image align when create a static graph in vconsole - #844

See merge request !642
 2017-07-13 13:15:26 +02:00
Arturo Gonzalez 19caa3ebfb Added js image 2017-07-13 12:26:13 +02:00
vgilc 1772cc273b Merge branch '1012-Problema-con-configuración-de-LDAP-dev' into 'develop' 
Erase functionality

See merge request !613
 2017-07-13 11:56:17 +02:00
vgilc 9e3fa2d310 Merge branch '1023-module-graph-in-visual-console-with-non-administrator-user-dev' into 'develop' 
Added Borja line to fix module graph period in visual console with non-administrator users

See merge request !609
 2017-07-13 11:55:23 +02:00
vgilc 6829c8734f Merge branch '1029-Falta-cuadro-de-búsqueda-en-filtro-de-metaconsola-dev' into 'develop' 
Style change text in user management

See merge request !599
 2017-07-13 11:53:36 +02:00
vgilc fa29d4072f Merge branch '1001-Alert-detail-muestra-el-agent_name-dev' into 'develop' 
Changed agent name by alias in alerts details

See merge request !573
 2017-07-13 11:49:00 +02:00
Arturo Gonzalez 63d07e1416 Added more things to new vc item 2017-07-12 13:34:20 +02:00
Arturo Gonzalez 9db5669f16 Added item in button palette with default fields 2017-07-12 11:51:00 +02:00
Arturo Gonzalez 75b82847b0 Fixed search field in agents list 2017-07-10 09:34:13 +02:00
Arturo Gonzalez 889045ff04 Removed event custom field (id) 2017-07-10 09:06:21 +02:00
vgilc c19aaa1d64 Merge branch '151-actualizar-el-cliente-de-ehorus' into 'develop' 
Replaced references to switch.ehorus.com with portal.ehorus.com.

See merge request !647
 2017-07-07 11:05:25 +02:00
vgilc e49c2351ae Merge branch '1075-Operaciones-masivas-ponen-postprocess-a-0-dev' into 'develop' 
Fixed post process in Edit modules in bulk

See merge request !638
 2017-07-07 09:38:48 +02:00
enriquecd ce35af3e61 Multiple erasure and displacement of elements in visual console - #624 2017-07-05 19:08:40 +02:00
vgilc ca45db3ba3 Merge branch '884-low-width-in-groups-select-agent-manager-section-dev' into 'develop' 
Fixed field

See merge request !623
 2017-07-05 12:06:54 +02:00
enriquecd f2f7a8179f Fix image align when create a static graph in vconsole - #844 2017-07-03 15:24:30 +02:00
Ramon Novoa 9a85c47f9e Replaced references to switch.ehorus.com with portal.ehorus.com. 2017-06-30 21:14:55 +02:00
Daniel Maya cfc7050bab Fixed post process in Edit modules in bulk 2017-06-30 14:18:23 +02:00
enriquecd b6d4416921 Let use png logo images for reports - #1057 2017-06-28 12:37:40 +02:00
Arturo Gonzalez 99ad586661 Fixed field 2017-06-27 11:35:48 +02:00
Arturo Gonzalez 242667e162 Fixed selector 2017-06-27 11:10:07 +02:00
enriquecd 1a34c7413c Fix creation prediction modules, add prediction_module param when create - #698 2017-06-26 12:22:05 +02:00
vgilc a151a7e0b8 Merge branch '884-groups-hierachy-in-select-dev' into 'develop' 
Fixed groups select width

See merge request !523
 2017-06-23 14:02:50 +02:00
Daniel Maya 42b822a07a Erase functionality 2017-06-22 15:27:00 +02:00
Arturo Gonzalez 2737b6567a Added Borja line to fix module graph period in visual console with non-administrator users 2017-06-21 14:35:22 +02:00
Daniel Maya 6703b1e9e5 Style change text in user management 2017-06-20 12:01:34 +02:00
enriquecd c7c158297d Fix module editor can not show name with quotes - #1019 2017-06-14 19:12:17 +02:00
enriquecd 8b83b94a40 Change vconsole label editor background color when rightclick on it - #984 2017-06-14 16:59:59 +02:00
vgilc 8f693ee9c8 Merge branch '995-Agent-name-en-operaciones-masivas-de-plugins-dev' into 'develop' 
changed agent name by alias

See merge request !566
 2017-06-14 11:46:13 +02:00