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

919 Commits

Author SHA1 Message Date
Pablo Aragon 9bc0b4c050 13281-Fix overflow in Defined custom graph widget 2024-04-02 11:41:47 +02:00
Pablo Aragon a9f161e2c2 Merge branch 'develop' into ent-13100-desplegable-de-iconos-en-wizard-de-visual-consoles-tiene-demasiado-espacio 2024-04-02 10:18:52 +02:00
daniel ac3f6720ed update endpoints and add new fields integration pandoraitsm pandora_enterprise#13004 2024-04-01 16:43:47 +02:00
daniel 8e0af02e54 update endpoints and add new fields integration pandoraitsm pandora_enterprise#13004 2024-04-01 08:19:42 +02:00
daniel 9dfc052e2f Merge remote-tracking branch 'origin/develop' into ent-13004-mejorar-sincronizacion-agentes-inventario-pandora-itsm 
Conflicts:
	pandora_console/godmode/setup/setup_ITSM.php
 2024-04-01 08:06:35 +02:00
Jose Martin 9ebb72e55e Merge branch 'ent-13044-porcentaje-de-agentes-habilitados-deshabilitados-en-open' into 'develop' 
Ent 13044 porcentaje de agentes habilitados deshabilitados en open

See merge request artica/pandorafms!7017
 2024-03-26 11:35:02 +00:00
daniel 568cd09d07 update endpoints and add new fields integration pandoraitsm pandora_enterprise#13004 2024-03-19 19:24:43 +01:00
daniel 75f416ae50 update endpoints and add new fields integration pandoraitsm pandora_enterprise#13004 2024-03-19 19:21:54 +01:00
Jonathan cac66629c6 #13044 change enable for disabled message 2024-03-18 09:52:41 +01:00
daniel ae1f586971 Bug acl apiv2 pandora_enterprise#13065 2024-03-13 14:24:29 +01:00
Jonathan c1bfeb93f5 #13044 overview no show 0% 2024-03-13 11:10:49 +01:00
daniel 7db8c17823 api change path v1 to v2 pandora_enterprise#13019 2024-03-13 09:07:58 +01:00
Daniel Maya 64d2c52d95 #12714 Fixed traslations 2024-03-12 10:01:07 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-02-27 17:27:10 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop' 
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
 2024-02-22 16:21:32 +00:00
Rafael Ameijeiras 40d612f22a Merge branch 'ent-12883-Widget-general-visual-maps-report-aparecen-entities' into 'develop' 
fix entities

See merge request artica/pandorafms!6938
 2024-02-21 15:24:28 +00:00
Daniel Maya ef3bfb35f0 #12350 resolved conflict 2024-02-16 09:25:55 +01:00
Jonathan e6e98aeb39 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-15 09:08:25 +01:00
alejandro.campos@artica.es 5dbf868460 fix entities 2024-02-14 17:37:10 +01:00
alejandro.campos@artica.es b00bb507b6 fix entities 2024-02-14 14:02:31 +01:00
Enrique Martin cb63c27d2a Merge branch 'ent-12687-sistema-import-export-prd' into 'develop' 
Ent 12687 sistema import export prd

See merge request artica/pandorafms!6874
 2024-02-14 12:11:16 +00:00
Enrique Martin 9733ac8717 Set consecutive keys for dashboard items array. Fix JS error when printing imported dashboard 2024-02-13 11:53:35 +01:00
Jonathan 7f580cc388 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-13 09:42:00 +01:00
daniel 0f6fab06fb new api 2.0 2024-02-12 09:49:44 +01:00
daniel 851b046add Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-12 08:05:36 +01:00
daniel 6a7dd0de9b new api 2.0 2024-02-09 10:53:32 +01:00
Rafael Ameijeiras 140ed1c304 Merge branch 'ent-12321-widget-mapa-gis' into 'develop' 
Ent 12321 widget mapa gis

See merge request artica/pandorafms!6835
 2024-02-09 09:23:42 +00:00
Rafael Ameijeiras 4cdea9d8ef Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop' 
Ent 12460 Cientos de errores en el log de apache

See merge request artica/pandorafms!6748
 2024-02-09 09:22:48 +00:00
daniel d7172a5308 new api 2.0 2024-02-08 15:32:58 +01:00
Jonathan 56e26ab3d5 #12695 wip removing warnings 2024-02-08 13:42:02 +01:00
Jonathan 9084a34514 #12695 wip removing warnings 2024-02-08 12:31:55 +01:00
daniel 5ff79dc550 new api 2.0 2024-02-08 12:23:56 +01:00
Daniel Maya 8524e7ba31 Merge branch 'develop' into ent-12321-widget-mapa-gis 2024-02-08 09:34:32 +01:00
Jonathan 2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
daniel 510e8452cf new api 2.0 2024-02-07 15:44:53 +01:00
Jonathan 834635a487 Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-07 10:39:47 +01:00
daniel 8cfb04d243 new api 2.0 2024-02-07 08:53:54 +01:00
daniel 54e4b8dbfa new api 2.0 2024-02-02 09:15:00 +01:00
daniel 80b9fc9af1 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-31 14:22:59 +01:00
daniel 0d87b18898 new api 2.0 2024-01-31 13:17:46 +01:00
daniel 280e5e5a97 new api 2.0 2024-01-31 11:56:11 +01:00
Matias Didier 66eda7368d Merge branch 'ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada' into 'develop' 
Ent 12034 Enlace público de dashboard que ha sido borrado no muestra nada

See merge request artica/pandorafms!6828
 2024-01-31 08:21:45 +00:00
Daniel Cebrian d4ceb1ac4d Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 17:11:30 +01:00
daniel 3c3ff1a2e6 new api 2.0 2024-01-30 16:27:02 +01:00
Daniel Cebrian 2531de8cb0 #12034 fixed page not access when dashboard is deleted 2024-01-30 14:58:04 +01:00
Daniel Cebrian b28c97b9b7 Merge branch 'develop' into ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada 2024-01-30 13:25:58 +01:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
Daniel Cebrian c0ad547625 #12460 fixed deprecated 2024-01-30 13:14:54 +01:00
daniel df1d2675ed Merge remote-tracking branch 'origin' into ent-12019-api-2-0 2024-01-30 08:13:47 +01:00
Daniel Cebrian 22598b4bc2 #12460 fixed deprecated 2024-01-29 17:31:19 +01:00