tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-26 04:08:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,402 Commits 34 Branches 30 Tags
Commit Graph

1089 Commits

Author SHA1 Message Date
Daniel Maya
6b9175ea0d Merge branch 'develop' into ent-9662-second-round 2023-03-07 15:05:28 +01:00
Daniel Cebrian
fdc73be979 Merge branch 'develop' into ent-10347-vista-tactica-de-grupo 2023-03-07 13:19:52 +01:00
daniel
1db803b8f6 fixed styles 2023-03-07 12:59:34 +01:00
Jose Gonzalez
8f2a2f12c6 Templates view 2023-03-07 11:48:14 +01:00
Jose Gonzalez
1f45ee33b2 Header icon 2023-03-07 11:14:10 +01:00
daniel
95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
daniel
5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
Jose Gonzalez
a16b4c11f4 Fix toggle and spinner issues 2023-03-01 13:32:15 +01:00
Jose Gonzalez
ca6d722495 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 12:07:11 +01:00
Jose Gonzalez
63e05ff304 Update help tip icon 2023-03-01 12:07:03 +01:00
daniel
8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Jose Gonzalez
fa354ff8e6 Minor changes 2023-02-28 17:54:22 +01:00
Jose Gonzalez
ad34dfef21 Minor changes 2023-02-28 17:53:10 +01:00
Pablo Aragon
c0ab435f4f Events meta 2023-02-28 17:49:22 +01:00
Pablo Aragon
3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
Jose Gonzalez
825b937958 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 10:39:42 +01:00
Pablo Aragon
1d28762d22 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:50:50 +01:00
Pablo Aragon
38a05d2a79 Events meta 2023-02-28 09:50:42 +01:00
Jose Gonzalez
ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +01:00
daniel
6642f2e6d3 fixed styles 2023-02-28 08:06:53 +01:00
daniel
76b2c8743b Merge remote-tracking branch 'origin/ent-9987-mejoras-de-la-vista-de-inventario' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2023-02-27 18:25:45 +01:00
Jose Gonzalez
973444014a Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:37:17 +01:00
Jose Gonzalez
526bff976c Improve functionality 2023-02-27 16:33:46 +01:00
Pablo Aragon
32cf508633 10457-System audit log 2023-02-27 14:38:39 +01:00
Daniel Cebrian
4917b40d10 10324 fixed modal in filter title 2023-02-27 10:05:16 +01:00
Daniel Cebrian
e76d8606dc #10324 added star in menu 2023-02-27 09:45:15 +01:00
daniel
3575e199b0 restyling 2023-02-24 10:46:46 +01:00
Daniel Cebrian
032fcdeae4 #10324 added fav menu in reporting viewer 2023-02-24 10:23:14 +01:00
Pablo Aragon
a9d49dea3b 10454-Fix filters 2023-02-24 10:04:23 +01:00
Pablo Aragon
c1342fb6a1 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 10:32:18 +01:00
Pablo Aragon
c30dda1718 10519-New login meta 2023-02-23 10:32:01 +01:00
Daniel Cebrian
0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
Jose Gonzalez
6180a42413 More pandora_black fixes 2023-02-22 21:19:28 +01:00
Pablo Aragon
e7d6afd636 10488-Fix views reports 2023-02-22 10:35:33 +01:00
Pablo Aragon
95fb797a7e 10488-Fix views reports 2023-02-22 10:33:45 +01:00
Jonathan
fe0bfbe9d6 Close mesage image fix 2023-02-22 08:08:11 +01:00
Jose Gonzalez
7a2cb912b2 Workaround for Status icon 2023-02-21 14:16:37 +01:00
Pablo Aragon
7ac794f5ff 10469-Fix omnishell view 2023-02-21 11:28:26 +01:00
Jose Gonzalez
38dbec8618 Fix Firefox bug 2023-02-15 14:45:28 +01:00
Jose Gonzalez
829bec59e3 Fix 2023-02-14 16:45:27 +01:00
Jose Gonzalez
36308b1be0 Minor visual fixes 2023-02-14 16:41:24 +01:00
Jose Gonzalez
be33b2f51a Several visual fixes for fit with mockups 2023-02-14 14:06:51 +01:00
Jose Gonzalez
c81caebe72 Fix for #10380. Issue with message boxes 2023-02-13 18:03:31 +01:00
Jose Gonzalez
d33babd48a Fix user modification-creation 2023-02-13 14:23:31 +01:00
Jose Gonzalez
ff0eb5de56 Added function 2023-02-10 11:47:20 +01:00
Jose Gonzalez
175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Jose Gonzalez
4b592b6610 Minor fixes 2023-02-08 17:20:52 +01:00
Jose Gonzalez
f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
Jose Gonzalez
0eaa52a042 Added funcion for set placeholders 2023-02-07 13:20:23 +01:00
Jose Gonzalez
dfdcb688d4 Improve code 2023-02-06 23:10:28 +01:00