841842da59
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb_data.sql
2021-06-16 08:46:21 +02:00
5b1498e08c
Wip command center, Plugins in meta
2021-06-15 17:40:48 +02:00
64dd4f2c2b
Wip command center, Plugins in meta
2021-06-15 17:24:03 +02:00
04e2919497
Avoid using old data when parsing progress
2021-06-15 14:43:11 +02:00
94cd4c96dd
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/javascript/pandora_ui.js
2021-06-14 17:37:01 +02:00
2e5073e1ba
new background image UM
2021-06-14 16:12:48 +02:00
42274e7252
changed UM image background
2021-06-14 13:31:37 +00:00
cdad04f9cd
Update the DB schema when upgrading from RPMs.
...
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
ae34209f52
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 21:45:50 +02:00
665efa4fb7
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-10 08:19:11 +00:00
9e27843b19
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 08:51:48 +02:00
4b819360ff
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
...
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
d58e9f634a
Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
...
Ent 7519 cambio de fuentes en la consola a nivel global
See merge request artica/pandorafms!4132
2021-06-09 13:59:29 +00:00
2334eccd01
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-09 13:59:28 +00:00
95832cd071
Merge branch 'ent-7652-iconos-para-black-theme' into 'develop'
...
changed icons for black theme
See merge request artica/pandorafms!4186
2021-06-09 13:12:47 +00:00
8814b1f971
changed icons for black theme
2021-06-09 13:12:47 +00:00
73f54c3375
Merge branch 'ent-7661-Error-500-al-editar-las-opciones-avanzadas-de-un-informe' into 'develop'
...
fixed bug
See merge request artica/pandorafms!4185
2021-06-09 12:37:59 +00:00
13850e52d5
fixed bug
2021-06-09 10:41:45 +02:00
5fcf3eca23
Fixed problems in planned downtime below.
...
- modules cannot be added to defined planned downtime with 'Quiet' mode.
- pending modules for delete can be selected when modify defined planned downtime.
2021-06-08 14:43:43 +09:00
c0103367fd
Wip command center, masive edit operations
2021-06-07 13:38:07 +02:00
835aad542f
Wip command center, agent synch
2021-06-07 12:19:03 +02:00
8b7c5c08c6
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-07 08:32:15 +02:00
3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00:00
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
da6c75f5b0
Wip command center, alerts SNMP broken
2021-06-04 11:34:12 +02:00
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
70946af507
Merge remote-tracking branch 'origin/develop' into ent-5785-Nuevo-informe-inventario-de-agentes
2021-06-04 10:32:45 +02:00
3563a99703
Fixed that restricted users can see all alert templates.
2021-06-04 16:01:16 +09:00
ca59034cf3
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-04 08:13:20 +02:00
08c945d91d
Fixed missed buttons, improve code and added go back button when create-update
2021-06-03 15:37:11 +02:00
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
b8c6922902
minor fixes in report item
2021-06-03 12:04:25 +02:00
97595ad973
Wip command center
2021-06-03 10:16:29 +02:00
36eb084824
minor fixes
2021-06-02 19:02:25 +02:00
84905a6579
minor fixes in report item
2021-06-02 18:39:33 +02:00
ea90a61b06
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-02 18:27:15 +02:00
897a98eab6
Handle directory paths for file upload
2021-06-02 13:17:34 +02:00
59834088bf
created agents inventory report item
2021-06-01 18:04:01 +02:00
70b8eb77a3
Remove service elements when removing items itselves and multiple fixes
2021-06-01 12:12:07 +02:00
9cbe6a2924
created new report item
2021-06-01 09:43:55 +02:00
ddc4b47d0b
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-01 08:34:32 +02:00
a996c272e4
Wip command center
2021-05-31 17:32:53 +02:00
3a85c69043
Wip command center
2021-05-31 14:58:36 +02:00
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
3362106afe
added agents inventory report item
2021-05-31 13:13:25 +02:00
12e67380ee
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-28 14:37:20 +02:00
b253a01841
Ocultar campos http auth en modulos web en campo Web Checks
2021-05-28 14:00:43 +02:00
84902a5d3d
Fixed code
2021-05-28 13:20:16 +02:00
8c7654cd2d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/godmode/setup/os.php
pandora_console/include/styles/pandora.css
pandora_console/operation/users/user_edit.php
2021-05-28 08:26:19 +02:00
0b158028f3
Merge branch 'ent-7560-item-de-excxeption-no-funciona-en-metaconsola-con-not-ok' into 'develop'
...
Fixed report exception item with not ok on meta
See merge request artica/pandorafms!4143
2021-05-27 16:23:20 +00:00
Daniel Barbero Martin
fbsanchez
marcos
Marcos Alconada
Daniel Rodriguez
alejandro.campos@artica.es
Junichi Satoh
Jose Gonzalez
Calvo