27468 Commits

Author SHA1 Message Date
marcos
9023adb98c cambio de fuentes css 2021-06-08 17:53:33 +02:00
marcos
91e0750885 cambio de fuentes css 2021-06-08 17:05:36 +02:00
marcos
0c455c1941 cambio de fuentes css 2021-06-08 12:33:45 +02:00
marcos
8f4e4c8cc7 cambio de fuentes css 2021-06-08 10:55:48 +02:00
marcos
c7ed8b547a cambio de fuentes css 2021-06-08 10:46:32 +02:00
marcos
6412cd59e8 cambio de fuentes css 2021-06-08 09:45:46 +02:00
marcos
56c3f13c89 cambio de fuentes css 2021-06-08 09:31:18 +02:00
marcos
7882368eae Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global 2021-06-08 08:53:10 +02:00
artica
a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
marcos
9761018544 add mr changes and remove setup font token 2021-06-07 13:36:44 +02:00
marcos
ce2abf1fb5 add mr changes and remove setup font token 2021-06-07 13:32:56 +02:00
marcos
e1e5475f9c Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global 2021-06-07 08:55:10 +02:00
artica
bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica
656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica
2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
marcos
430d25a551 merge conflict 2021-06-04 13:21:41 +02:00
Daniel Rodriguez
9070ababed Merge branch 'ent-7472-errores-visuales-black-theme' into 'develop'
fixed visual error black theme

See merge request artica/pandorafms!4095
2021-06-04 11:03:35 +00:00
Marcos Alconada
3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Rodriguez
77b05de784 Merge branch 'ent-fix-bulk-alert-operations' into 'develop'
Fixed that restricted users can add/delete all alert templates using bulk alert operations.

See merge request artica/pandorafms!4171
2021-06-04 10:24:51 +00:00
Daniel Rodriguez
90a5a1c1a3 Merge branch 'ent-5785-Nuevo-informe-inventario-de-agentes' into 'develop'
Added new item type in reports

See merge request artica/pandorafms!4133
2021-06-04 09:03:32 +00:00
alejandro.campos@artica.es
c9edf8081c excluded report item from templates list 2021-06-04 10:50:06 +02:00
alejandro.campos@artica.es
70946af507 Merge remote-tracking branch 'origin/develop' into ent-5785-Nuevo-informe-inventario-de-agentes 2021-06-04 10:32:45 +02:00
Daniel Rodriguez
d11ddfe059 Merge branch 'ent-7342-Bug-en-busqueda-de-usuarios' into 'develop'
fixed bug in users search

See merge request artica/pandorafms!4085
2021-06-04 07:49:56 +00:00
Daniel Rodriguez
8aae3f79be Merge branch 'ent-7650-no-aparecen-graph-buttons' into 'develop'
Fixed missed buttons, improve code and added go back button when create-update

Closes pandora_enterprise#7650

See merge request artica/pandorafms!4169
2021-06-04 07:46:59 +00:00
Junichi Satoh
3563a99703 Fixed that restricted users can see all alert templates. 2021-06-04 16:01:16 +09:00
artica
8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Rodriguez
a12c692972 Merge branch 'ent-fix-custom-report' into 'develop'
Fixed custom report

See merge request artica/pandorafms!4167
2021-06-03 15:08:26 +00:00
Jose Gonzalez
08c945d91d Fixed missed buttons, improve code and added go back button when create-update 2021-06-03 15:37:11 +02:00
marcos
81c46b5d86 cambio de fuentes css 2021-06-03 14:07:08 +02:00
alejandro.campos@artica.es
fb5ecaeef4 minor fixes in report item 2021-06-03 13:49:10 +02:00
Daniel Rodriguez
5040b4b265 Merge branch 'ent-7602-XSS-nombre-consolas-visuales' into 'develop'
Improved code and fix xss vulnerability

Closes pandora_enterprise#7602

See merge request artica/pandorafms!4157
2021-06-03 11:37:15 +00:00
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
marcos
e75af2b8b6 more size leyends graphs meta 2021-06-03 08:22:40 +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
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
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
artica
2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00