Commit Graph

28335 Commits

Author SHA1 Message Date
Daniel Rodriguez b5802d41c7 Merge branch 'ent-7604-Vulnerabilidad-file-manager-images' into 'develop'
Fix vulnerability with directories created in upper levels

Closes pandora_enterprise#7604

See merge request artica/pandorafms!4158
2021-06-03 11:36:22 +00:00
marcos 8f243e8a3f restore fonts on vc 2021-06-03 12:28:50 +02:00
marcos 2de45a7eb8 Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global 2021-06-03 12:11:14 +02:00
marcos 56e70b0dcc restore fonts on vc 2021-06-03 12:10:59 +02:00
alejandro.campos@artica.es b8c6922902 minor fixes in report item 2021-06-03 12:04:25 +02:00
marcos b18635f94b restore fonts on vc 2021-06-03 11:38:52 +02:00
fbsanchez 423a46af8c Avoid mark as crashed satellite_server 2021-06-03 10:29:49 +02:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
marcos e75af2b8b6 more size leyends graphs meta 2021-06-03 08:22:40 +02:00
Daniel Barbero Martin 030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
alejandro.campos@artica.es 36eb084824 minor fixes 2021-06-02 19:02:25 +02:00
alejandro.campos@artica.es 84905a6579 minor fixes in report item 2021-06-02 18:39:33 +02:00
Daniel Barbero Martin ea90a61b06 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 18:27:15 +02:00
marcos 612cc8661e add 9pt font size 2021-06-02 17:34:08 +02:00
Jose Gonzalez 7895a82268 Fixed issue with types 2021-06-02 16:06:00 +02:00
Jose Gonzalez 897a98eab6 Handle directory paths for file upload 2021-06-02 13:17:34 +02:00
alejandro.campos@artica.es 9513386ff7 prevent nonadmin users from viewing admin users in pandora search 2021-06-02 12:47:55 +02:00
Daniel Rodriguez 2edc1c73a7 Merge branch 'ent-7432-giss-11799-modulos-deshabilitados-en-servicios' into 'develop'
Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted

See merge request artica/pandorafms!4166
2021-06-02 10:35:32 +00:00
fbsanchez f003c37b09 Changes in disabled method - Module class 2021-06-02 10:05:31 +02:00
marcos 802dc50b79 fixed error updating item reporting 2021-06-02 09:18:40 +02:00
alejandro.campos@artica.es 24990b26f3 minor fix for pdfs 2021-06-02 09:06:39 +02:00
Junichi Satoh 740a3b6d3e Fixed following problems.
- csv export of custom report with custom graph did not work correctly.
- number of users in default login screen was not correct with restricted user login.
2021-06-02 15:25:33 +09:00
Daniel Barbero Martin 18f414ce5b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 08:09:32 +02:00
artica 2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00
Daniel Barbero Martin 2f536c7577 Wip command center 2021-06-01 19:36:56 +02:00
alejandro.campos@artica.es 8492a7d1c9 created agents inventory report item 2021-06-01 18:05:45 +02:00
alejandro.campos@artica.es 59834088bf created agents inventory report item 2021-06-01 18:04:01 +02:00
Kevin a64360d25f Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-6280-firmar-instalador-de-agente-macos 2021-06-01 15:47:59 +02:00
Kevin 9ca770beb6 Merge branch 'master' of brutus.artica.es:artica/pandorafms into ent-6280-firmar-instalador-de-agente-macos 2021-06-01 15:47:39 +02:00
Kevin 0aef46e17d fixed files format 2021-06-01 15:45:50 +02:00
fbsanchez 70b8eb77a3 Remove service elements when removing items itselves and multiple fixes 2021-06-01 12:12:07 +02:00
fbsanchez a98a72354b Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted 2021-06-01 10:04:53 +02:00
alejandro.campos@artica.es 9cbe6a2924 created new report item 2021-06-01 09:43:55 +02:00
Daniel Barbero Martin ddc4b47d0b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-01 08:34:32 +02:00
artica b0e3b0aa24 Auto-updated build strings. 2021-06-01 01:00:09 +02:00
Daniel Barbero Martin a996c272e4 Wip command center 2021-05-31 17:32:53 +02:00
marcos e01f13d47f cambio de fuentes css 2021-05-31 15:09:44 +02:00
Daniel Barbero Martin 3a85c69043 Wip command center 2021-05-31 14:58:36 +02:00
Daniel Rodriguez 844f583b0c Merge branch 'ent-7596-ocultar-campos-http-auth-en-modulos-web' into 'develop'
Ocultar campos http auth en modulos web en campo Web Checks

See merge request artica/pandorafms!4162
2021-05-31 11:25:25 +00:00
alejandro.campos@artica.es 3362106afe added agents inventory report item 2021-05-31 13:13:25 +02:00
marcos fff37b5e00 cambio de fuentes css 2021-05-31 13:09:42 +02:00
marcos 0b8e721d34 resolve merge conflcit 2021-05-31 12:13:22 +02:00
marcos a44ca03046 cambio de fuentes css 2021-05-31 11:54:11 +02:00
marcos d81eb88ff3 cambio de fuentes css 2021-05-31 11:25:30 +02:00
Daniel Barbero Martin 33618af381 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-31 08:40:09 +02:00
artica ff3eb72420 Auto-updated build strings. 2021-05-31 01:00:34 +02:00
artica 20d3399d39 Auto-updated build strings. 2021-05-30 01:00:20 +02:00
artica ec8ffea249 Auto-updated build strings. 2021-05-29 01:00:10 +02:00
Daniel Barbero Martin 12e67380ee Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-28 14:37:20 +02:00