Daniel Barbero Martin
|
d8a09bf359
|
Fixed errors VC
|
2020-01-15 17:37:24 +01:00 |
|
alejandro-campos
|
d9062def99
|
Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024
|
2020-01-15 16:01:11 +01:00 |
|
alejandro-campos
|
3f26f2ef6f
|
fix bug when deleting custom units and changed default value for byte multiplier
|
2020-01-15 16:00:33 +01:00 |
|
Daniel Barbero
|
89b43f1aee
|
loading on resize and update elements VC
|
2020-01-14 15:52:47 +01:00 |
|
Daniel Barbero
|
ed53399c3c
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-14 09:34:31 +01:00 |
|
Tatiana Llorente
|
7c928b8100
|
Ent 4795 check seleccionar todos queda marcado
|
2020-01-14 08:37:04 +01:00 |
|
Daniel Barbero Martin
|
602ce39907
|
Fixed clock item VC
|
2020-01-13 17:13:52 +01:00 |
|
Daniel Barbero Martin
|
09f1e2b733
|
fixed errors in resize and move item percentile and value
|
2020-01-13 09:53:00 +01:00 |
|
Daniel Barbero Martin
|
d4b92a6913
|
Fixed errors in VC
|
2020-01-10 13:48:07 +01:00 |
|
Daniel Barbero Martin
|
f34387b24e
|
Fixed modal send more forms
|
2020-01-10 08:41:07 +01:00 |
|
Daniel Barbero Martin
|
d97cdfbc7a
|
fix element line
|
2020-01-08 17:28:03 +01:00 |
|
Daniel Barbero Martin
|
c4f0305f9b
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-08 08:29:59 +01:00 |
|
Daniel Barbero Martin
|
da01883902
|
Fixed items vc line
|
2020-01-07 18:07:07 +01:00 |
|
Daniel Barbero Martin
|
b49dd76ce4
|
Add images input
|
2020-01-07 15:43:44 +01:00 |
|
vgilc
|
996d322d5d
|
Merge branch 'ent-5176-metaconsola-informes-tipo-texto' into 'develop'
Fixed visual bug in text report item
See merge request artica/pandorafms!2991
|
2020-01-07 10:17:10 +01:00 |
|
Daniel Rodriguez
|
0c2c7d9f3b
|
Merge branch 'ent-2813-Muestra-de-información-en-el-tree-view' into 'develop'
Added stopPropagation
See merge request artica/pandorafms!2940
|
2020-01-07 09:24:38 +01:00 |
|
manuel
|
4214a32fb7
|
Fixed visual bug in text report item
|
2019-12-24 10:11:27 +01:00 |
|
Daniel Barbero
|
d4207ef67c
|
Fixed form php VC
|
2019-12-20 13:58:47 +01:00 |
|
Daniel Barbero
|
14984faaaa
|
Fixed errors Form VC
|
2019-12-19 20:42:29 +01:00 |
|
Daniel Barbero
|
7d60287018
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2019-12-19 08:02:47 +01:00 |
|
Daniel Barbero
|
9b4f12a875
|
Fixed forms VC
|
2019-12-18 17:36:01 +01:00 |
|
Daniel Maya
|
7f1245e09d
|
Fixed mceLast class
|
2019-12-18 10:23:27 +01:00 |
|
Daniel Barbero
|
2a92c9d38d
|
Fixed errors VC forms
|
2019-12-17 10:57:19 +01:00 |
|
Daniel Barbero
|
9e01cb097c
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2019-12-13 13:02:04 +01:00 |
|
Daniel Barbero
|
603b4e71eb
|
Fix gauge pdf reports
|
2019-12-13 09:06:54 +01:00 |
|
Daniel Barbero
|
319b3e604f
|
Merge remote-tracking branch 'origin' into new-vc-line-element
|
2019-12-13 08:15:23 +01:00 |
|
Manuel Montes
|
a2162948b4
|
Fixed minor bugs in metaconsole reports
|
2019-12-12 18:12:42 +01:00 |
|
Daniel Barbero
|
63dd3c48f8
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
pandora_console/include/javascript/pandora.js
|
2019-12-12 16:32:32 +01:00 |
|
manuel
|
2504a3dc09
|
Fixed bug in module creation view
|
2019-12-12 13:50:35 +01:00 |
|
vgilc
|
1b2d4e233a
|
Merge branch 'ent-5006-Bug-al-eliminar-un-nodo-de-un-mapa-de-red-y-mover-otro-elemento' into 'develop'
Ent 5006 bug al eliminar un nodo de un mapa de red y mover otro elemento
See merge request artica/pandorafms!2907
|
2019-12-10 11:30:28 +01:00 |
|
Daniel Maya
|
2b8e9995ce
|
Added stopPropagation
|
2019-12-04 17:14:45 +01:00 |
|
marcos
|
a67b0a9978
|
update pandora.js pandora_ui.js
|
2019-11-28 18:27:05 +01:00 |
|
marcos
|
e84610120b
|
Add coments in pandora_ui.js
|
2019-11-27 11:43:50 +01:00 |
|
Marcos Alconada
|
888988572a
|
Merge branch 'develop' into 'ent-4876-pandora_ui.js'
# Conflicts:
# pandora_console/include/javascript/pandora.js
|
2019-11-27 11:39:11 +01:00 |
|
Jose Gonzalez
|
d181d5357b
|
Created function for initialize TinyMCE
|
2019-11-26 13:19:28 +01:00 |
|
Jose Gonzalez
|
b65200fde6
|
Solved issue with TinyMCE status bar. Now can view it properly
|
2019-11-22 10:17:16 +01:00 |
|
daniel
|
960326b980
|
Add menu omnishell
|
2019-11-21 18:21:46 +01:00 |
|
Tatiana Llorente
|
d392978a70
|
Fixed bug when deleting nodes in network maps
|
2019-11-21 17:28:58 +01:00 |
|
marcos
|
1640c03fc3
|
first changes pandora.js to pandora_ui.js
|
2019-11-21 16:42:39 +01:00 |
|
Daniel Barbero Martin
|
67fb2216d4
|
Fix
|
2019-11-20 09:48:35 +01:00 |
|
fbsanchez
|
53954ec853
|
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-11 14:26:23 +01:00 |
|
fbsanchez
|
65f5223698
|
validation alerts
|
2019-11-11 14:26:04 +01:00 |
|
fbsanchez
|
ed6dd2983f
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts:
pandora_console/include/javascript/pandora.js
|
2019-11-05 15:21:21 +01:00 |
|
fbsanchez
|
58cbc3c738
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
|
2019-11-05 15:17:09 +01:00 |
|
Daniel Barbero Martin
|
ebb7cbfe6c
|
Fix styles css
|
2019-11-05 15:12:24 +01:00 |
|
Daniel Rodriguez
|
a1b879d065
|
Merge branch 'ent-4728-Desactivar-Restart-Map-para-usuarios-sin-permisos' into 'develop'
Ent 4728 desactivar restart map para usuarios sin permisos
See merge request artica/pandorafms!2805
|
2019-11-04 18:45:57 +01:00 |
|
fbsanchez
|
3eb0a6bb95
|
minor fixes after internal meeting
|
2019-10-30 18:33:33 +01:00 |
|
fbsanchez
|
72b1fb2b16
|
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
Conflicts:
pandora_console/include/javascript/pandora.js
modified: pandora_console/general/register.php
modified: pandora_console/godmode/agentes/configurar_agente.php
modified: pandora_console/godmode/agentes/module_manager_editor.php
new file: pandora_console/include/ajax/welcome_window.php
new file: pandora_console/include/class/WelcomeWindow.class.php
modified: pandora_console/include/constants.php
modified: pandora_console/include/functions_config.php
modified: pandora_console/include/javascript/pandora.js
new file: pandora_console/include/styles/new_installation_welcome_window.css
|
2019-10-30 16:56:44 +01:00 |
|
fbsanchez
|
383967f68a
|
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
|
2019-10-29 16:56:01 +01:00 |
|
marcos
|
57bfc364ae
|
add modal confirmation window
|
2019-10-28 18:57:10 +01:00 |
|