tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-02 23:58:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,636 Commits 34 Branches 30 Tags
Commit Graph

7154 Commits

Author SHA1 Message Date
Pablo Aragon
dbd565fd1d Alerts 2023-03-07 16:17:48 +01:00
Pablo Aragon
3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
daniel
5a41c8b61c fixed styles 2023-03-07 16:00:33 +01:00
Jose Gonzalez
f7aab35082 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:59:51 +01:00
Pablo Aragon
d529e6f384 Alerts 2023-03-07 15:59:36 +01:00
Jose Gonzalez
1b0fe3887f Fixed issue with spinner 2023-03-07 15:08:03 +01:00
Daniel Maya
6b9175ea0d Merge branch 'develop' into ent-9662-second-round 2023-03-07 15:05:28 +01:00
Jose Gonzalez
4ea1d697dc Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:00:40 +01:00
Jose Gonzalez
845a637082 Inventory modules forms 2023-03-07 14:59:59 +01:00
Jonathan
8dbcffaa8b Buttons and view report 2023-03-07 14:15:02 +01:00
Jose Gonzalez
f01b18b965 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 14:11:23 +01:00
Jose Gonzalez
d4f900d1a4 Manage inventory icons 2023-03-07 14:11:20 +01:00
daniel
b316542044 fixed styles 2023-03-07 14:03:04 +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
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
dd68cc7a9e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 11:48:20 +01:00
Jose Gonzalez
8f2a2f12c6 Templates view 2023-03-07 11:48:14 +01:00
Jonathan
d6a461acb8 Graph container create styles 2023-03-07 11:21:25 +01:00
Jonathan
89780a7085 Container graph visual 2023-03-07 09:53:19 +01:00
Pablo Aragon
6cb78d312f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 09:52:05 +01:00
Pablo Aragon
6c6943c591 Alerts 2023-03-07 09:51:53 +01:00
Jose Gonzalez
1d93c666ba Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 09:51:23 +01:00
Jose Gonzalez
e860dea8ca Manage agent groups 2023-03-07 09:41:24 +01:00
Pablo Aragon
62afce562f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 08:28:22 +01:00
Pablo Aragon
5aac1a6152 Alerts 2023-03-07 08:28:10 +01:00
daniel
70d2223a46 fixed styles 2023-03-06 17:51:49 +01:00
daniel
5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Daniel Cebrian
135793454c #9073 added images 2023-03-06 12:20:08 +01:00
Jose Gonzalez
c48ec28743 Minor fixes 2023-03-06 10:35:34 +01:00
daniel
08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
daniel
ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
Jose Gonzalez
6846961ff0 Icon updates 2023-03-03 14:50:47 +01:00
Jose Gonzalez
df6dddb586 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 13:52:49 +01:00
Jose Gonzalez
128dc9c42c Visual console changes 2023-03-03 13:52:28 +01:00
Daniel Cebrian
00b5d3f237 #1347 added links tactical view group 2023-03-03 13:24:33 +01:00
Daniel Cebrian
7562a9253a #10347 refactoring and add link to events in graph 2023-03-03 13:13:49 +01:00
alejandro.campos@artica.es
6cee279de7 fixed entities 2023-03-03 12:49:54 +01:00
Jonathan
5d73f96823 Graphs template wizard visual change 2023-03-03 12:41:32 +01:00
Jonathan
e5cbe07a86 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 10:12:28 +01:00
Jonathan
8d31603e44 Custom Graphs visual changes 2023-03-03 10:12:24 +01:00
Alejandro Campos
3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-03 08:12:57 +00: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
daniel
310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Jose Gonzalez
7a11ce4145 Visual Consoles 2023-03-02 17:24:52 +01:00
Daniel Cebrian
cdf359481a #10347 cleared code for apply acl permission 2023-03-02 17:06:16 +01:00
Daniel Cebrian
af5a620883 #10347 fixed urls monitors and added name group 2023-03-02 16:22:25 +01:00
Jonathan
1c057773aa Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 14:35:05 +01:00
Jonathan
dd1b58b83a Reporting Custom Graphs change visual 2023-03-02 14:35:01 +01:00
Daniel Cebrian
dc6256058f #10347 added list agents in tactical view groups 2023-03-02 13:48:14 +01:00