tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,499 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

27499 Commits

Author SHA1 Message Date
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
Daniel Barbero Martin ea90a61b06 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 18:27:15 +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
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
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
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
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
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
Daniel Barbero Martin d88520f752 Wip command center 2021-05-28 14:32:41 +02:00
Daniel Rodriguez 9f57b02295 Merge branch 'ent-7002-Revision-cabeceras-codigo-faltante' into 'develop' 
Fixed code

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4161
 2021-05-28 12:31:14 +00:00
Calvo b253a01841 Ocultar campos http auth en modulos web en campo Web Checks 2021-05-28 14:00:43 +02:00
Jose Gonzalez cf358341fb Fixed issue with css file in meta 2021-05-28 13:47:14 +02:00
Jose Gonzalez 84902a5d3d Fixed code 2021-05-28 13:20:16 +02:00
Daniel Rodriguez 2eb85562c2 Merge branch 'ent-7468-campo-plugin-falla-bandwith-politicas' into 'develop' 
Fixed issue with id_plugin with bandwidth modules

Closes pandora_enterprise#7468

See merge request artica/pandorafms!4159
 2021-05-28 10:38:21 +00:00
Daniel Rodriguez b75b55c0a5 Merge branch 'ent-7310-vista-de-transaccional-maps-con-varios-errores-visuales' into 'develop' 
fixed visual error on tm

See merge request artica/pandorafms!4041
 2021-05-28 09:14:20 +00:00
Daniel Barbero Martin 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
marcos 29f1a8a720 resolve merge conflcit 2021-05-28 08:10:14 +02:00
artica 059b14dbf6 Auto-updated build strings. 2021-05-28 01:00:43 +02:00
José González 91e870edbc Fixed issue with id_plugin with bandwidth modules 2021-05-27 22:06:58 +02:00
Daniel Rodriguez 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
Luis db306a30b9 Fixed report exception item with not ok on meta 2021-05-27 16:23:20 +00:00
Daniel Rodriguez be77599c07 Merge branch 'ent-7337-tree-view-os-no-aparecen-not-init-modules' into 'develop' 
Fixed not showing agents with not init modules on os treeview

See merge request artica/pandorafms!4120
 2021-05-27 16:22:47 +00:00
Luis cb6f130ab0 Fixed not showing agents with not init modules on os treeview 2021-05-27 16:22:47 +00:00
Daniel Rodriguez 791f007ff6 Merge branch 'ent-7502-11735-problemas-visuales-tema-oscuro' into 'develop' 
fixed visual error on alerts black theme

See merge request artica/pandorafms!4113
 2021-05-27 16:22:19 +00:00
Marcos Alconada e2cfc5d615 fixed visual error on alerts black theme 2021-05-27 16:22:19 +00:00
Daniel Rodriguez 3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop' 
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
 2021-05-27 16:21:48 +00:00
Daniel Rodriguez 0808960537 Merge branch 'ent-7259-tabla-tickets-integria-descompensada' into 'develop' 
Integria tickets table visual fix

See merge request artica/pandorafms!4003
 2021-05-27 16:21:17 +00:00
Luis 6681d9fd67 Integria tickets table visual fix 2021-05-27 16:21:17 +00:00
Daniel Rodriguez c2314717e3 Merge branch 'ent-7467-wizard-snmp-falla-para-modulos-que-usen-braa' into 'develop' 
Ent 7467 wizard snmp falla para modulos que usen braa

See merge request artica/pandorafms!4139
 2021-05-27 16:19:08 +00:00
Daniel Rodriguez f93ff84123 Merge branch 'ent-7474-boton-descolocado-en-modal-de-update-online-open' into 'develop' 
fixed visual error with update manager online open

See merge request artica/pandorafms!4105
 2021-05-27 16:17:47 +00:00
Marcos Alconada 87dd11f99c fixed visual error with update manager online open 2021-05-27 16:17:47 +00:00
marcos 94cd396072 changed button position 2021-05-27 15:49:20 +02:00
Sergio Gómez 44656b9d65 Merge branch 'ent-7607-cambio-mensajeria' into 'develop' 
API errors fixed, some typos fixed

See merge request artica/pandorafms!4155
 2021-05-27 11:28:49 +00:00
Ártica bda83046c9 API errors fixed, some typos fixed 2021-05-27 13:19:28 +02:00
marcos 403f326f55 resolve merge conflcit 2021-05-27 09:57:06 +02:00
Daniel Barbero Martin a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
artica 9103f671e2 Auto-updated build strings. 2021-05-27 01:00:43 +02:00
fbsanchez 50242d3030 OID fixes while retrieving from remote Satellite server 2021-05-26 17:55:30 +02:00