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

11259 Commits

Author SHA1 Message Date
enriquecd ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-06-05 09:38:06 +02:00
artica 291ae3a192 Auto-updated build strings. 2017-06-05 00:01:13 +02:00
artica f9da9b404b Auto-updated build strings. 2017-06-04 00:01:14 +02:00
artica 9f041fb76b Auto-updated build strings. 2017-06-03 00:01:19 +02:00
Daniel Maya ae30068397 fixed deleting grouped traps 2017-06-02 11:33:26 +02:00
vgilc a4ecc9374d Merge branch '949-node-events-with-event-replication-dev' into 'develop' 
Fixed readonly validation in nodes

See merge request !542
 2017-06-02 11:04:22 +02:00
vgilc eab92ce1c8 Merge branch '925-UM-Offline-y-current_package_enterprise-dev' into 'develop' 
Changed current_package_enterprise

See merge request !516
 2017-06-02 11:00:51 +02:00
vgilc 69c64fa7dd Merge branch '852-Bug-en-llave-de-Consola-Visual' into 'develop' 
No unselect elements when click over vconsole settings key - #852

See merge request !488
 2017-06-02 11:00:00 +02:00
vgilc 1c4f64ac2a Merge branch '936-weird-general-item-in-reports-dev' into 'develop' 
Fixed general item in reports

See merge request !526
 2017-06-02 10:59:02 +02:00
vgilc 5ed3e01afc Merge branch '957-sound-events-style-dev' into 'develop' 
Added styles to sound events window

See merge request !543
 2017-06-02 10:34:05 +02:00
vgilc db43f909fd Merge branch '920-Wrong-visualization-with-custom-graphs-items-in-visual-console-dev' into 'develop' 
Changed custom graph size specs in visual console

See merge request !517
 2017-06-02 10:32:58 +02:00
vgilc 12008fee56 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop'" 
This reverts merge request !547
 2017-06-02 10:31:48 +02:00
vgilc 5ed4aa3397 Merge branch '958-fixed-target-ip-in-policy-modules-dev' into 'develop' 
Added target_ip to policy_modules table

See merge request !544
 2017-06-02 10:11:18 +02:00
enriquecd 13376bce42 Take prediction_module param when create module and init module - #698 2017-06-02 09:54:33 +02:00
vgilc 6ad0dde2b7 Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop' 
fixed errors in errors login

See merge request !547
 2017-06-02 09:19:35 +02:00
artica 475a56f6bd Auto-updated build strings. 2017-06-02 00:01:19 +02:00
daniel 00f5c2027c fixed errors in errors login 2017-06-01 18:23:06 +02:00
Daniel Maya f72f61c49e Added new functionality to create alerts on modules without alerts 2017-06-01 16:54:51 +02:00
enriquecd 7ab1748be6 Change processGet jquery call get to post - #959 2017-06-01 15:27:55 +02:00
Arturo Gonzalez 7a9f63f212 Added change to db 2017-06-01 14:30:34 +02:00
Arturo Gonzalez 4d46470e96 Added target_ip to policy_modules table 2017-06-01 14:24:24 +02:00
Arturo Gonzalez 1362bbc555 Added styles to sound events window 2017-06-01 13:50:35 +02:00
Arturo Gonzalez 5d2a3fc094 Fixed readonly validation in nodes 2017-06-01 12:17:30 +02:00
Arturo Gonzalez efd28c0513 Added Enrique Camargo db changes to mr number 2 2017-06-01 11:28:24 +02:00
Arturo Gonzalez 77b5e74343 Added new condition to dashboard and non avg only in simple graphs 2017-06-01 11:24:59 +02:00
vgilc b9db37f663 Merge branch '523-deteccion-de-cambios-en-inventario-modulo-software-y-otros-con-varias-lineas-open' into 'develop' 
Format module inventary to show only changes on events - #523

See merge request !508
 2017-06-01 09:47:48 +02:00
vgilc 3aa4fc7315 Merge branch '943-header-refresh-no-stops-in-events-view-dev' into 'develop' 
Removed old code that breaks the autorefresh pause

See merge request !538
 2017-06-01 09:32:42 +02:00
artica 40cc85ab43 Auto-updated build strings. 2017-06-01 00:01:17 +02:00
vgilc 6d2607e178 Merge branch '912-login-page-background-dev' into 'develop' 
Added correct path to images in login page background

See merge request !506
 2017-05-31 17:51:34 +02:00
vgilc 87f3cb46f6 Merge branch '923-New-sound-events-console-view-dev' into 'develop' 
Added new visual styles to event sound console

See merge request !513
 2017-05-31 17:46:11 +02:00
vgilc ef5680c718 Merge branch '877-bad-colours-and-status-hierachy-in-group-view-dev' into 'develop' 
Added changes to group view

See merge request !504
 2017-05-31 17:44:56 +02:00
vgilc 31a1096119 Merge branch '902-Perfil-con-edicion-de-agentes-no-tiene-permisos-para-una-opción-en-masivas' into 'develop' 
Change permission filter for module bulk operations, PM change to AW - #902

See merge request !493
 2017-05-31 17:42:57 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop' 
807 module massive operations with tag filter dev

See merge request !476
 2017-05-31 17:42:09 +02:00
vgilc d92947d68d Merge branch '855-Icono-erroneo-en-custom-fields' into 'develop' 
Change display up front column icons for agent custom field manager - 855

See merge request !465
 2017-05-31 17:41:20 +02:00
vgilc e085a8a006 Merge branch '843-Error-Perfil-en-copia-masiva-de-modulos' into 'develop' 
fixed errors in massive copy modules

See merge request !451
 2017-05-31 17:40:27 +02:00
vgilc 70db081222 Merge branch '862-search-fields-going-wrong-dev' into 'develop' 
Added alias search to general search and case no case sensitive search to agent details search field

See merge request !466
 2017-05-31 17:39:44 +02:00
vgilc 4e4415a102 Merge branch '826-Error-en-paginación-de-usuarios-despues-de-borrar-crear-un-usuario' into 'develop' 
Pagination links include delete, create and other params, now not use these para…

See merge request !442
 2017-05-31 17:38:54 +02:00
vgilc d493151527 Merge branch '811-massive-operations-error-verbosity-dev' into 'develop' 
Added more specified alert to update modules and agents when no one field change

See merge request !458
 2017-05-31 17:37:43 +02:00
vgilc 61a9d923a4 Merge branch '889-Remove-babel-auth-in-pandora-dev' into 'develop' 
Removed babel

See merge request !502
 2017-05-31 17:34:47 +02:00
vgilc df43207ae4 Merge branch 'improve_policies_import_input' into 'develop' 
Only show files with extension is ptr.

See merge request !434
 2017-05-31 17:31:13 +02:00
vgilc 62f96b16a0 Merge branch '822-wizard-SNMP-wrong-postprocess-dev' into 'develop' 
Changed default value to post process in tpolicy modules

See merge request !457
 2017-05-31 17:28:40 +02:00
vgilc 18a2ff1701 Merge branch '937-Gráficas-de-servicios-muestran-datos-en-desconocido-entre-las-muestras-de-datos-correctos-almacenados-2' into 'develop' 
Fill empty data in graphs with last known data, no with nodata point - #937

See merge request !535
 2017-05-31 17:26:11 +02:00
vgilc 24ae080f5a Merge branch '840-No-hay-selector-de-postproceso-en-bulk-operations-v7-#4005-com1' into 'develop' 
Show preset options in post process selector for modules massive operations - #840

See merge request !447
 2017-05-31 17:14:51 +02:00
vgilc f64b4852a6 Merge branch '870-No-se-muestra-Custom-logo-header-en-pantalla-de-logout' into 'develop' 
Show custom header logo when logout - #870

See merge request !477
 2017-05-31 17:14:10 +02:00
vgilc 313fef7531 Merge branch '442-Recon-server-aparece-con-la-fuente-en-gris' into 'develop' 
Add icon to recon server row in operation column for pandora servers view - #442

See merge request !482
 2017-05-31 17:11:35 +02:00
vgilc 05397a876f Merge branch '841-boolean-charts-in-agent-charts-section-dev' into 'develop' 
Added boolean modules to agent graphs section

See merge request !455
 2017-05-31 17:10:52 +02:00
vgilc c66810afea Merge branch '847-networkmap-autorefresh-dev' into 'develop' 
Fixed networkmap path in auto-refresh white list

See merge request !452
 2017-05-31 17:09:00 +02:00
vgilc 7c038459d1 Merge branch '880-Barra-gris-en-consola-dev' into 'develop' 
Updated id module group

See merge request !505
 2017-05-31 17:06:44 +02:00
vgilc 08642eacd3 Merge branch '311-Filtrar-por-campo-personalizado-en-eventos' into 'develop' 
Free search input in event list view filter also by custom_data - #311

See merge request !486
 2017-05-31 17:06:10 +02:00
vgilc 956a4a1b20 Merge branch '866-fixed-free-search-field-in-monitor-detail-view-dev' into 'develop' 
Fixed free search

See merge request !499
 2017-05-31 17:03:10 +02:00
vgilc 00e73a8213 Merge branch '675-search-filter-by-start-date-and-end-date-dev' into 'develop' 
Added date filter in snmp console

See merge request !471
 2017-05-31 17:02:14 +02:00
vgilc 164e279dd5 Merge branch '849-remove-strict-acl-from-user-form-dev' into 'develop' 
Checkbox removed

See merge request !524
 2017-05-31 16:59:15 +02:00
vgilc 8eb4300e1a Merge branch '888-Last-contact-en-rojo-en-Agent-detail-Ext-4032' into 'develop' 
Ignore 0 value modules interval when check last contact in agent details - #888

See merge request !480
 2017-05-31 16:58:18 +02:00
Arturo Gonzalez 4ba94f065e Removed old code that breaks the autorefresh pause 2017-05-31 16:40:10 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
Arturo Gonzalez bca10d7b5a Changed text to fix it 2017-05-31 12:16:18 +02:00
vgilc bad1a72c69 Merge branch 'update-japanese-help' into 'develop' 
japanese help for cascade protection.

See merge request !474
 2017-05-31 11:30:30 +02:00
vgilc 55d94f386e Merge branch 'update-japanese-help-alert_macros' into 'develop' 
Update japanese help for alert macros.

See merge request !483
 2017-05-31 11:30:19 +02:00
vgilc d4a448e2db Merge branch 'update-japanese-translation' into 'develop' 
Update Japanese translations.

See merge request !515
 2017-05-31 11:29:41 +02:00
artica 619014733b Auto-updated build strings. 2017-05-31 00:01:19 +02:00
vgilc 854b3ea0b7 Merge branch '940-visual-changes-from-MR-in-meta-and-node-dev' into 'develop' 
Changed text in header when mr file is available

See merge request !532
 2017-05-30 17:18:26 +02:00
enriquecd d33621ffa7 Fill empty data in graphs with last known data, no with nodata point - #937 2017-05-30 16:34:30 +02:00
Daniel Maya 5cf6962de0 Fixed problem in data display snmp wizard 2017-05-30 15:40:50 +02:00
Arturo Gonzalez 47862600a4 Added los querys to migrate 2017-05-30 15:33:16 +02:00
Arturo Gonzalez fe7b4257f0 Changed text in header when mr file is available 2017-05-30 13:59:47 +02:00
Arturo Gonzalez eec313c4c7 Fixed nwtflow live view filter table 2017-05-30 13:10:57 +02:00
artica 3b481af7d6 Updated version and build strings. 2017-05-30 11:22:26 +02:00
Arturo Gonzalez ab86e62cd9 Changes spanish translations 2017-05-30 10:43:24 +02:00
artica 05c9b7c4da Auto-updated build strings. 2017-05-30 00:01:17 +02:00
Arturo Gonzalez 33534244c8 Fixed general item in reports 2017-05-29 17:03:52 +02:00
Arturo Gonzalez 90012f43ff Checkbox removed 2017-05-29 15:29:41 +02:00
Arturo Gonzalez f467d6d466 Fixed groups select width 2017-05-29 14:31:46 +02:00
vgilc f78288d556 Merge branch '930-reset-pass-translations-dev' into 'develop' 
Translations changed

See merge request !522
 2017-05-29 13:27:23 +02:00
Arturo Gonzalez a1063e9b50 Translations changed 2017-05-29 12:35:31 +02:00
Arturo Gonzalez 9133f2edca Moved from ent to password 2017-05-29 12:20:07 +02:00
Arturo Gonzalez 9e99bc4485 Added new field to pandoradb_data 2017-05-29 12:04:38 +02:00
Arturo Gonzalez 1e0af6ec26 Added field to db 2017-05-29 11:58:42 +02:00
Arturo Gonzalez a4636f3435 Added changes in db 2017-05-29 11:55:04 +02:00
Arturo Gonzalez 463c393c00 Added changes to encrypt custom values with a new token 2017-05-29 11:48:50 +02:00
artica 0fe95248c1 Auto-updated build strings. 2017-05-29 00:01:13 +02:00
artica 63d3cefe0b Auto-updated build strings. 2017-05-28 00:01:12 +02:00
artica 5ca2065013 Auto-updated build strings. 2017-05-27 00:01:14 +02:00
Arturo Gonzalez 6bf672a846 Added changes 2017-05-26 14:47:37 +02:00
Arturo Gonzalez 54b70e5927 Changed custom graph size specs in visual console 2017-05-26 12:55:37 +02:00
Daniel Maya b7e7e9e66a Changed current_package_enterprise 2017-05-26 11:15:00 +02:00
Junichi Satoh b42bfb7793 Updated Japanese translations. 2017-05-26 18:03:05 +09:00
vgilc cca5f7d2ef Merge branch '922-fallo-en-menú-con-perfil-Operator-Read' into 'develop' 
Hide admin tools empty link in left menu bar for operator read users without permissions - #922

See merge request !514
 2017-05-26 10:03:24 +02:00
artica 474d22ed30 Auto-updated build strings. 2017-05-26 00:01:14 +02:00
enriquecd d413b7d22d Hide admin tools empty link in left menu bar for operator read users without permissions - #922 2017-05-25 18:37:26 +02:00
vgilc 8a1136d99e Merge branch '704-Agrupar-gráficas-dev' into 'develop' 
Fixed problem without graphics

See merge request !512
 2017-05-25 17:30:09 +02:00
Arturo Gonzalez 2e71af2568 Added new visual styles to event sound console 2017-05-25 17:11:35 +02:00
vgilc 1ba43f4661 Merge branch '696-wrong-id-in-export-server-id-in-module-massive-operations-dev' into 'develop' 
Fixed wrong ids

See merge request !507
 2017-05-25 16:56:52 +02:00
Daniel Maya b3e530658a Fixed problem without graphics 2017-05-25 16:54:07 +02:00
Arturo Gonzalez 09b90be1ca Works in good dashboards module graphs 2017-05-25 10:08:30 +02:00
artica faa96927dd Auto-updated build strings. 2017-05-25 00:01:12 +02:00
enriquecd df715561d7 Format module inventary to show only changes on events - #523 2017-05-24 18:24:53 +02:00
Arturo Gonzalez 71b809ac25 Fixed wrong ids 2017-05-24 18:01:58 +02:00
Arturo Gonzalez 3155b81eb5 Added correct path to images in login page background 2017-05-24 17:09:44 +02:00
Daniel Maya a8cae99747 Updated id module group 2017-05-24 16:17:43 +02:00
Arturo Gonzalez 8b849efc3c Added changes to group view 2017-05-24 15:39:44 +02:00
vgilc 44dc9128b2 Merge branch '537-Module-graphs-dev' into 'develop' 
537 module graphs dev

See merge request !503
 2017-05-24 14:14:16 +02:00
Arturo Gonzalez 20c205fbc9 Added good styles to graphs 2017-05-24 13:12:47 +02:00
Arturo Gonzalez 4a03298b69 Added unit to module name and recolocate yaxis label 2017-05-24 12:18:43 +02:00
vgilc 20599871a1 Merge branch '711-agent-name-en-lugar-de-alias' into 'develop' 
Remove quotation marks in agent deletion

See merge request !501
 2017-05-24 09:26:18 +02:00
vgilc af898c8b3d Merge branch '704-agrupar-gráficas-combinadas' into 'develop' 
704 agrupar gráficas combinadas

See merge request !500
 2017-05-24 09:25:11 +02:00
artica 42704e5981 Auto-updated build strings. 2017-05-24 00:01:10 +02:00
Arturo Gonzalez 63554c54a2 Removed babel 2017-05-23 17:55:37 +02:00
Daniel Maya e1b867069b Remove quotation marks in agent deletion 2017-05-23 17:50:37 +02:00
Daniel Maya 0f9a2cf2f8 New feature: Graphic grouping. added mr 2017-05-23 17:17:40 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
Arturo Gonzalez 63129641eb Fixed free search 2017-05-23 16:54:24 +02:00
Arturo Gonzalez 8692a17567 Ficed bad include call 2017-05-23 15:36:35 +02:00
Arturo Gonzalez d744cb9220 Added end date to fullscale chart view 2017-05-23 15:16:34 +02:00
Arturo Gonzalez 53f4c6edb8 Added fullscale setting in boolean chart 2017-05-23 15:15:28 +02:00
Arturo Gonzalez 5bb3cd2ad6 Added some code to fullscale graphs 2017-05-23 15:02:53 +02:00
vgilc c8251d62e0 Merge branch '788_Añadir_macros_para_varias_ips' into 'develop' 
add new macros all_address and address_n

See merge request !497
 2017-05-23 10:25:56 +02:00
vgilc b21e09deef Merge branch '635-reset-or-recover-password-in-pandora-node-and-meta-dev' into 'develop' 
635 reset or recover password in pandora node and meta dev

See merge request !389
 2017-05-23 10:14:43 +02:00
daniel 37d3d895b0 add new macros all_address and address_n 2017-05-23 10:09:32 +02:00
artu30 faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev' 
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
 2017-05-23 09:50:22 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user' 
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
 2017-05-23 09:48:37 +02:00
artica eddeb12bcf Auto-updated build strings. 2017-05-23 00:01:18 +02:00
artu30 a78b5cc60d Merge branch 'develop' into '777-translations-dev' 
# Conflicts:
#   pandora_console/godmode/update_manager/update_manager.offline.php
#   pandora_console/include/functions_update_manager.php
 2017-05-22 17:51:21 +02:00
artu30 b5d3893c41 Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev' 
# Conflicts:
#   pandora_console/include/javascript/pandora_visual_console.js
 2017-05-22 17:38:49 +02:00
Arturo Gonzalez f58a9151f7 Fixed bad merge, thx branches 2017-05-22 17:37:21 +02:00
Arturo Gonzalez 309e9e900e Added margin top value to images when have lines 2017-05-22 17:31:29 +02:00
vgilc 6bded36a60 Merge branch '599-csv_divider_selector' into 'develop' 
599 csv divider selector

See merge request !359
 2017-05-22 17:11:52 +02:00
artica 3b6272a7d2 Auto-updated build strings. 2017-05-22 00:01:14 +02:00
artica 7d7d5a9cec Auto-updated build strings. 2017-05-21 00:01:52 +02:00
artica 7749e7c08a Auto-updated build strings. 2017-05-20 00:01:16 +02:00
enriquecd 3e230572ad Change permission filter for module bulk operations, PM change to AW - #902 2017-05-19 14:58:34 +02:00
enriquecd 61eb5e755e Fix insert data extension, bad parameters in xml format - #869 2017-05-19 14:00:47 +02:00
Arturo Gonzalez 16fe10d1af Added fullscale to boolean charts. Continue with the tests. 2017-05-19 12:04:54 +02:00
enriquecd bb0eec8883 Update en_GB translations - #886 2017-05-19 11:44:12 +02:00
enriquecd 57393eb9cf Fix logout bad permission with myslq service stopped dialog - #825 2017-05-19 11:12:58 +02:00
Hirofumi Kosaka 5807e55459 Modified SNMP Console to prefer agent aliases as SNMP agent if registered. #149 2017-05-19 16:49:54 +09:00
artica 8d16f573cc Auto-updated build strings. 2017-05-19 00:01:19 +02:00
enriquecd eb79a70b24 No unselect elements when click over vconsole settings key - #852 2017-05-18 18:31:24 +02:00
Arturo Gonzalez 913aa4334b Save work and continue with more tests 2017-05-18 17:06:49 +02:00
Arturo Gonzalez 8141dac798 Added date format to long periods of time 2017-05-18 17:01:15 +02:00
vgilc f56587e11c Merge branch '851-module-threshold-with-decimals-dev' into 'develop' 
Added float parser to module threshold

See merge request !460
 2017-05-18 16:08:05 +02:00
Enrique Camargo 2ccd799cbd Merge branch 'develop' into '825-La-pantalla-de-login-con-mysql-parado/no-configurado-no-se-ve-correctamente' 
# Conflicts:
#   pandora_console/general/login_page.php
 2017-05-18 15:23:20 +02:00
enriquecd c4ffd0257f Free search input in event list view filter also by custom_data - #311 2017-05-18 14:59:17 +02:00
vgilc 10e6153574 Merge branch '805-change-tip-icon-in-trap-editor-dev' into 'develop' 
Added new help tip icon to snmp console

See merge request !443
 2017-05-18 10:00:31 +02:00
Junichi Satoh 9d59f4cf2a Updated help. 2017-05-18 14:26:24 +09:00
artica 15b65ef3f8 Auto-updated build strings. 2017-05-18 00:01:18 +02:00
vgilc 19a76701a3 Merge branch '813-Footer-no-muestra-la-versión-correctamente' into 'develop' 
Show package version rather build version in footer (ext. fix update manager css) - #813

See merge request !454
 2017-05-17 17:51:25 +02:00
vgilc 4cee2eaea8 Merge branch '836-bad-parents-line-position-in-visual-console-dev' into 'develop' 
836 bad parents line position in visual console dev

See merge request !448
 2017-05-17 17:48:53 +02:00
vgilc e89be76e61 Merge branch 'fixed-graphs-styles' into 'develop' 
Fixed graphs styles Gitlab: #537

See merge request !283
 2017-05-17 17:45:55 +02:00
vgilc ab51561ecf Merge branch 'Barra-de-scroll-en-ventana-de-error-de-permisos-de-config.php' into 'develop' 
Not show scroll bar in config permission error dialog in index - #728

See merge request !385
 2017-05-17 17:40:29 +02:00