Commit Graph

242 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 584a31147f fixed link 2023-11-10 11:46:13 +01:00
Matias Didier ca8d0ed7f8 Merge branch 'ent-12376-problemas-vistos-en-la-nueva-vista-tactica' into 'develop'
Ent 12376 Problemas vistos en la nueva vista táctica

See merge request artica/pandorafms!6628
2023-11-08 13:36:10 +00:00
Daniel Cebrian 7223423dc7 #12376 fixed color group and fixed status color in heatmap 2023-11-08 13:15:05 +01:00
Daniel Cebrian 8f8e5ecf45 #12376 multiple changes in general tactical view 2023-11-07 13:18:44 +01:00
daniel 718cf41098 Fix btn csv datatables pandora_enterprise#12370 2023-11-03 12:16:54 +01:00
Jonathan 0e61cb243b Merge branch 'develop' into ent-12271-ventana-informativa-de-configuracion-de-widget-esta-pocha 2023-11-02 11:46:37 +01:00
Jonathan e403741b99 #12271 styles widget message dashboard 2023-11-02 08:27:11 +01:00
Jonathan 75aa715805 #12269 widget type on title at config/edit 2023-10-24 09:20:42 +02:00
Daniel Cebrian 9babe9df4e Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-10-23 16:35:55 +02:00
Jonathan 4d5917e4b7 #12269 widget editor title name widget 2023-10-23 14:56:09 +02:00
Daniel Cebrian dbf315e407 #10983 revised widgets with intervals 2023-10-23 14:48:34 +02:00
Jonathan 10fcf9fdb3 #12271 style dashboard widgets 2023-10-20 13:00:02 +02:00
Daniel Cebrian 4d9679648d Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-10-20 09:59:05 +02:00
Daniel Cebrian 17f761afbe #10194 fixed policies in open 2023-10-17 12:49:53 +02:00
Daniel Cebrian af0d311e1c #10194 fixed black theme 2023-10-17 09:40:50 +02:00
Daniel Cebrian d54a6faede #10194 adjust bars 24 hrs in events and changed numbers 2023-10-16 20:47:47 +02:00
miguel angel rasteu 1c1d2cf1c1 #12208 Improve widget html editor 2023-10-10 16:35:36 +02:00
Daniel Cebrian a02482ac5d #10194 added links 2023-10-10 15:15:43 +02:00
Daniel Cebrian 2c352ad9dd #10194 new graph for license and changes in design 2023-10-09 19:04:01 +02:00
Daniel Cebrian 5ea3e47264 #10194 added acl 2023-10-09 16:42:39 +02:00
Daniel Cebrian f48e83da01 #10194 added acl 2023-10-06 14:43:54 +02:00
Daniel Cebrian 44c654cdb4 #10194 added acl 2023-10-06 11:48:47 +02:00
Daniel Cebrian 1a89761727 #10194 adjust max height divs 2023-10-05 18:15:33 +02:00
Daniel Cebrian e64eadcb37 #10194 hide widget not activated 2023-10-03 10:31:57 +02:00
Daniel Cebrian 438cb11f95 #10194 added automonitoritation modules and interval refresh async 2023-10-02 16:44:53 +02:00
Daniel Cebrian b8df74dace Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-09-28 16:22:58 +02:00
Daniel Cebrian 9f5836e2cc #10194 new sections in general tactical view 2023-09-28 16:10:57 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
2023-09-28 10:05:15 +00:00
Daniel Cebrian 0fdbefa7ee #10194 first section drawed 2023-09-25 13:52:28 +02:00
Daniel Cebrian 7c201d2855 #10194 new structure for general tactical view 2023-09-21 17:58:18 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
miguel angel rasteu 2c98ee5628 #12036 Fix duplicate widget 2023-09-18 09:09:52 +02:00
Jorge Rincon 0e59b56b22 Added functionality that allows you to filter table information. 2023-09-15 12:34:25 +02:00
daniel 09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
miguel angel rasteu 3327d79ed6 #11442 Change Welcome tips arrows and buttons 2023-09-06 09:35:12 +02:00
Daniel Cebrian d8e0df1912 #10983 new function for get date parameter and added parent date in dashboard 2023-09-06 08:52:46 +02:00
daniel a059f18b4b ITSM pandora_enterprise#11471 2023-09-04 16:36:58 +02:00
miguel angel rasteu dc520df039 #9946 Fix delete and copy 2023-09-04 11:09:58 +02:00
miguel angel rasteu 81610046e3 #9946 Fix url 2023-09-04 10:58:15 +02:00
miguel angel rasteu 5ca1c54792 #9946 Add search filter and change table to datatable 2023-09-04 10:49:29 +02: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
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +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 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
Daniel Cebrian a72309ffa9 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:35:34 +02:00
Daniel Cebrian c45b9fb541 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:30:16 +02:00
Daniel Cebrian 043e92afe2 #11682 fixed error sql in special day when group is empty 2023-08-07 09:06:50 +02:00
Rafael Ameijeiras 507c91ab1e Merge branch 'ent-11683-faltan-opciones-en-las-listas-de-dias-especiales' into 'develop'
Ent 11683 Faltan opciones en las listas de días especiales

See merge request artica/pandorafms!6221
2023-08-02 12:01:07 +00:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
daniel 0722cfca1a ITSM fixed pandora_enterprise#11471 2023-07-14 15:42:35 +02:00
daniel c2297052c1 ITSM dashboard pandora_enterprise#11471 2023-07-11 15:55:10 +02:00
miguel angel rasteu 6d848b9fd3 #11216 Duplicate widget 2023-07-07 12:25:49 +02:00
Daniel Cebrian aac6e147dc #11683 fixed buttons in calendar 2023-07-06 17:22:49 +02:00
daniel 64c8086854 wip integration integriaIMS pandora_enterprise#11471 2023-06-29 09:45:44 +02:00
daniel 6e3eddff08 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-27 08:23:46 +02:00
Matias Didier af33f168b6 Merge branch 'ent-11415-15702-no-existe-editor-html-al-configurar-el-widget-panel-con-un-mensaje' into 'develop'
Ent 11415 15702 no existe editor html al configurar el widget panel con un mensaje

See merge request artica/pandorafms!6003
2023-06-26 14:06:05 +00:00
miguel angel rasteu 7934551ff0 #11415 Fix tinymce editor html 2023-06-26 15:17:45 +02:00
daniel d84299d3ab wip api integration pandora #1355 2023-06-20 08:43:10 +02:00
daniel e82c1e6881 wip integration integriaIMS pandora_enterprise#11471 2023-06-16 13:47:25 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
miguel angel rasteu 372ef844e7 #11415 Add html editor with tinymce 2023-05-31 12:17:05 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
daniel c0172afc3d update composer 2023-04-10 16:38:37 +02:00
Jonathan 93966788eb Slides require mesage 2023-03-31 09:51:48 +02:00
Jonathan 9635b4b721 Dashboard slides fix 2023-03-30 16:45:27 +02:00
Pablo Aragon e03e1e45ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 12:26:06 +02:00
Pablo Aragon 5e24706f71 Style fix 2023-03-30 12:25:45 +02:00
Jonathan ae58add6a9 Dashboard pure fix options 2023-03-30 12:18:16 +02:00
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
daniel e7d08fe6d3 fixed styles 2023-03-29 14:48:47 +02:00
Diego Muñoz-Reja 35a1c2332d Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop'
implemented consoles management

See merge request artica/pandorafms!5558
2023-03-28 15:33:37 +00:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
#   pandora_console/extras/mr/62.sql
2023-03-28 14:09:33 +00:00
daniel 19ddbdc30a fixed styles 2023-03-28 08:34:05 +02:00
Jonathan f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
daniel 56e4770b93 fixed styles 2023-03-23 14:20:54 +01:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +01:00
Jonathan e2615b9593 Visual changes header 2023-03-21 17:02:03 +01:00
daniel 0934b75cbd fixed styles 2023-03-17 08:10:19 +01:00
Daniel Cebrian 20b177d121 changed in welcome tips forms 2023-03-16 17:23:48 +01:00
Jonathan 758d04333d clusterview margin title on view 2023-03-16 14:10:48 +01:00
Jonathan 7704e4a1da clusterview margin title on view 2023-03-16 14:07:12 +01:00
Jonathan f417772642 TipsWindow blacktheme 2023-03-16 13:31:16 +01:00
Jonathan 30538265e8 Cluster wizzard visual fix 2023-03-15 16:06:42 +01:00
Jonathan 19b295060b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 13:53:34 +01:00
Jonathan 17ba51d2bf cluster view 2023-03-15 13:53:23 +01:00
Daniel Cebrian c346aefeaa #10685 changed in system fav, tips and Tactical group view 2023-03-15 12:46:09 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
daniel c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00