tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,778 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

26778 Commits

Author SHA1 Message Date
Daniel Barbero Martin 74afdf9510 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-06 08:03:40 +02:00
artica 247343c0b6 Auto-updated build strings. 2021-04-06 01:02:48 +02:00
Daniel Barbero Martin 846b601a3c WIP command center 2021-04-05 17:32:19 +02:00
Daniel Barbero Martin 0a106c2a6e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-05 08:20:38 +02:00
artica 31a8fd6c55 Auto-updated build strings. 2021-04-05 01:00:42 +02:00
artica 4811e45bf2 Auto-updated build strings. 2021-04-04 01:00:37 +02:00
artica 95e437252b Auto-updated build strings. 2021-04-03 01:00:36 +02:00
artica 2f4eaacb6a Auto-updated build strings. 2021-04-02 01:00:33 +02:00
artica 10ea68f33f Auto-updated build strings. 2021-04-01 01:00:11 +02:00
Daniel Barbero Martin 9364428346 WIP command center 2021-03-31 15:50:41 +02:00
Daniel Barbero Martin 6ac13adc39 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-31 08:31:12 +02:00
artica 321fc8aa05 Auto-updated build strings. 2021-03-31 01:00:44 +02:00
Daniel Barbero Martin 01f801cb4f fixed minor error 2021-03-30 17:49:15 +02:00
Daniel Rodriguez 021d60f281 Merge branch 'ent-7243-Trazas-en-código-develop' into 'develop' 
Ent 7243 trazas en código develop

See merge request artica/pandorafms!3985
 2021-03-30 14:26:12 +00:00
Daniel Maya f004cfc276 trace removed 2021-03-30 16:20:46 +02:00
Daniel Rodriguez 8a62fa67ad Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop' 
Ent 7171 iconos poco visibles en monitor detail black theme

See merge request artica/pandorafms!3929
 2021-03-30 09:51:04 +00:00
Daniel Rodriguez 0beaaf3f45 Merge branch 'ent-7174-no-se-ven-las-labels-en-creacion-de-items-de-consolas-visuales-black-theme' into 'develop' 
Ent 7174 no se ven las labels en creacion de items de consolas visuales black theme

See merge request artica/pandorafms!3931
 2021-03-30 09:47:09 +00:00
marcos 063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
Daniel Barbero Martin 4bcc566ee1 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-30 08:28:05 +02:00
artica 8b92c0ffc1 Auto-updated build strings. 2021-03-30 01:00:51 +02:00
Daniel Barbero Martin 264c6d515e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-29 17:47:44 +02:00
artica 96d63e2029 Updated version and build strings. 2021-03-29 14:57:41 +02:00
Daniel Rodriguez 3770f491dc Merge branch 'ent-7231-icono-vistas-consolas-visuales' into 'develop' 
fixed icon

See merge request artica/pandorafms!3975
 2021-03-29 12:39:02 +00:00
marcos e26c2eb76d fixed icon 2021-03-29 14:30:00 +02:00
vgilc 142b271ba0 Update pandoradb_data.sql 2021-03-29 12:21:12 +00:00
Daniel Rodriguez c5f1faf92b Merge branch 'ent-7228-bug-visual-en-boton-creacion-de-cv-metaconsola' into 'develop' 
fixed buttton position

See merge request artica/pandorafms!3977
 2021-03-29 10:44:51 +00:00
marcos 390d7e79cd fixed buttton position 2021-03-29 12:32:14 +02:00
marcos 0166c3066f fixed icon 2021-03-29 12:20:27 +02:00
Daniel Rodriguez 4fa790dd7f Merge branch 'ent-7202-fallos-visuales-discovery' into 'develop' 
Ent 7202 fallos visuales discovery

See merge request artica/pandorafms!3953
 2021-03-29 09:49:31 +00:00
marcos 1f89a0d293 fixed visual error 2021-03-29 09:58:23 +02:00
Daniel Rodriguez d01c3e1c92 Merge branch 'ent-7215-fallos-vista-eventos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3961
 2021-03-29 07:23:03 +00:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
marcos 3934096d03 Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery 2021-03-29 09:21:04 +02:00
Daniel Rodriguez 04483fe9f3 Merge branch 'ent-7210-Bug-en-token-limit-de-widget-List-of-last-events' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3958
 2021-03-29 07:15:32 +00:00
Daniel Rodriguez 652d84ffde Merge branch 'ent-7226-iconos-barra-de-busqueda-no-se-visualizan' into 'develop' 
fixed lost icons

See merge request artica/pandorafms!3971
 2021-03-29 07:15:19 +00:00
Daniel Barbero Martin fe87e827a9 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-29 08:17:35 +02:00
marcos 88f3ce9b90 fixed lost icons 2021-03-29 08:12:54 +02:00
artica 3e8214850f Auto-updated build strings. 2021-03-29 01:00:18 +02:00
artica cf78261d0b Auto-updated build strings. 2021-03-28 01:00:14 +01:00
artica e46845e864 Auto-updated build strings. 2021-03-27 01:00:19 +01:00
Daniel Rodriguez 812007169d Merge branch 'ent-7209-boton-new-ayer-en-creacion-edicion-gis-maps-no-funciona' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3969
 2021-03-26 13:52:44 +00:00
Daniel Rodriguez c5d6daa018 Merge branch 'ent-7207-error-visual-en-relaciones-de-network-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3968
 2021-03-26 13:41:31 +00:00
Daniel Rodriguez e6be5e61f9 Merge branch 'ent-7194-varios-bugs-visuales-metaconsola' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3945
 2021-03-26 13:40:56 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
marcos 56462b1b06 fixed visual error 2021-03-26 14:32:29 +01:00
Daniel Rodriguez 48b299ba67 Merge branch 'ent-7228-Errores-en-las-Visual-consoles-de-Metaconsola' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3967
 2021-03-26 13:05:28 +00:00
marcos 89ba8b43fb fixed visual error 2021-03-26 13:58:13 +01:00
Daniel Rodriguez dff3ef3484 Merge branch 'ent-7223-error-message-update-manager-offline' into 'develop' 
Restored not update error message on update manager offline

See merge request artica/pandorafms!3965
 2021-03-26 12:35:57 +00:00
Daniel Barbero Martin 487a9b96d9 fixed minor error 2021-03-26 13:25:42 +01:00
Daniel Rodriguez 1f74bd071c Merge branch 'ent-7221-icono-lupa-cambiado-por-ojo' into 'develop' 
Substituted eye with operation (magnifier) icon on credential store and tasklist

See merge request artica/pandorafms!3964
 2021-03-26 12:05:29 +00:00