slerena
|
347a6d3a3d
|
Merge branch '1244-sql-error-in-massive-agents-edition-dev' into 'develop'
Added filter when id groups comes empty
See merge request !759
|
2017-08-29 13:49:21 +02:00 |
|
slerena
|
6bcc209d62
|
Merge branch '1177-Graficas_con_valores_negativos_rev' into 'develop'
fixed errors in simple graphs value negative
See merge request !758
|
2017-08-29 13:42:21 +02:00 |
|
Arturo Gonzalez
|
32ad745c62
|
Added filter when id groups comes empty
|
2017-08-29 11:32:25 +02:00 |
|
daniel
|
487711d567
|
fixed errors in simple graphs value negative
|
2017-08-29 09:28:05 +02:00 |
|
artica
|
8616015f38
|
Auto-updated build strings.
|
2017-08-29 00:01:14 +02:00 |
|
slerena
|
2ce481de54
|
Merge branch '1210-error-in-create-networkmaps-when-autorefresh-is-enabled-dev' into 'develop'
Added code to separate networkmap manage and networkmap view
See merge request !743
|
2017-08-28 13:12:47 +02:00 |
|
slerena
|
c1a755bc09
|
Merge branch '124-anadir-enlace-a-los-iconos-de-la-columna-remote-config-de-la-vista-de-agentes' into 'develop'
Add link to remote config column icons y agent view list - #124
See merge request !370
|
2017-08-28 12:35:33 +02:00 |
|
Enrique Camargo
|
092bbd12ff
|
Merge branch 'develop' into '124-anadir-enlace-a-los-iconos-de-la-columna-remote-config-de-la-vista-de-agentes'
# Conflicts:
# pandora_console/operation/agentes/estado_agente.php
|
2017-08-28 12:32:06 +02:00 |
|
slerena
|
b504c0bc6f
|
Merge branch '1229-Codigos-QR-de-Pandora' into 'develop'
Fix agent view qr mobile code - #1229
See merge request !751
|
2017-08-28 12:28:43 +02:00 |
|
slerena
|
88acc6352d
|
Merge branch '309-Mejoras-CLI-para-TMB-3' into 'develop'
Add instructions,user and force_create_agent parameters to CLI event_creator - #309
See merge request !744
|
2017-08-28 12:20:01 +02:00 |
|
slerena
|
fb88f44cff
|
Merge branch '1233-Macros-_date_-y-_time_-en-consola-visual' into 'develop'
Add _data_ _time_ macros for visual console - #1233
See merge request !749
|
2017-08-28 12:16:28 +02:00 |
|
slerena
|
d3a845a6b5
|
Merge branch '1151-Ayuda_de_alerta_en_actions_faltan_macros_que_si_estan_en_Templates' into 'develop'
fixed errors in helps macros
See merge request !750
|
2017-08-28 12:14:54 +02:00 |
|
artica
|
ab48fabc0b
|
Auto-updated build strings.
|
2017-08-28 00:01:12 +02:00 |
|
artica
|
ed72e8c342
|
Auto-updated build strings.
|
2017-08-27 00:01:12 +02:00 |
|
artica
|
b907a65921
|
Auto-updated build strings.
|
2017-08-26 00:01:37 +02:00 |
|
artica
|
8f373edf84
|
Auto-updated build strings.
|
2017-08-25 00:01:13 +02:00 |
|
enriquecd
|
8b718371f9
|
Fix agent view qr mobile code - #1229
|
2017-08-24 16:09:04 +02:00 |
|
daniel
|
45f33f9748
|
fixed errors in helps macros
|
2017-08-24 15:40:03 +02:00 |
|
enriquecd
|
c64d0bb082
|
Add _data_ _time_ macros for visual console - #1233
|
2017-08-24 12:50:55 +02:00 |
|
artica
|
1bf7d8278a
|
Auto-updated build strings.
|
2017-08-24 00:01:14 +02:00 |
|
artica
|
dcd5fd2e5e
|
Auto-updated build strings.
|
2017-08-23 00:01:14 +02:00 |
|
enriquecd
|
031a70cc51
|
Add instructions,user and force_create_agent parameters to CLI event_creator - #309
|
2017-08-22 10:43:22 +02:00 |
|
Arturo Gonzalez
|
7b208f6209
|
Added code to separate networkmap manage and networkmap view
|
2017-08-22 09:24:16 +02:00 |
|
artica
|
60757b0ad6
|
Auto-updated build strings.
|
2017-08-22 00:01:13 +02:00 |
|
artica
|
c1545fc802
|
Auto-updated build strings.
|
2017-08-21 00:01:11 +02:00 |
|
artica
|
f3e5c32c09
|
Auto-updated build strings.
|
2017-08-20 00:01:11 +02:00 |
|
artica
|
19f1c3610e
|
Auto-updated build strings.
|
2017-08-19 00:01:13 +02:00 |
|
vgilc
|
e0746e65e8
|
Merge branch '138-login-items-separate-width-dev' into 'develop'
Added separation width to login fields
See merge request !632
|
2017-08-18 13:18:40 +02:00 |
|
vgilc
|
453838942e
|
Merge branch '122-mensaje-de-error-en-gestion-de-usuarios-ext-3871-v7-0' into 'develop'
If result param is null not show bad result message when delete,disable user - #122
See merge request !368
|
2017-08-18 13:18:08 +02:00 |
|
vgilc
|
7fdfbde6ff
|
Merge branch '133-Bug-en-pop-up-de-activacion-de-licencia-theme-black' into 'develop'
Change license activation popup color text - #133
See merge request !393
|
2017-08-18 13:17:02 +02:00 |
|
vgilc
|
a2e0dc06be
|
Merge branch '137-La-busqueda-de-modulos-muestra-los-modulos-disabled-dev' into 'develop'
Disabled modules no longer appear in the search
See merge request !407
|
2017-08-18 13:16:03 +02:00 |
|
vgilc
|
be2eee1afa
|
Merge branch '109-modificar-titulo-de-columna-umbrales-en-vista-de-agente' into 'develop'
Text change warn by thresholds
Closes #109
See merge request !318
|
2017-08-18 13:15:27 +02:00 |
|
vgilc
|
e76c62ef48
|
Merge branch '144-problema-con-password-con-espacios-en-version-mobile' into 'develop'
Fixed problems with pass when this pass containt blank spaces.
See merge request !430
|
2017-08-18 13:14:15 +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
|
7ce67ef053
|
Merge branch '1090-bad-event-custom-field-dev' into 'develop'
Removed event custom field (id)
See merge request !649
|
2017-08-18 13:04:12 +02:00 |
|
vgilc
|
c09033ae03
|
Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop'
allow UNION sql reports
See merge request !704
|
2017-08-18 13:01:53 +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
|
901a163c84
|
Merge branch '1108-bad-api-and-cli-request-in-meta-with-events-dev' into 'develop'
Fixed meta event table in cli and api functions
See merge request !665
|
2017-08-18 12:50:19 +02:00 |
|
vgilc
|
d858d4840a
|
Merge branch '1111-Columna-email-error-en-vista-de-informes-dev' into 'develop'
Fixed email column
See merge request !668
|
2017-08-18 12:44:26 +02:00 |
|
vgilc
|
a5d3f916d7
|
Merge branch '1005-Graficas_de_alerta_con_umbrales' into 'develop'
1005 graficas de alerta con umbrales
See merge request !702
|
2017-08-18 12:42:27 +02:00 |
|
vgilc
|
0083d57297
|
Merge branch '1177-Graficas_con_valores_negativos' into 'develop'
fixed errors in graphs value negative
See merge request !703
|
2017-08-18 12:41:10 +02:00 |
|
vgilc
|
ac1a23c577
|
Merge branch '1150-added-link-to-fictional-nodes-and-redirect-with-dbclick-dev' into 'develop'
Added new function to redirect with dbclick when fictinal have a map link
See merge request !691
|
2017-08-18 12:40:36 +02:00 |
|
vgilc
|
2d153c1074
|
Merge branch '1130-Nombres-de-agente-en-vista-táctica-dev' into 'develop'
Extended number of characters allowed
See merge request !680
|
2017-08-18 12:38:15 +02:00 |
|
vgilc
|
0a1e11b927
|
Merge branch '1072-new-macro-to-get-the-module-id-dev' into 'develop'
Added new macro
See merge request !705
|
2017-08-18 12:37:46 +02:00 |
|
vgilc
|
386e48fe58
|
Merge branch '1155-Fallo-en-conexión-con-LDAP-dev' into 'develop'
Fixed Connection failure in ldap
See merge request !715
|
2017-08-18 12:37:07 +02:00 |
|
vgilc
|
50a7ea3dd9
|
Merge branch '1045-Insert-data-pierde-información-dev' into 'develop'
Fixed agent lost in insert data
See merge request !614
|
2017-08-18 12:36:06 +02:00 |
|
vgilc
|
6920831d60
|
Merge branch '1185-Bug_Update_Manager_Online_Pandora_7_Open' into 'develop'
fixed errors in update manager open
See merge request !714
|
2017-08-18 12:35:32 +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 |
|
artica
|
3ce15d5814
|
Auto-updated build strings.
|
2017-08-18 00:01:12 +02:00 |
|
artica
|
f7ecefcc60
|
Auto-updated build strings.
|
2017-08-17 00:01:13 +02:00 |
|