vgilc
|
24d1b576a5
|
Revert "Merge branch '250-menu_error_with_new_inst' into 'pandora_6.0'"
This reverts merge request !150
|
2017-02-20 17:20:39 +01:00 |
|
vgilc
|
b0908ba24a
|
Merge branch 'cherry-pick-4a5a9a5e' into 'pandora_6.0'
Merge branch '40-ancho-de-los-combobox-integria-4407-2' into 'develop'
See merge request !174
|
2017-02-20 17:19:51 +01:00 |
|
vgilc
|
a3c1532832
|
Merge branch 'cherry-pick-0a40939d-4' into 'pandora_6.0'
Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-i…
See merge request !171
|
2017-02-20 17:19:32 +01:00 |
|
vgilc
|
0bdc38b2e2
|
Merge branch '269-fixed-last-contact' into 'pandora_6.0'
Fixed problems with column 'last contact'. Gitlab: #269
See merge request !170
|
2017-02-20 17:19:12 +01:00 |
|
vgilc
|
aac0c11c94
|
Merge branch 'cherry-pick-0a40939d-3' into 'pandora_6.0'
Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-i…
See merge request !169
|
2017-02-20 17:18:51 +01:00 |
|
vgilc
|
af5186cb4a
|
Merge branch 'cherry-pick-8bc12f02' into 'pandora_6.0'
Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agen…
See merge request !167
|
2017-02-20 17:18:21 +01:00 |
|
vgilc
|
3f5d90a8dd
|
Merge branch '250-menu_error_with_new_inst' into 'pandora_6.0'
Fixed classic menu mode. Ticket #250
See merge request !150
|
2017-02-20 17:17:45 +01:00 |
|
vgilc
|
3c3618c453
|
Merge branch '241-wrong_date_format' into 'pandora_6.0'
Added "G" in srtftime format from date format. Ticket #241
See merge request !141
|
2017-02-20 17:17:00 +01:00 |
|
vgilc
|
83329a16f2
|
Merge branch 'cherry-pick-c6af6cd5' into 'pandora_6.0'
Merge branch '237-editar-modulo-web-no-enlazado-a-politica-integria-4421/open' into 'develop'
See merge request !138
|
2017-02-20 17:04:20 +01:00 |
|
vgilc
|
79e0984025
|
Merge branch 'Add-titles-to-all-levels-buttons-in-lateral-menu-buttons/2-6' into 'pandora_6.0'
Add titles to all levels buttons in lateral menu buttons / 2 - 6 - #234
See merge request !134
|
2017-02-20 17:03:58 +01:00 |
|
vgilc
|
72d1d6e477
|
Merge branch 'cherry-pick-3f893be7' into 'pandora_6.0'
Merge branch '48-aumentar-altura-de-las-filas-de-la-tabla-agent-contact-en-la-vi…
See merge request !132
|
2017-02-20 17:03:41 +01:00 |
|
vgilc
|
f3c29f0cc2
|
Merge branch 'cherry-pick-97c17595' into 'pandora_6.0'
Merge branch '230-se-descojona-la-solapa-cuando-el-nombre-del-servicio-tiene-mas…
See merge request !126
|
2017-02-20 17:03:24 +01:00 |
|
vgilc
|
45944dd1de
|
Merge branch 'cherry-pick-7db496e7' into 'pandora_6.0'
Merge branch '44-las-plantillas-de-modulos-no-guardan-la-unidad-de-los-modulos-c…
See merge request !121
|
2017-02-20 16:35:47 +01:00 |
|
vgilc
|
b58fd0ae79
|
Merge branch 'cherry-pick-0a40939d' into 'pandora_6.0'
Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-i…
See merge request !118
|
2017-02-20 16:19:47 +01:00 |
|
vgilc
|
0b2b41f217
|
Merge branch 'cherry-pick-332d69d4' into 'pandora_6.0'
Merge branch '40-ancho-de-los-combobox-integria-4407' into 'develop'
See merge request !112
|
2017-02-20 16:18:13 +01:00 |
|
vgilc
|
d2adecab19
|
Merge branch 'cherry-pick-3fe45184' into 'pandora_6.0'
Merge branch '37-agregar-filtros-a-masivas-agentes-integria-4333' into 'develop'
See merge request !104
|
2017-02-20 16:17:28 +01:00 |
|
vgilc
|
669deb19da
|
Merge branch 'cherry-pick-083ef3d8-2' into 'pandora_6.0'
Merge branch '209-optimizar-widget-general-and-quick-group-status-report-integri…
See merge request !95
|
2017-02-20 16:16:16 +01:00 |
|
vgilc
|
b2f6a211b6
|
Merge branch 'cherry-pick-99220f44' into 'pandora_6.0'
Merge branch '30-anadir-transicion-al-hover-de-los-botones-laterales-de-menu-y-d…
See merge request !83
|
2017-02-20 16:15:49 +01:00 |
|
vgilc
|
fad47ee3b4
|
Merge branch 'cherry-pick-93db0563' into 'pandora_6.0'
Merge branch '28-modificar-etiqueta-de-boton-forzar-integria-4341' into 'develop'
See merge request !78
|
2017-02-20 16:15:22 +01:00 |
|
vgilc
|
9ed4669d41
|
Merge branch '26-algunos-umbrales-criticos-string-no-se-ven-integria-4376-6' into 'pandora_6.0'
Escape quotes in str_warning and str_critical fields in agent editor / 6 - #26
See merge request !76
|
2017-02-20 16:09:43 +01:00 |
|
Enrique Camargo
|
9ebcdb45a1
|
Merge branch '40-ancho-de-los-combobox-integria-4407-2' into 'develop'
Not limit 300px agent and module comboboxes in graph builder - #40
See merge request !173
|
2017-02-20 12:39:18 +01:00 |
|
artica
|
ea3a5aaf63
|
Auto-updated build strings.
|
2017-02-20 00:01:32 +01:00 |
|
artica
|
afe22a3e81
|
Auto-updated build strings.
|
2017-02-19 00:01:30 +01:00 |
|
artica
|
0cd03f1fb2
|
Auto-updated build strings.
|
2017-02-18 00:01:31 +01:00 |
|
Enrique Camargo
|
6114eb8e5b
|
Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-integria-4405' into 'develop'
Resolve "La ayuda del post-procesado de módulos crea confusión entre . y , [INTEGRIA: #4405]"
See merge request !117
|
2017-02-17 14:41:23 +01:00 |
|
vgilc
|
e17dec34de
|
Merge branch 'cherry-pick-d4f70d2d' into 'pandora_6.0'
Merge branch '35-configurar-portada-de-informes-integria-4325' into 'develop'
See merge request !99
|
2017-02-17 14:04:33 +01:00 |
|
m-lopez-f
|
72d18f61a4
|
Fixed problems with column 'last contact'. Gitlab: #269
|
2017-02-17 13:42:17 +01:00 |
|
Enrique Camargo
|
a52ef0aaf5
|
Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-integria-4405' into 'develop'
Resolve "La ayuda del post-procesado de módulos crea confusión entre . y , [INTEGRIA: #4405]"
See merge request !117
|
2017-02-17 13:27:26 +01:00 |
|
Enrique Camargo
|
ba9352b4de
|
Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' into 'develop'
Insert newline between module first and agent first in module massive op - #62
See merge request !166
|
2017-02-17 12:26:40 +01:00 |
|
vgilc
|
4d6a3ee66c
|
Merge branch 'cherry-pick-6b168873' into 'pandora_6.0'
Merge branch '52-la-ventana-de-alertas-deberia-de-ser-arrastrable-y-con-zindex-3…
See merge request !144
|
2017-02-17 10:40:34 +01:00 |
|
vgilc
|
78f46d7b85
|
Merge branch 'cherry-pick-1ba76736' into 'pandora_6.0'
Merge branch '7-cambiar-color-de-grafica-de-acceso-integria-3271' into 'develop'
See merge request !130
|
2017-02-17 10:12:08 +01:00 |
|
artica
|
2312a95805
|
Auto-updated build strings.
|
2017-02-17 00:01:31 +01:00 |
|
vgilc
|
b853ece28e
|
Merge branch 'cherry-pick-93db0563-2' into 'pandora_6.0'
Merge branch '28-modificar-etiqueta-de-boton-forzar-integria-4341' into 'develop'
See merge request !165
|
2017-02-16 18:17:51 +01:00 |
|
Enrique Camargo
|
eb6d73c65e
|
Merge branch '28-modificar-etiqueta-de-boton-forzar-integria-4341' into 'develop'
Resolve "Modificar etiqueta de botón forzar [INTEGRIA: #4341]"
See merge request !77
|
2017-02-16 17:37:55 +01:00 |
|
vgilc
|
df742dbd6f
|
Merge branch 'cherry-pick-483c64a8' into 'pandora_6.0'
Add lost updates of files in mobile version #148
See merge request !158
|
2017-02-16 10:27:01 +01:00 |
|
m-lopez-f
|
a36e201c8d
|
Add lost updates of files in mobile version #148
|
2017-02-16 08:39:22 +01:00 |
|
artica
|
565edcb1b3
|
Auto-updated build strings.
|
2017-02-16 00:01:29 +01:00 |
|
vgilc
|
e0ee47739d
|
Merge branch '179-error-al-crear-nuevo-componente-local-y-seleccionarlo-en-agente-integria-3934-6-open-bug' into 'pandora_6.0'
Show local components bar in module editor/creator, remote_config function was not hooked - #179
See merge request !156
|
2017-02-15 16:00:47 +01:00 |
|
vgilc
|
a905153349
|
Merge branch 'cherry-pick-68bdcdd7' into 'pandora_6.0'
Fixed typo error
See merge request !155
|
2017-02-15 15:49:51 +01:00 |
|
enriquecd
|
0f2eaa2dca
|
Show local components bar in module editor/creator, remote_config function was not hooked - #179
|
2017-02-15 15:24:28 +01:00 |
|
m-lopez-f
|
f368a01fce
|
Fixed typo error
|
2017-02-15 13:44:54 +01:00 |
|
vgilc
|
a8f00936cb
|
Merge branch 'cherry-pick-1fe9ded0' into 'pandora_6.0'
Add changes of visual mobile version of pandora. Gitlab: #148
See merge request !153
|
2017-02-15 13:10:11 +01:00 |
|
artica
|
3b4b8b660d
|
Auto-updated build strings.
|
2017-02-15 00:01:28 +01:00 |
|
artica
|
4fd44d5597
|
Auto-updated build strings.
|
2017-02-14 00:01:32 +01:00 |
|
m-lopez-f
|
3779167593
|
Add changes of visual mobile version of pandora. Gitlab: #148
|
2017-02-13 16:14:51 +01:00 |
|
Arturo Gonzalez
|
7fcc833e4d
|
Fixed classic menu mode. Ticket #250
(cherry picked from commit 4c63756f51fa83787f30715b106586a68745527e)
Conflicts:
pandora_console/general/main_menu.php
|
2017-02-13 13:55:18 +01:00 |
|
artica
|
56d609ccdc
|
Auto-updated build strings.
|
2017-02-13 00:01:34 +01:00 |
|
artica
|
df645d0d90
|
Auto-updated build strings.
|
2017-02-12 00:01:29 +01:00 |
|
artica
|
ea73a5dafb
|
Auto-updated build strings.
|
2017-02-11 00:01:34 +01:00 |
|
vgilc
|
22a4424e5e
|
Merge branch '208-events_problems_with_like_in_tags_field' into 'pandora_6.0'
Fixed events query with like in tags field. Ticket #208
See merge request !145
|
2017-02-10 14:18:55 +01:00 |
|