Daniel Cebrian
|
2c7d00a664
|
Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola
|
2023-02-27 13:34:41 +01:00 |
|
Daniel Cebrian
|
5d4c61f8c4
|
#10253 added notify enforcement in metaconsole
|
2023-02-27 13:26:32 +01:00 |
Jonathan
|
87f17890f9
|
SNMP visual changes
|
2023-02-27 12:13:38 +01:00 |
|
Jonathan
|
fe8d15855c
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-27 10:31:54 +01:00 |
|
Jonathan
|
74c0dbb39f
|
SNMP black theme
|
2023-02-27 10:31:50 +01:00 |
Jose Gonzalez
|
9acc4aeec4
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-27 10:09:53 +01:00 |
|
Jose Gonzalez
|
cba3ba8452
|
Fixed resource registration
|
2023-02-27 10:09:34 +01:00 |
Pablo Aragon
|
e024658520
|
10454-Events
|
2023-02-27 09:57:17 +01:00 |
|
Jose Gonzalez
|
9972b14ccd
|
Resource Exportation view
|
2023-02-27 09:55:31 +01:00 |
Matias Didier
|
1d30123d53
|
Merge branch 'ent-10259-control-de-configuracion-en-tagent_acess' into 'develop'
Ent 10259 control de configuracion en tagent acess
See merge request artica/pandorafms!5504
|
2023-02-27 08:45:00 +00:00 |
|
Jonathan
|
8fa88a564d
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-27 09:42:00 +01:00 |
|
Jonathan
|
9ed46e3b52
|
SNMP fix view
|
2023-02-27 09:41:39 +01:00 |
Daniel Maya
|
586b6e5883
|
#9662 fixed menu
|
2023-02-27 09:39:34 +01:00 |
daniel
|
2b9bef1660
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-27 08:01:15 +01:00 |
artica
|
491958a105
|
Auto-updated build strings.
|
2023-02-27 01:00:21 +01:00 |
|
artica
|
ce5b0abda6
|
Auto-updated build strings.
|
2023-02-26 01:00:21 +01:00 |
|
artica
|
e38504d3df
|
Auto-updated build strings.
|
2023-02-25 01:00:27 +01:00 |
|
Jose Gonzalez
|
6c97fd16a2
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-24 14:34:52 +01:00 |
|
Jose Gonzalez
|
4e2af1d5f2
|
Fixes
|
2023-02-24 14:34:32 +01:00 |
|
daniel
|
7602ec1bd8
|
fixed styles
|
2023-02-24 14:28:07 +01:00 |
|
daniel
|
3f572ab5f7
|
fixed styles
|
2023-02-24 14:19:56 +01:00 |
|
Jose Gonzalez
|
47a433c312
|
Minor fix
|
2023-02-24 13:49:15 +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
|
9e4b68c0d3
|
Fixed treeview alerts button
|
2023-02-24 13:43:10 +01:00 |
|
Jose Gonzalez
|
377d005800
|
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:38:05 +01:00 |
|
Jose Gonzalez
|
a6f1037c9a
|
Minor fixes or improvements
|
2023-02-24 13:37:47 +01:00 |
|
Jonathan
|
0a5571cd4d
|
SNMP browser icons
|
2023-02-24 13:21:00 +01:00 |
|
daniel
|
41f6ea0d6e
|
restyling
|
2023-02-24 12:16:30 +01:00 |
|
Daniel Cebrian
|
b367284d72
|
Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess'
# Conflicts:
# pandora_console/include/class/ConsoleSupervisor.php
|
2023-02-24 11:09:16 +00:00 |
|
Jose Gonzalez
|
ec3e99e459
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-24 12:07:48 +01:00 |
|
Daniel Cebrian
|
c7e53f5a1a
|
#10259 resolve conflics
|
2023-02-24 12:07:37 +01:00 |
|
Jose Gonzalez
|
70216262a9
|
Minor fixes
|
2023-02-24 12:05:53 +01:00 |
|
Jonathan
|
84e3f11b7b
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-24 12:00:12 +01:00 |
|
Jonathan
|
c56aac317a
|
SNMP console view fix
|
2023-02-24 12:00:02 +01:00 |
Diego Muñoz-Reja
|
76dbaf46d2
|
Merge branch 'ent-10321-limitacion-del-numero-de-eventos' into 'develop'
Ent 10321 limitacion del numero de eventos
See merge request artica/pandorafms!5513
|
2023-02-24 10:06:44 +00:00 |
|
Jose Gonzalez
|
29f21f5f7a
|
Fix action_buttons height
|
2023-02-24 10:51:59 +01:00 |
|
daniel
|
afbbb57a53
|
restyling
|
2023-02-24 10:48:30 +01:00 |
|
daniel
|
3575e199b0
|
restyling
|
2023-02-24 10:46:46 +01:00 |
|
Jose Gonzalez
|
55c048b66f
|
Change CSV icon
|
2023-02-24 10:36:53 +01:00 |
|
Jose Gonzalez
|
d80dd284ab
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-24 10:20:11 +01:00 |
|
Jose Gonzalez
|
6a5c2c58c7
|
Fix tree view
|
2023-02-24 10:19:56 +01:00 |
|
daniel
|
6381aaa9a8
|
restyling
|
2023-02-24 10:18:52 +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 |
|
Jonathan
|
b8d0e9dda8
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-24 09:51:59 +01:00 |
|
Jonathan
|
c4a0dc1934
|
SNMP views
|
2023-02-24 09:51:55 +01:00 |
|
artica
|
4fdd5296a0
|
Auto-updated build strings.
|
2023-02-24 01:02:05 +01:00 |
|
daniel
|
b34515d03c
|
restyling
|
2023-02-23 17:57:48 +01:00 |
|
Jonathan
|
831579f9c8
|
Conflicto solution
|
2023-02-23 17:10:44 +01:00 |
|
Jonathan
|
a09c423284
|
SNMP views fix
|
2023-02-23 17:09:58 +01:00 |
|
Jose Gonzalez
|
344261eafa
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-23 16:48:02 +01:00 |
|
Jose Gonzalez
|
65c2d09194
|
Icons added
|
2023-02-23 16:47:51 +01:00 |
|
Jose Gonzalez
|
fbca56500a
|
TreeView minor fixes
|
2023-02-23 16:24:20 +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
|
f45a777e5b
|
Added save-load icons
|
2023-02-23 14:30:57 +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 |
|
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
|
ff9ee7a4f0
|
restyling
|
2023-02-23 10:24:03 +01:00 |
|
Jonathan
|
0fbf50673a
|
Dashboard multiselect height + delete size modal
|
2023-02-23 10:11:35 +01:00 |
|
artica
|
1babcb408d
|
Auto-updated build strings.
|
2023-02-23 01:01:56 +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 |
|
Jose Gonzalez
|
0380e8a10c
|
Ticket 10394 Black theme fixes
|
2023-02-22 16:24:11 +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
|
ac4a76d653
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-22 15:02:14 +01:00 |
|
Pablo Aragon
|
d414bb2600
|
10454-Fix event view - td styles
|
2023-02-22 15:02:08 +01:00 |
|
Jose Gonzalez
|
095caf6fa9
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-22 14:20:20 +01:00 |
|
Jose Gonzalez
|
ec58cb4593
|
Plugins view
|
2023-02-22 14:19:57 +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 |
|
Jose Gonzalez
|
370ee54d9f
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-22 12:16:14 +01:00 |
|
Jose Gonzalez
|
fd0c181820
|
Margin reversed
|
2023-02-22 12:16:04 +01:00 |
|
Jose Gonzalez
|
bbde3e4181
|
Minor fixes
|
2023-02-22 12:15:17 +01:00 |
|
Daniel Cebrian
|
2980e180d8
|
Merge branch 'develop' into 'ent-10307-14480-anadir-informacion-del-usuario-al-poner-un-evento-in-process'
# Conflicts:
# pandora_console/include/functions_events.php
|
2023-02-22 10:45:38 +00: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 |
|
Jose Gonzalez
|
8df0c8a66d
|
Fonts changed at Sancho request
|
2023-02-22 09:39:13 +01:00 |
|
Jonathan
|
4d5891cd02
|
Select2 z-index for dialogs
|
2023-02-22 08:56:37 +01:00 |
|
Jonathan
|
28d964651f
|
Modal report issue change email input style
|
2023-02-22 08:12:45 +01:00 |
|
Jonathan
|
fe0bfbe9d6
|
Close mesage image fix
|
2023-02-22 08:08:11 +01:00 |
|
artica
|
53ca822779
|
Auto-updated build strings.
|
2023-02-22 01:02:03 +01:00 |
|
Jonathan
|
05c2232daa
|
Modals dashboard view fix
|
2023-02-21 17:07:03 +01:00 |
|
Matias Didier
|
8b8414be52
|
Merge branch 'ent-10305-ultima-ejecucion-de-pandora-db-en-vista-about-da-53-anos-como-dato' into 'develop'
Ent 10305 ultima ejecucion de pandora db en vista about da 53 anos como dato
See merge request artica/pandorafms!5501
|
2023-02-21 15:31:31 +00:00 |
|
Jose Gonzalez
|
7a2cb912b2
|
Workaround for Status icon
|
2023-02-21 14:16:37 +01:00 |
|
Jose Gonzalez
|
1d566b4d18
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-21 14:15:05 +01:00 |
|
Jose Gonzalez
|
2fd52eff48
|
Sprint 2025Feb Improve UI-UX and Resources views
|
2023-02-21 14:14:13 +01:00 |
|
Pablo Aragon
|
80818d7b6e
|
10489-Fix alerts edition and event response
|
2023-02-21 13:18:44 +01:00 |
|
Pablo Aragon
|
57a6bf97b0
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-21 11:28:36 +01:00 |
|
Pablo Aragon
|
7ac794f5ff
|
10469-Fix omnishell view
|
2023-02-21 11:28:26 +01:00 |
|
Jonathan
|
005fbd27c1
|
Tree view meta fix
|
2023-02-21 11:20:17 +01:00 |
|
artica
|
490d3db086
|
Auto-updated build strings.
|
2023-02-21 01:01:52 +01:00 |
|
Jose Gonzalez
|
13aa4e77f1
|
Fix minor issues
|
2023-02-20 17:49:02 +01:00 |
|
Jose Gonzalez
|
82ab2af20a
|
Fix header title and subtitle
|
2023-02-20 17:26:58 +01:00 |
|
Jose Gonzalez
|
7a1d7f9087
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-20 17:23:01 +01:00 |