tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-06 17:48:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,402 Commits 34 Branches 30 Tags
Commit Graph

17573 Commits

Author SHA1 Message Date
fbsanchez
380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
fbsanchez
0ddc1929fa multiple fixes 2021-02-02 11:25:26 +01:00
artica
ff7516cd23 Auto-updated build strings. 2021-02-02 01:00:19 +01:00
fbsanchez
f4768b44fc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-02-01 15:38:19 +01:00
fbsanchez
712079c30e RC1 #4755 2021-02-01 15:00:54 +01:00
Daniel Maya
6a9587bff8 #4536 autocomplete = off by default 2021-02-01 13:54:57 +01:00
Daniel Rodriguez
231981bcc9 Merge branch 'ent-fix-special-day-related-api' into 'develop' 
Fixed wrong behavior of special_day related APIs.

See merge request artica/pandorafms!3787
 2021-02-01 13:41:20 +01:00
fbsanchez
96c218f21e Some updates and minor fixes DBMaintainer 2021-02-01 13:31:42 +01:00
marcos
9454ed2ff3 unsort template items 2021-02-01 12:11:39 +01:00
artica
466ebb8b6b Auto-updated build strings. 2021-02-01 01:00:15 +01:00
artica
705e1e4623 Auto-updated build strings. 2021-01-31 01:00:11 +01:00
artica
6871aaf358 Auto-updated build strings. 2021-01-30 01:00:19 +01:00
fbsanchez
04be237b7a minor method added 2021-01-29 14:30:16 +01:00
artica
750670ecf9 Auto-updated build strings. 2021-01-29 01:00:20 +01:00
fbsanchez
b8980c189c Schedule history db schema check after MR update 2021-01-28 18:50:55 +01:00
fbsanchez
dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-01-28 16:12:47 +01:00
fbsanchez
9fc3856f83 WIP historical database automaintenance + minor fixes 2021-01-28 13:20:36 +01:00
Daniel Rodriguez
147bac8e55 Merge branch 'ent-6126-add-csv-json-save-to-disk-console-task' into 'develop' 
Added CSV an JSON formats in console task report save to disk

See merge request artica/pandorafms!3613
 2021-01-28 10:23:22 +01:00
artica
ff80c974da Auto-updated build strings. 2021-01-28 01:00:18 +01:00
fbsanchez
dd4849f7c3 WIP Scheduled install & update of history database processes 2021-01-27 19:23:31 +01:00
fbsanchez
25b15182e3 DBH auto-updater 2021-01-27 15:48:00 +01:00
fbsanchez
d24bcd700d Merge remote-tracking branch 'origin/develop' into ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field 2021-01-27 14:08:41 +01:00
fbsanchez
bbab6d9fe1 WIP update process 2021-01-27 14:06:22 +01:00
fbsanchez
c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
Daniel Rodriguez
ccc10abc16 Merge branch 'ent-6643-show-summary-vmware' into 'develop' 
Ent 6643 show summary vmware

Closes pandora_enterprise#6643

See merge request artica/pandorafms!3611
 2021-01-27 11:20:36 +01:00
fbsanchez
12b76a03b1 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-01-27 10:12:27 +01:00
Luis Calvo
f2addc837a Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task 2021-01-27 09:25:12 +01:00
artica
096bcd1ed3 Auto-updated build strings. 2021-01-27 01:00:19 +01:00
fbsanchez
25fd59cc31 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-01-26 17:49:32 +01:00
Jose Gonzalez
26a788b2e9 Added control for max agents in groups 2021-01-26 12:35:08 +01:00
artica
7d69ad114d Auto-updated build strings. 2021-01-26 01:00:11 +01:00
fbsanchez
192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
Daniel Maya
312a08219c Added disable/enable for discovery task 2021-01-25 13:56:04 +01:00
Jose Gonzalez
38ea74ed11 Updated merge 2021-01-25 13:36:12 +01:00
fbsanchez
d9428ce215 WIP DBMainainer, fixed Websockets library placement 2021-01-25 13:33:02 +01:00
artica
831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Luis Calvo
84f3ead86a Added csv, json, xml formats to save report to disk task 2021-01-25 11:51:53 +01:00
Daniel Rodriguez
77dfba453a Merge branch 'ent-6505-FENIX-Conteo-vista-tactica-modulos-Performance-vs-Total' into 'develop' 
fixed count in tactical view

See merge request artica/pandorafms!3671
 2021-01-25 10:12:43 +01:00
Daniel Rodriguez
f92ba2ce3d Merge branch 'ent-6503-vista-tactica-numero-alertas' into 'develop' 
Modified query for show only available alerts

Closes pandora_enterprise#6503

See merge request artica/pandorafms!3672
 2021-01-25 10:11:25 +01:00
Daniel Rodriguez
e88ca95a8d Merge branch 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso' into 'develop' 
Ent 6631 bug en dashboard de usuario sin permiso

See merge request artica/pandorafms!3781
 2021-01-25 10:07:53 +01:00
Daniel Rodriguez
7a614fcf48 Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop' 
Ent 6354 bug de creacion de dashboard con permisos no all

See merge request artica/pandorafms!3780
 2021-01-25 10:02:41 +01:00
Daniel Rodriguez
7a9d928a98 Merge branch 'ent-6634-Bug-borrado-net-scan-scripts' into 'develop' 
fixed wrong error message: recon task is not necessarily linked to script

See merge request artica/pandorafms!3601
 2021-01-25 09:52:47 +01:00
Daniel Rodriguez
d4050ad0ce Merge branch 'ent-6855-Casca-netscan-custom-en-la-open' into 'develop' 
several fixes in netscan custom

See merge request artica/pandorafms!3736
 2021-01-25 09:50:27 +01:00
Daniel Rodriguez
713abb63e6 Merge branch 'ent-6786-error-componentes-remotos-dynamic' into 'develop' 
Added control for avoid null values in dynamic components

Closes pandora_enterprise#6786

See merge request artica/pandorafms!3670
 2021-01-25 09:27:23 +01:00
artica
82664be930 Auto-updated build strings. 2021-01-25 01:00:14 +01:00
artica
4be65955cb Auto-updated build strings. 2021-01-24 01:00:16 +01:00
artica
e03f02a093 Auto-updated build strings. 2021-01-23 01:00:18 +01:00
Luis Calvo
d98033ba92 Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task 2021-01-22 10:05:22 +01:00
artica
a700318815 Auto-updated build strings. 2021-01-22 01:00:18 +01:00
fbsanchez
bf453ab0ef Effective command preview (action) 2021-01-21 17:09:36 +01:00