vgilc
|
e8a14b6981
|
Merge branch '1416-new-h-and-v-bar-charts-in-visual-console-dev' into 'develop'
1416 new h and v bar charts in visual console dev
See merge request artica/pandorafms!956
|
2017-10-26 13:30:52 +02:00 |
|
vgilc
|
e03d3a207a
|
Merge branch '1430-werid-design-in-monitor-search-form-dev' into 'develop'
Added good size to form elements
See merge request artica/pandorafms!884
|
2017-10-26 13:19:16 +02:00 |
|
vgilc
|
e344ad8de8
|
Merge branch '1441-Busqueda-y-ordenacion-no-funcionan-correctamente-en-Gestionar-agentes-Carrefour' into 'develop'
Uncomment collation order for case insensitive agent search - #1441
See merge request artica/pandorafms!913
|
2017-10-26 09:53:45 +02:00 |
Arturo Gonzalez
|
1d3a082e5c
|
Added item to editor
|
2017-10-19 12:22:01 +02:00 |
Daniel Maya
|
03f0c47bc2
|
fixed icon with planned downtime
|
2017-10-18 11:15:51 +02:00 |
enriquecd
|
45383875b1
|
Uncomment collation order for case insensitive agent search - #1441
|
2017-10-10 14:55:17 +02:00 |
|
Arturo Gonzalez
|
14095053cc
|
Added good size to form elements
|
2017-10-04 18:01:01 +02:00 |
|
vgilc
|
563b903012
|
Merge branch '1373-agent-name-en-lugar-de-alias-en-módulos-sintéticos-dev' into 'develop'
changed agent name by alias in module_manager_editor_prediction.php
See merge request !861
|
2017-10-04 17:44:29 +02:00 |
|
vgilc
|
d181edc471
|
Merge branch '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' into 'develop'
New feature. Dynamic units
See merge request !818
|
2017-10-04 17:41:37 +02:00 |
|
vgilc
|
13f12baa33
|
Merge branch '1255-Opcion-para-tener-Alias-as-name-por-defecto-4463-vodat' into 'develop'
Use alias as name with option default tconfig - #1255
See merge request !803
|
2017-10-04 15:52:17 +02:00 |
|
Daniel Maya
|
078955a830
|
changed agent name by alias in module_manager_editor_prediction.php
|
2017-09-27 13:37:46 +02:00 |
|
Daniel Maya
|
237755a84c
|
Merge branch 'develop' into '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev'
# Conflicts:
# pandora_console/include/functions_graph.php
|
2017-09-25 15:34:39 +02:00 |
daniel
|
7a8135f36d
|
fixed error merge dani
|
2017-09-25 09:45:58 +02:00 |
|
Daniel Maya
|
d7f3e1ecde
|
New feature. Dynamic units
|
2017-09-14 12:10:41 +02:00 |
|
vgilc
|
508a594dba
|
Merge branch '1154-Fallo-en-creación-de-paradas-programadas-en-modo-quiet-dev' into 'develop'
Added modules selection mode
See merge request !804
|
2017-09-11 09:53:06 +02:00 |
|
vgilc
|
fecd2b14e4
|
Merge branch '1168-icon-in-agents-know-if-is-in-planned-downtime-dev' into 'develop'
Added image to planned downtime
See merge request !772
|
2017-09-11 09:32:49 +02:00 |
|
Daniel Maya
|
32fa42a378
|
Added modules selection mode
|
2017-09-08 12:32:21 +02:00 |
|
enriquecd
|
74e4ae3f71
|
Use alias as name with option default tconfig - #1255
|
2017-09-08 12:11:15 +02:00 |
|
vgilc
|
daca367320
|
Merge branch '832-pandora-exec-proxy-xml-description-dev' into 'develop'
Added safe output to conf
See merge request !781
|
2017-09-05 13:20:32 +02:00 |
|
Arturo Gonzalez
|
bc63e8051e
|
Added safe output to conf
|
2017-09-05 12:51:39 +02:00 |
|
daniel
|
4430a7b2fe
|
fixed errors in autocomplete field
|
2017-09-05 12:35:21 +02:00 |
|
Arturo Gonzalez
|
4d469426a5
|
Added specs from MPulido
|
2017-09-05 11:46:44 +02:00 |
|
vgilc
|
09f92b51ae
|
Merge branch '832-server-proxy-final-details-dev' into 'develop'
Added last specifications to pandora exec proxy
See merge request !775
|
2017-09-04 16:33:11 +02:00 |
|
Arturo Gonzalez
|
018f449fc8
|
Added last specifications to pandora exec proxy
|
2017-09-04 16:02:58 +02:00 |
|
daniel
|
a04e02570f
|
Merge branch 'develop' into 1056-pandora-wux-grid-server
|
2017-09-04 14:09:08 +02:00 |
|
daniel
|
f0862e1c5b
|
fixed minor errors in WUX
|
2017-09-04 12:09:19 +02:00 |
|
Arturo Gonzalez
|
4ebc081855
|
Added image to planned downtime
|
2017-09-04 10:26:30 +02:00 |
nramon
|
13894ba403
|
Merge branch '832-server-proxy-details-dev' into 'develop'
Added details to agent wizard and secundary servers
See merge request !770
|
2017-09-01 11:36:53 +02:00 |
|
daniel
|
d74a3f74b4
|
Merge branch 'develop' into 1056-pandora-wux-grid-server
|
2017-09-01 10:51:54 +02:00 |
|
Arturo Gonzalez
|
a80f62003c
|
Added details to agent wizard and secundary servers
|
2017-09-01 10:44:26 +02:00 |
|
enriquecd
|
ac0820b9b4
|
change url in preview qr code in agent view - #1229
|
2017-08-31 15:57:34 +02:00 |
|
Arturo Gonzalez
|
0eabf7a0ce
|
Do the autocomplete field correct
|
2017-08-30 15:52:28 +02:00 |
|
daniel
|
b078d48918
|
fixed errors in wux
|
2017-08-30 09:47:57 +02:00 |
slerena
|
9c4eb3086e
|
Merge branch '832-exec-proxy-dev' into 'develop'
832 exec proxy dev
See merge request !755
|
2017-08-29 16:11:03 +02:00 |
fbsanchez
|
9a8e80bf68
|
Updates wux_module to web_analysis
|
2017-08-28 19:55:01 +02:00 |
|
Arturo Gonzalez
|
0e7b00f26e
|
Added correct user and fixed db error
|
2017-08-28 16:38:30 +02:00 |
|
Arturo Gonzalez
|
bab1f14a31
|
Added remote command execute to agent wizard
|
2017-08-28 12:44:51 +02:00 |
|
enriquecd
|
8b718371f9
|
Fix agent view qr mobile code - #1229
|
2017-08-24 16:09:04 +02:00 |
|
daniel
|
c29d8a4fdb
|
Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
|
2017-08-23 09:35:17 +02:00 |
|
daniel
|
8232911713
|
merge develop
|
2017-08-22 18:39:34 +02:00 |
|
daniel
|
f5da86ac0a
|
no apply policies in wux
|
2017-08-22 11:39:21 +02:00 |
|
vgilc
|
7d1a7103ad
|
Merge branch '1190-Fallo-al-buscar-módulos-de-agente-en-protección-en-cascada-dev' into 'develop'
Fixed issue to search agent modules in cascade protection
See merge request !717
|
2017-08-18 13:05:01 +02:00 |
|
vgilc
|
93c03da3fe
|
Merge branch '1091-Fixed-key-sensitive-search-in-agents-list-dev' into 'develop'
Fixed search field in agents list
See merge request !650
|
2017-08-18 13:01:01 +02:00 |
|
vgilc
|
870be2c4ea
|
Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop'
Fixed issue with cascade_protection_module
See merge request !720
|
2017-08-18 12:34:31 +02:00 |
|
daniel
|
1d7d55a451
|
fixed errors in form wux
|
2017-08-09 13:27:51 +02:00 |
|
daniel
|
788cb8cbd8
|
fixed errors in form wux
|
2017-08-09 12:08:52 +02:00 |
|
daniel
|
7e649b78b3
|
wux new form
|
2017-08-09 11:29:16 +02:00 |
|
daniel
|
be0a91ed2c
|
fixed minor error sql delete module
|
2017-08-09 10:35:57 +02:00 |
|
Daniel Maya
|
3ef3679f10
|
Fixed issue with cascade_protection_module
|
2017-08-08 10:38:30 +02:00 |
|
Daniel Maya
|
97392c4568
|
Fixed issue to search agent modules in cascade protection
|
2017-08-07 13:10:02 +02:00 |