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

667 Commits

Author SHA1 Message Date
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
Daniel Cebrian 9619854ba2 #12028 added secondary groups in tactical view 2023-09-12 16:35:45 +02:00
daniel 8e29973128 ITSM pandora_enterprise#11471 2023-09-12 13:10:23 +02:00
daniel 5093d54137 ITSM pandora_enterprise#11471 2023-09-11 18:14:32 +02:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/functions_menu.php
 2023-09-08 13:11:52 +02:00
daniel 3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00
Rafael Ameijeiras e3a5fe0fb6 Merge branch 'ent-10602-Inventory-Widget' into 'develop' 
Ent 10602 inventory widget

See merge request artica/pandorafms!6301
 2023-09-06 07:08:19 +00:00
Matias Didier 96c722b816 Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop' 
Ent 9814 nuego item graficas de capacity planning en dashboard

See merge request artica/pandorafms!6382
 2023-09-06 06:56:59 +00:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
alejandro.campos@artica.es 4b5bc0ea05 minor fix 2023-09-04 13:46:28 +02:00
Rafael Ameijeiras 6e60eeb09b Merge branch 'ent-11490-nuevo-widget-group-status-map' into 'develop' 
Ent 11490 Nuevo widget: group status map

See merge request artica/pandorafms!6252
 2023-09-04 07:05:49 +00:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Daniel Rodriguez aac8aa43fd Merge branch 'ent-11216-clonar-widget' into 'develop' 
Ent 11216 clonar widget

See merge request artica/pandorafms!6222
 2023-09-01 07:05:11 +00:00
Jonathan 1e22d473e6 #9814 projection graphs - module view & dashboard 2023-08-31 13:42:52 +02:00
Daniel Cebrian 075cc1d372 #11490 calculate font size in treemap 2023-08-31 13:39:52 +02:00
Gorka Sanchez 20a89db60b Merge branch 'ent-11809-error-de-colores-del-widget-event-cardboard-en-metaconsola' into 'develop' 
Ent 11809 error de colores del widget event cardboard en metaconsola

See merge request artica/pandorafms!6363
 2023-08-31 10:35:12 +00:00
Daniel Cebrian 13dbed4327 #11490 deleted name in treemap if it's empty and fixed bug in metaconsole 2023-08-30 12:37:34 +02:00
Pablo Aragon c61d6051b4 11952-Add event status in List of latest events 2023-08-29 12:43:33 +02:00
Daniel Cebrian dee5667783 Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-29 10:57:43 +02:00
Pablo Aragon cd430f9f3f 11952-Fix filters in List of latest events 2023-08-28 12:27:45 +02:00
Pablo Aragon 7b59035d1d 11809-Colors meta Event cardboard widget 2023-08-26 12:18:00 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' 
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
 2023-08-23 05:56:19 +00:00
alejandro.campos@artica.es 5624b8256c several changes 2023-08-22 10:29:58 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Rafael Ameijeiras 4b10cd4216 Merge branch 'ent-10946-enlaces-filtrando-por-estado-en-widget-general-group-status' into 'develop' 
Ent 10946 enlaces filtrando por estado en widget general group status

See merge request artica/pandorafms!6225
 2023-08-21 11:18:14 +00:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02:00
daniel dba0bbebeb ITSM pandora_enterprise#11471 2023-08-18 13:46:27 +02:00
Rafael Ameijeiras 9651177034 Merge branch 'ent-11059-mejora-visual-en-widget-top-n-eventos' into 'develop' 
Ent 11059 Mejora visual en widget Top-N Eventos

See merge request artica/pandorafms!6169
 2023-08-18 06:36:40 +00:00
daniel 1fecd7d289 ITSM pandora_enterprise#11471 2023-08-17 14:56:55 +02:00
Daniel Cebrian 484570aa4c #11490 fixed grouped by id in widget status map 2023-08-17 09:41:46 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
Daniel Cebrian 5ee4dbee87 #11490 added new widget group status map 2023-08-16 16:11:35 +02:00
daniel b1c662da67 ITSM pandora_enterprise#11471 2023-08-14 14:19:09 +02:00
daniel 64c7f56235 ITSM pandora_enterprise#11471 2023-08-14 10:59:56 +02:00
daniel f0d78a44d1 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2023-08-11 14:32:54 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +02:00
Daniel Cebrian 3b0d15b41c Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-11 12:26:24 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Daniel Cebrian 131f78e21e #11682 fixed special days calendar 2023-08-08 18:04:30 +02:00
alejandro.campos@artica.es 30784cc992 implemented inventory widget 2023-08-01 11:47:37 +02:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
alejandro.campos@artica.es 8fdc841254 Merge remote-tracking branch 'origin/develop' into ent-10602-Inventory-Widget 2023-08-01 09:58:37 +02:00
alejandro.campos@artica.es 78e76e1ad3 implemented inventory widget 2023-08-01 09:57:49 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Rafael Ameijeiras 39edfa48df Merge branch 'ent-11419-pequenos-cambios-en-widget-de-graficas-simples' into 'develop' 
Ent 11419 Pequeños cambios en widget de graficas simples

See merge request artica/pandorafms!6155
 2023-07-25 08:04:23 +00:00
Rafael Ameijeiras 6b3b98ac04 Merge branch 'ent-11480-widget-de-estado-de-grupos-no-deberia-mostar-grupos-vacios' into 'develop' 
Ent 11480 Widget de estado de grupos no deberia mostar grupos vacios

See merge request artica/pandorafms!6152
 2023-07-24 10:54:24 +00:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00