Commit Graph

135 Commits

Author SHA1 Message Date
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 Cebrian aac6e147dc #11683 fixed buttons in calendar 2023-07-06 17:22:49 +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
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
alejandro.campos@artica.es cd85c60620 visual fix after pandora style refactorization 2023-03-10 15:17:21 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
alejandro.campos@artica.es 39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida'
# Conflicts:
#   pandora_console/pandoradb.sql
2023-03-10 10:41:08 +00:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
Jonathan 54e6a99cc3 Dashboard pagination visual position 2023-03-08 17:09:42 +01:00