Commit Graph

405 Commits

Author SHA1 Message Date
vgilc 5668857914 Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop'
2479 errores en vista de alertas de meta

See merge request artica/pandorafms!1821
2018-10-02 15:37:08 +02:00
alejandro-campos 1c2743797e Revert "fixed conflict"
This reverts commit 1d726d59f3.
2018-10-01 18:16:55 +02:00
alejandro-campos 1d726d59f3 fixed conflict 2018-10-01 15:34:36 +02:00
alejandro-campos 6b14754137 fixed conflict 2018-10-01 15:30:43 +02:00
vgilc 706a3ca4c0 Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop'
fixed bug in meta alert view: action field (other than default) not showing

See merge request artica/pandorafms!1621
2018-10-01 14:45:16 +02:00
alejandro-campos 0c899f5078 Merge branch 'develop' into 2479-Errores-en-vista-de-alertas-de-meta
Conflicts:
	pandora_console/include/functions_ui.php
2018-10-01 14:03:30 +02:00
vgilc 62dcf0f342 Merge branch '2459_No_se_ve_el_icono_por_defecto_del_widget_de_bienvenida' into 'develop'
Fixed welcome icone

See merge request artica/pandorafms!1640
2018-10-01 12:38:49 +02:00
vgilc ad5581f0c2 Merge branch '2491-Alert-view-meta' into 'develop'
fixed bug in meta alert view: agent names not showing in table

See merge request artica/pandorafms!1618
2018-09-28 10:39:52 +02:00
Alejandro Gallardo Escobar 1de746ab69 Fixed a problem with the autocomplete agent cache 2018-08-17 15:03:24 +02:00
fermin831 18800feaae Refactorized snapshot link on node 2018-08-02 13:02:33 +02:00
vgilc fcda8f56f9 Merge branch '2460-tu-zona-horaria-es-distinta-pero-igual' into 'develop'
fixed bug: when system timezone is equal to your timezone, dont show the…

See merge request artica/pandorafms!1645
2018-08-01 15:20:08 +02:00
alejandro-campos 443b70c39d fixed bug: when system timezone is equal to your timezone, dont show the different timezones warning 2018-07-30 16:25:38 +02:00
daniel d740240a51 fixed error data string show 2018-07-27 14:07:02 +02:00
samucarc 21db360ab8 Fixed welcome icone 2018-07-26 17:44:31 +02:00
daniel 3985316a9b fixed errors in policies metaconsole 2018-07-26 12:41:09 +02:00
fermin831 cb0351de99 Fixed question mark hel header meta 2018-07-20 12:29:34 +02:00
alejandro-campos b5c378d589 fixed bug in meta alert view: action field (other than default) not showing 2018-07-19 13:55:16 +02:00
alejandro-campos 5258d69e7e fixed bug in meta alert view: agent names not showing in table 2018-07-18 17:44:18 +02:00
daniel 2c9a613f1b fixed visual erros in metapolicies 2018-07-13 12:30:18 +02:00
Alejandro Gallardo Escobar a258dc7e43 Fixed a message 2018-06-12 10:04:33 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 1391f8cc11 [Rebranding] Fixed get header logo on metaconsole 2018-05-29 12:45:08 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
2018-05-22 19:29:46 +02:00
fermin831 946e897db6 [Rebranding] Get the correct header logo in the metaconsole 2018-05-22 15:26:11 +02:00
fermin831 2e8e3c27b6 [Rebranding] Modified tinylogo by custom_logo in node 2018-05-22 13:40:23 +02:00
Fermin 8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
Fermin 0d6115726a [Rebranding] Open include root files (except networkmaps related sources) 2018-05-11 12:49:16 +02:00
fermin831 57fb63bd91 Fixed snapshots view in string data 2018-05-07 19:40:38 +02:00
fermin831 a8cb366508 [Alerts view] Fixed validation in alerts view 2018-03-14 17:24:34 +01:00
fermin831 74f899736f [Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work 2018-03-12 15:17:59 +01:00
fermin831 e37768097f [Visual] Refixed help images on node 2018-02-28 12:16:43 +01:00
fermin831 6093f6a0d8 [Metaconsole] Fixed img broken links on metaconsole 2018-02-28 12:08:15 +01:00
danielmaya c54090a614 Fixed messages in warning popup 2018-01-05 11:32:16 +01:00
enriquecd 516c3b8d47 Fix pagination - #1728 2017-12-21 17:01:19 +01:00
enriquecd e902baaf9d Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574 2017-11-16 12:46:19 +01:00
Arturo Gonzalez eb39d25c4b Added field to get string modules 2017-11-10 15:03:52 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop'
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
2017-11-06 17:41:45 +01:00
Alejandro Gallardo Escobar 83becb3e80 [Console] Fixed an error into the 'ui_print_truncate_text' function 2017-11-06 15:18:55 +01:00
Arturo Gonzalez 50e7e5fc17 Added changes to sort json in ajax return 2017-10-31 16:39:58 +01:00
Alejandro Gallardo Escobar c687e6a97b [Console] Fixed an XSS vulnerability into the 'ui_print_truncate_text' function 2017-10-27 13:25:27 +02:00
daniel 4430a7b2fe fixed errors in autocomplete field 2017-09-05 12:35:21 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
daniel fe2a2a36e8 fixed minor errors in WUX 2017-08-30 16:09:11 +02:00
Arturo Gonzalez 0eabf7a0ce Do the autocomplete field correct 2017-08-30 15:52:28 +02:00
daniel 9c141c9049 fixed errors wux 2017-08-23 17:21:15 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00