Jose Gonzalez
|
4af67db415
|
Export data view
|
2023-03-07 18:10:07 +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 |
|
Jose Gonzalez
|
226b80b7c7
|
Icon revision
|
2023-03-07 15:59:10 +01:00 |
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
|
44fb762fdf
|
Minor fixes with graphs
|
2023-03-06 15:44:32 +01:00 |
|
daniel
|
08dca1a83c
|
fixed styles
|
2023-03-05 13:46:27 +01:00 |
|
daniel
|
95df525cb2
|
fixed styles
|
2023-03-03 14:16:06 +01:00 |
|
Daniel Cebrian
|
00b5d3f237
|
#1347 added links tactical view group
|
2023-03-03 13:24:33 +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 |
Alejandro Campos
|
f297f6fff9
|
Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
# pandora_console/extras/mr/62.sql
# pandora_console/pandoradb.sql
|
2023-03-02 16:53:42 +00:00 |
Diego Muñoz-Reja
|
873334fd97
|
Merge branch 'ent-9622-omnishell-en-la-vista-solapa-de-agente' into 'develop'
Ent 9622 omnishell en la vista solapa de agente
See merge request artica/pandorafms!5508
|
2023-03-02 14:52:45 +00:00 |
Matias Didier
|
c4e8ff49d5
|
Merge branch 'ent-10569-Error-500-a-la-hora-de-abrir-vista-de-algun-agente-en-fenix' into 'develop'
error fix
See merge request artica/pandorafms!5574
|
2023-03-02 09:15:37 +00:00 |
|
alejandro.campos@artica.es
|
fd13b376a5
|
Merge branch 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' of brutus.artica.es:artica/pandorafms into ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas
|
2023-03-01 16:10:30 +01:00 |
|
alejandro.campos@artica.es
|
296ec44ef4
|
minor fix
|
2023-03-01 16:10:18 +01:00 |
|
alejandro.campos@artica.es
|
36cfcc3c2f
|
error fix
|
2023-03-01 14:19:35 +01:00 |
|
daniel
|
774b32d7a0
|
fixed styles
|
2023-03-01 13:54:22 +01:00 |
|
daniel
|
a758528968
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/extras/mr/62.sql
pandora_console/include/class/AuditLog.class.php
|
2023-03-01 07:56:32 +01:00 |
|
daniel
|
8ac9df14ab
|
fixed styles
|
2023-02-28 19:01:37 +01:00 |
Jimmy Olano
|
a8d0f79540
|
Merge branch 'ent-10257-guardia-14543-no-muestra-modulos-no-init-en-vista-monitor-detail' into 'develop' (^JJOS)
Fix empty module data list view
See merge request artica/pandorafms!5472
|
2023-02-28 17:35:56 +00:00 |
|
Alejandro Campos
|
f94c7e2a04
|
Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
# pandora_console/extras/mr/62.sql
|
2023-02-28 16:11:46 +00:00 |
|
alejandro.campos@artica.es
|
a1f172e713
|
several fixes
|
2023-02-28 17:06:31 +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
|
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 |
|
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 |
|
daniel
|
b34515d03c
|
restyling
|
2023-02-23 17:57:48 +01:00 |
|
daniel
|
1be0fb94b0
|
restyling
|
2023-02-23 16:30:18 +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 |
|
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 |
|
alejandro.campos@artica.es
|
b76a4b1a48
|
fix conflicts
|
2023-02-22 10:10:14 +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 |