daniel
|
86e492f275
|
fixed styles
|
2023-03-28 17:26:14 +02:00 |
Pablo Aragon
|
dab2a29b6b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-28 17:07:19 +02:00 |
|
Pablo Aragon
|
ce014e4c6b
|
Datatables. Treeview graph meta
|
2023-03-28 17:07:06 +02:00 |
|
daniel
|
0df3ad3ff3
|
fixed styles
|
2023-03-28 13:44:24 +02:00 |
|
Pablo Aragon
|
c7cd688b4b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-28 12:39:32 +02:00 |
|
Pablo Aragon
|
5969928003
|
10408-Fix action column & 10398-Events pure mode
|
2023-03-28 12:39:02 +02:00 |
Jonathan
|
7a3e894bb0
|
Menu fix follow reports
|
2023-03-28 11:06:03 +02:00 |
|
Jonathan
|
53194f7c3d
|
Reports visual changes
|
2023-03-28 11:04:52 +02:00 |
|
Jonathan
|
87946161f3
|
Solution conflict
|
2023-03-28 09:30:18 +02:00 |
|
Jonathan
|
81be0da7fd
|
Module manager editor relations visual change
|
2023-03-28 09:17:47 +02:00 |
|
daniel
|
3d815d56c8
|
fixed styles
|
2023-03-28 08:45:40 +02:00 |
|
daniel
|
4e01838238
|
fixed styles
|
2023-03-28 08:43:46 +02:00 |
|
daniel
|
19ddbdc30a
|
fixed styles
|
2023-03-28 08:34:05 +02:00 |
artica
|
061c9f8750
|
Auto-updated build strings.
|
2023-03-28 01:00:16 +02:00 |
|
daniel
|
ebffb004e9
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-27 21:22:06 +02:00 |
|
daniel
|
0461881420
|
fixed styles
|
2023-03-27 17:13:23 +02:00 |
|
Pablo Aragon
|
98f812b757
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-27 17:03:45 +02:00 |
|
Pablo Aragon
|
55ff0e0597
|
wux and wmi
|
2023-03-27 17:03:38 +02:00 |
|
Jonathan
|
52076a56c2
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-27 16:26:28 +02:00 |
|
Jonathan
|
e06fc2f115
|
Collection visual fix
|
2023-03-27 16:26:12 +02:00 |
|
daniel
|
48a254c4b2
|
fixed styles
|
2023-03-27 14:34:05 +02:00 |
|
Jonathan
|
ea6aa8629b
|
Module check force
|
2023-03-27 14:07:36 +02:00 |
Daniel Cebrian
|
fd9dfcf08f
|
Merge branch 'develop' into 'ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500'
# Conflicts:
# pandora_console/install.php
|
2023-03-27 11:01:24 +00:00 |
Diego Muñoz-Reja
|
6bdecc43e7
|
Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop'
Ent 8642 nuevo widget heatmap
See merge request artica/pandorafms!5557
|
2023-03-27 10:43:48 +00:00 |
|
Daniel Cebrian
|
aeab39737b
|
Merge branch 'develop' into ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500
|
2023-03-27 12:11:59 +02:00 |
|
daniel
|
3beec9bfab
|
fixed styles
|
2023-03-27 11:47:08 +02:00 |
|
daniel
|
af5f65a66d
|
fixed styles
|
2023-03-27 11:14:58 +02:00 |
|
Jonathan
|
665976e011
|
Bulks masive visual action buttons
|
2023-03-27 11:10:51 +02:00 |
Matias Didier
|
2daea0e5c4
|
Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop'
Ent 10764 favoritos y nuevos menus
See merge request artica/pandorafms!5618
|
2023-03-27 09:01:48 +00:00 |
|
artica
|
78bc8e4f50
|
Updated version and build strings.
|
2023-03-27 09:41:48 +02:00 |
|
Jonathan
|
0ae7630714
|
Gis map fix view
|
2023-03-27 08:44:45 +02:00 |
|
Jonathan
|
f8aefa6e34
|
Merge conflict solution
|
2023-03-27 08:31:00 +02:00 |
|
artica
|
75af4a2ca9
|
Auto-updated build strings.
|
2023-03-27 01:00:39 +02:00 |
|
artica
|
9528f59af9
|
Auto-updated build strings.
|
2023-03-26 01:00:17 +01:00 |
|
artica
|
bcf3f1ba1f
|
Auto-updated build strings.
|
2023-03-25 01:00:19 +01:00 |
Daniel Maya
|
e311c81f84
|
#8642 Fixed meta
|
2023-03-24 14:11:08 +01:00 |
|
daniel
|
abf9fcf200
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-24 14:05:30 +01:00 |
|
daniel
|
25ea15fe0f
|
fixed styles
|
2023-03-24 14:04:38 +01:00 |
|
Matias Didier
|
f931a86f22
|
Merge branch 'ent-10792-en-version-open-la-vista-tactica-de-grupo-devuelve-error-500-al-solicitar-grupo-all' into 'develop'
Ent 10792 en version open la vista tactica de grupo devuelve error 500 al solicitar grupo all
See merge request artica/pandorafms!5624
|
2023-03-24 12:15:01 +00:00 |
|
Pablo Aragon
|
be1fb9298b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-24 12:29:09 +01:00 |
|
Pablo Aragon
|
95edb47d01
|
10408
|
2023-03-24 12:29:03 +01:00 |
Jimmy Olano
|
eb833f2ad8
|
Merge branch 'ent-10747-version-open-error-500-en-vista-principal-de-un-agente' into 'develop', JJOS.
Ent 10747 version open error 500 en vista principal de un agente
See merge request artica/pandorafms!5616
|
2023-03-24 10:14:01 +00:00 |
|
Matias Didier
|
5529c33f0c
|
Merge branch 'ent-10650-bugs-funcionales-en-consolas-visuales' into 'develop'
Ent 10650 bugs funcionales en consolas visuales
See merge request artica/pandorafms!5601
|
2023-03-24 09:11:26 +00:00 |
Rafael Ameijeiras
|
f14be9c523
|
Merge branch 'ent-10311-14988-comentarios-de-eventos-se-muestran-en-evento-no-relacionado' into 'develop'
Ent 10311 14988 comentarios de eventos se muestran en evento no relacionado
See merge request artica/pandorafms!5582
|
2023-03-24 09:03:37 +00:00 |
|
Rafael Ameijeiras
|
a30ba4cf27
|
Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop'
Ent 9624 meter soporte a sflow en nuestro gestor de flujos
See merge request artica/pandorafms!5587
|
2023-03-24 07:25:52 +00:00 |
|
artica
|
8a14ec6725
|
Auto-updated build strings.
|
2023-03-24 01:00:23 +01:00 |
|
daniel
|
96d03ca31c
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-23 17:47:58 +01:00 |
|
Pablo Aragon
|
0fa79e44f1
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-23 17:44:16 +01:00 |
|
daniel
|
bac1a7bf65
|
fixed styles
|
2023-03-23 17:44:06 +01:00 |
|
Pablo Aragon
|
122f45fcaa
|
Metasetup
|
2023-03-23 17:44:04 +01:00 |