Commit Graph

107 Commits

Author SHA1 Message Date
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
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +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
Daniel Cebrian 11250bd59b Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-08 13:00:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Daniel Cebrian 27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
Pablo Aragon d529e6f384 Alerts 2023-03-07 15:59:36 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Jose Gonzalez a10e79f663 Dashboard minor fixes and icons 2023-03-07 00:15:26 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
daniel 6545bdbaf1 fixed styles 2023-03-02 14:25:52 +01:00
daniel ad33accfda fixed styles 2023-03-02 11:10:09 +01:00
daniel 69d1bdd908 fixed styles 2023-03-01 13:44:01 +01:00
Daniel Cebrian c0dcc03388 #10324 added system fav in visual console and modules 2023-02-23 11:00:46 +01:00
Jonathan 05c2232daa Modals dashboard view fix 2023-02-21 17:07:03 +01:00
Daniel Cebrian 864d54ee88 #9073 fixed filter title 2023-02-17 14:15:16 +01:00
Daniel Cebrian 35a1a67006 #9073 refactoring 2023-02-17 12:53:35 +01:00
Daniel Cebrian 9a0dc247c0 #9073 added preview tip 2023-02-17 11:07:28 +01:00
Daniel Cebrian 0cee40e40a #9073 create button for preview tip 2023-02-16 18:13:34 +01:00
Daniel Cebrian dce5b07109 #9073 added control image and fixed bug with language filter 2023-02-16 16:14:50 +01:00
Daniel Cebrian e0b75f9829 #9073 added system profiles in tips 2023-02-16 13:14:59 +01:00
Jose Gonzalez be33b2f51a Several visual fixes for fit with mockups 2023-02-14 14:06:51 +01:00
Daniel Cebrian 9f01a302c5 #9073 finished front 2023-02-14 11:32:43 +01:00
Daniel Cebrian ad4750c409 #9073 fixed bug in firts tips 2023-02-14 10:55:01 +01:00
Daniel Cebrian dfb93d2cf5 #9073 added token for tips in user profile configuration 2023-02-14 10:34:08 +01:00
Daniel Cebrian 887d2f8f18 #9073 added counter round un footer 2023-02-13 16:21:37 +01:00
Daniel Cebrian 6619cf059d #9073 added design v1 2023-02-13 13:26:49 +01:00
Daniel Cebrian e62dee1c62 #9073 create files structure 2023-02-13 10:06:14 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Daniel Cebrian 8475e5fbf6 #10162 fixed entities in special days 2023-01-30 17:21:20 +01:00