daniel
|
929680eb17
|
restyling
|
2023-02-23 16:00:13 +01:00 |
|
daniel
|
fa81a4e744
|
restyling
|
2023-02-23 15:44:01 +01:00 |
Jose Gonzalez
|
f08fc6a8b7
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-23 14:31:59 +01:00 |
|
Jose Gonzalez
|
d7c70bd8a8
|
Tree view fixes
|
2023-02-23 14:30:31 +01:00 |
|
daniel
|
598a1b1456
|
restyling
|
2023-02-23 12:34:41 +01:00 |
|
daniel
|
e672ba141b
|
restyling
|
2023-02-23 11:00:38 +01:00 |
|
daniel
|
ff9ee7a4f0
|
restyling
|
2023-02-23 10:24:03 +01:00 |
|
Jose Gonzalez
|
6180a42413
|
More pandora_black fixes
|
2023-02-22 21:19:28 +01:00 |
|
daniel
|
e514a0efb5
|
fixed styles
|
2023-02-22 17:41:19 +01:00 |
Pablo Aragon
|
1e384fd054
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-22 13:08:27 +01:00 |
|
Pablo Aragon
|
2081459556
|
10454-Fix event view
|
2023-02-22 13:08:15 +01:00 |
|
daniel
|
8230ae616b
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/godmode/users/user_list.php
pandora_console/operation/events/events.php
|
2023-02-22 12:35:34 +01:00 |
Matias Didier
|
cbbb874d7b
|
Merge branch 'ent-10416-no-aplica-los-filtros-de-eventos-desde-servicio' into 'develop'
Ent 10416 no aplica los filtros de eventos desde servicio
See merge request artica/pandorafms!5551
|
2023-02-22 10:36:00 +00:00 |
Jonathan
|
005fbd27c1
|
Tree view meta fix
|
2023-02-21 11:20:17 +01:00 |
Jimmy Olano
|
016a4b7975
|
Merge branch 'ent-10267-limitar-bloque-de-pagina-en-la-vista-de-eventos' into 'develop'
Ent 10267 limitar bloque de pagina en la vista de eventos
See merge request artica/pandorafms!5484
|
2023-02-20 23:00:29 +00:00 |
Daniel Maya
|
a615d2d98f
|
#9662 minor fixed
|
2023-02-20 17:08:36 +01:00 |
|
Daniel Maya
|
c6e32e278b
|
#9662 fixed favourites
|
2023-02-20 16:41:54 +01:00 |
|
Jonathan
|
934851ae4e
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-20 15:58:52 +01:00 |
|
Jonathan
|
fc68e6ead1
|
Monitor view meta fix status
|
2023-02-20 15:58:41 +01:00 |
|
Jose Gonzalez
|
6808fb0655
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-20 14:50:33 +01:00 |
|
Jose Gonzalez
|
8f21229246
|
Ticket 10467 Improve External Tools view
|
2023-02-20 14:50:17 +01:00 |
|
Jonathan
|
4bbf750944
|
Monitor view meta fix
|
2023-02-20 14:35:32 +01:00 |
Daniel Cebrian
|
f67bf4d084
|
#10416 added name agent in filter event
|
2023-02-20 13:10:00 +01:00 |
|
Jose Gonzalez
|
da58e4b9e0
|
Ticket 10484 Fixed List Operating Systems
|
2023-02-20 13:02:24 +01:00 |
|
Jose Gonzalez
|
b0ee4a203a
|
Ticket 10470 Agent improvements bis
|
2023-02-17 14:26:41 +01:00 |
|
Jose Gonzalez
|
c1f8510563
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-17 14:21:49 +01:00 |
|
Jose Gonzalez
|
a1bf42c9f9
|
Ticket 10470 Agent improvements
|
2023-02-17 14:21:29 +01:00 |
|
Jose Gonzalez
|
8a5a25cd65
|
Ticket 10452 Status monitor view improve
|
2023-02-17 13:35:42 +01:00 |
|
Jonathan
|
e6eed5e471
|
fix visual module graph and monitor details more details
|
2023-02-17 11:54:48 +01:00 |
Daniel Rodriguez
|
10d275c2a5
|
Merge branch 'ent-10428-carga-por-defecto-en-vista-de-monitores' into 'develop'
Fix showing all modules on monitors view on firt load
See merge request artica/pandorafms!5541
|
2023-02-15 15:04:30 +00:00 |
Diego Muñoz-Reja
|
e34677e5f6
|
Merge branch 'ent-10195-offset-de-mapas' into 'develop'
Ent 10195 offset de mapas
See merge request artica/pandorafms!5539
|
2023-02-15 14:34:17 +00:00 |
Calvo
|
70291758c8
|
Fix showing all modules on monitors view on firt load
|
2023-02-15 14:25:43 +01:00 |
|
Daniel Maya
|
845a2d08c3
|
#10118 Changed id_group 2
|
2023-02-15 13:42:19 +01:00 |
|
Daniel Maya
|
cac9f67153
|
#10195 Fixed minimap drawing
|
2023-02-15 10:49:31 +01:00 |
|
Daniel Maya
|
856fade86c
|
#10118 Added spinner
|
2023-02-14 14:45:46 +01:00 |
|
Jose Gonzalez
|
be33b2f51a
|
Several visual fixes for fit with mockups
|
2023-02-14 14:06:51 +01:00 |
|
Daniel Maya
|
ccb0cda305
|
#10118 changed CIDR input
|
2023-02-14 12:16:38 +01:00 |
|
Daniel Maya
|
5b263981c4
|
#10118 Added group multiselector
|
2023-02-13 17:06:09 +01:00 |
|
Daniel Maya
|
b010965caa
|
#9662 Fixed tactical view
|
2023-02-13 14:44:32 +01:00 |
|
Daniel Maya
|
f5044e5673
|
#9662 Added new user edit link and changed label
|
2023-02-13 13:16:51 +01:00 |
|
Daniel Maya
|
4cd0820f11
|
#10118 Changed radio button
|
2023-02-13 11:44:01 +01:00 |
|
Jose Gonzalez
|
d45a631ea5
|
Final merge with new menu
|
2023-02-13 10:37:37 +01:00 |
|
Jose Gonzalez
|
98736c1ab4
|
Merge
|
2023-02-13 10:24:07 +01:00 |
|
Jose Gonzalez
|
d6eedf07aa
|
Merge
|
2023-02-13 10:03:09 +01:00 |
|
Daniel Maya
|
be3c7bca6c
|
resolved conflict
|
2023-02-10 11:55:45 +01:00 |
|
Jose Gonzalez
|
175d4b7341
|
Fixes in Event view and other fixes
|
2023-02-09 16:13:30 +01:00 |
|
Jose Gonzalez
|
4d9c6ab33a
|
Minor fixes
|
2023-02-08 12:58:23 +01:00 |
|
Jose Gonzalez
|
f14d324490
|
Minor fixes and improves
|
2023-02-08 12:43:08 +01:00 |
|
Jose Gonzalez
|
3a741f8ed9
|
Update icons and improve tables
|
2023-02-07 16:22:52 +01:00 |
|
Daniel Maya
|
758f906616
|
#9663 menu redesing 4
|
2023-02-07 15:22:51 +01:00 |