2616 Commits

Author SHA1 Message Date
Daniel Rodriguez
3ab921acbb Merge branch 'ent-7950-errores-en-log-viewer' into 'develop'
Ent 7950 errores en log viewer

See merge request artica/pandorafms!4383
2021-10-05 09:29:24 +00:00
Jose Gonzalez
5eb66e5c6e Fixed issue with node actions 2021-10-01 14:05:41 +02:00
fbsanchez
d322d23203 WIP NCM 2021-09-30 19:10:45 +02:00
Jose Gonzalez
8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Luis
849ce30da5 Update pandora_networkmap.view.php 2021-09-28 08:50:00 +00:00
Calvo
90ac62c0cc Fix recursion on networkmap nodes 2021-09-27 16:14:07 +02:00
Jose Gonzalez
de1bf03976 Clean logs 2021-09-23 17:19:47 +02:00
Jose Gonzalez
5b40a4f700 Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-23 08:50:50 +02:00
Daniel Maya
61fb2e102b #7950 Fixed last_contact 3 2021-09-22 16:39:34 +02:00
Daniel Rodriguez
126030261b Merge branch 'ent-7969-Etiquetas-HTML-en-módulos-de-wizard-Consolas-Visuales' into 'develop'
Ent 7969 etiquetas html en módulos de wizard consolas visuales

See merge request artica/pandorafms!4394
2021-09-22 09:01:17 +00:00
Jose Gonzalez
3af47c0e5f Open network maps 2021-09-17 10:45:01 +02:00
Daniel Maya
240caa3ad1 #7969 Fixed span with truncate 2021-09-08 12:14:03 +02:00
Daniel Maya
24670da399 #7950 Fixed last_contact 2 2021-09-07 14:47:54 +02:00
Jose Gonzalez
bb743cb87f Fixed forget metaconsole alerts 2021-09-06 14:08:24 +02:00
Daniel Maya
5bf70f876c #7950 Fixed last_contact 2021-09-02 16:12:46 +02:00
Daniel Rodriguez
8397f778b3 Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop'
add not option in monitor detail filter

See merge request artica/pandorafms!4112
2021-09-01 08:54:49 +00:00
marcos
80f4e25b92 change first option value when not_condition its enabled 2021-08-30 11:19:53 +02:00
Daniel Rodriguez
a89faed47c Merge branch 'ent-7823-interfaces-view-no-calcula-bien-last-data' into 'develop'
Fixed issue with last_data obtain

Closes pandora_enterprise#7823

See merge request artica/pandorafms!4338
2021-08-27 10:46:39 +00:00
marcos
2ed657c166 updates 2021-08-26 12:42:16 +02:00
marcos
24a66f0173 updates 2021-08-24 13:30:50 +02:00
marcos
4d270a3559 set first option select2 all to none if not condition is enabled 2021-08-23 09:52:42 +02:00
marcos
61409b72b4 Merge remote-tracking branch 'origin/develop' into ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail 2021-08-23 08:52:17 +02:00
Daniel Maya
9488ce873b #7887 Fixed xss in massive modules 2021-08-19 12:57:16 +02:00
Calvo
fcbd69c603 Deleted js traces 2021-08-12 14:16:25 +02:00
fbsanchez
034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez
2224709814 Merge branch 'ent-7543-11772-command-snapshot-view-fondo-blanco-en-tema-oscuro' into 'develop'
se command sanpshot black theme

See merge request artica/pandorafms!4232
2021-08-06 12:57:05 +00:00
Daniel Rodriguez
2963d67225 Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop'
Improve code for get secondary groups

Closes pandora_enterprise#7767

See merge request artica/pandorafms!4259
2021-08-02 07:18:02 +00:00
José González
b23aafdf03 Fixed issue with last_data obtain 2021-07-30 12:35:08 +02:00
Calvo
a8c0ba8e78 Include modules not init in total monitors count on tactical view 2021-07-19 13:20:00 +02:00
José González
a9075463ac Missed change 2021-07-02 13:48:59 +02:00
fbsanchez
760522aeff Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 11:03:09 +02:00
marcos
26acac191f ad not condition on monitor detail 2021-06-25 09:37:26 +02:00
fbsanchez
36e455e5c5 Fixes for agent_module widget 2021-06-23 18:00:54 +02:00
marcos
fafcef7e85 se command sanpshot black theme 2021-06-23 17:35:16 +02:00
fbsanchez
76fbf75572 Fix for filtering common modules 2021-06-23 14:31:42 +02:00
fbsanchez
be09c1c64d Some changes, multibox fixes for metaconsole 2021-06-23 14:24:16 +02:00
fbsanchez
9fb7074082 minor fix 2021-06-22 19:44:41 +02:00
fbsanchez
390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
fbsanchez
fc0b605cee Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-21 12:13:46 +02:00
fbsanchez
1f34cf8596 Massive operation over service elements 2021-06-18 15:36:52 +02:00
marcos
56b6418716 add not condition filter 2021-06-17 15:04:21 +02:00
marcos
dff7220be9 add not condition filter 2021-06-17 14:59:43 +02:00
marcos
0cfb7c994f fixed merge conflict 2021-06-14 11:02:57 +02:00
marcos
ee4a3dc450 fixed merge conflict 2021-06-14 10:52:50 +02:00
marcos
5162864b28 fixed merge conflict 2021-06-14 09:03:17 +02:00
marcos
0ab343e672 merge conflict 2021-06-14 08:26:33 +02:00
fbsanchez
ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada
665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin
a9864f7d87 Wip command center, clean functions db 2021-06-10 08:45:50 +02:00
Daniel Rodriguez
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