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
|
f3d7aa9e30
|
fixed styles
|
2023-02-27 18:39:10 +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 |
|
daniel
|
f38adff73a
|
fixed styles
|
2023-02-27 18:05:51 +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
|
5df442e83e
|
Network maps improve
|
2023-02-27 16:37:00 +01:00 |
|
daniel
|
12212fff02
|
restyling
|
2023-02-27 13:41:44 +01:00 |
|
Pablo Aragon
|
936c9bcafb
|
10454-Events
|
2023-02-27 10:12:42 +01:00 |
|
Pablo Aragon
|
e024658520
|
10454-Events
|
2023-02-27 09:57:17 +01:00 |
|
daniel
|
35241e0d38
|
restyling
|
2023-02-27 09:55:29 +01:00 |
|
daniel
|
7602ec1bd8
|
fixed styles
|
2023-02-24 14:28:07 +01:00 |
|
daniel
|
5477fdbb6c
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-24 13:45:14 +01:00 |
|
daniel
|
65ed10be1a
|
restyling
|
2023-02-24 13:43:34 +01:00 |
|
Jose Gonzalez
|
a6f1037c9a
|
Minor fixes or improvements
|
2023-02-24 13:37:47 +01:00 |
|
daniel
|
3575e199b0
|
restyling
|
2023-02-24 10:46:46 +01:00 |
|
Pablo Aragon
|
a28eb59ce0
|
10454-Fix filters
|
2023-02-24 10:06:32 +01:00 |
|
Pablo Aragon
|
a9d49dea3b
|
10454-Fix filters
|
2023-02-24 10:04:23 +01:00 |
|
daniel
|
b34515d03c
|
restyling
|
2023-02-23 17:57:48 +01:00 |
|
daniel
|
1be0fb94b0
|
restyling
|
2023-02-23 16:30:18 +01:00 |
|
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 |
Matias Didier
|
f371747619
|
Merge branch 'ent-9479-gestion-de-modulos-desde-metaconsola-sustitucion-del-wizard' into 'develop'
Ent 9479 gestion de modulos desde metaconsola sustitucion del wizard
See merge request artica/pandorafms!5509
|
2023-02-22 15:09:19 +00: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 |