enriquecd
|
df715561d7
|
Format module inventary to show only changes on events - #523
|
2017-05-24 18:24:53 +02:00 |
|
vgilc
|
44dc9128b2
|
Merge branch '537-Module-graphs-dev' into 'develop'
537 module graphs dev
See merge request !503
|
2017-05-24 14:14:16 +02:00 |
|
Arturo Gonzalez
|
20c205fbc9
|
Added good styles to graphs
|
2017-05-24 13:12:47 +02:00 |
|
Arturo Gonzalez
|
4a03298b69
|
Added unit to module name and recolocate yaxis label
|
2017-05-24 12:18:43 +02:00 |
|
vgilc
|
20599871a1
|
Merge branch '711-agent-name-en-lugar-de-alias' into 'develop'
Remove quotation marks in agent deletion
See merge request !501
|
2017-05-24 09:26:18 +02:00 |
|
vgilc
|
af898c8b3d
|
Merge branch '704-agrupar-gráficas-combinadas' into 'develop'
704 agrupar gráficas combinadas
See merge request !500
|
2017-05-24 09:25:11 +02:00 |
|
artica
|
42704e5981
|
Auto-updated build strings.
|
2017-05-24 00:01:10 +02:00 |
|
Daniel Maya
|
e1b867069b
|
Remove quotation marks in agent deletion
|
2017-05-23 17:50:37 +02:00 |
|
Daniel Maya
|
0f9a2cf2f8
|
New feature: Graphic grouping. added mr
|
2017-05-23 17:17:40 +02:00 |
|
Daniel Maya
|
e243067c4b
|
New feature: Graphic grouping
|
2017-05-23 17:13:47 +02:00 |
|
vgilc
|
6f6eac640b
|
Merge branch '913-fixed-blank-page-in-user-creation-(metaconsole)-dev' into 'develop'
Ficed bad include call
See merge request !498
|
2017-05-23 15:50:04 +02:00 |
|
Arturo Gonzalez
|
8692a17567
|
Ficed bad include call
|
2017-05-23 15:36:35 +02:00 |
|
vgilc
|
c8251d62e0
|
Merge branch '788_Añadir_macros_para_varias_ips' into 'develop'
add new macros all_address and address_n
See merge request !497
|
2017-05-23 10:25:56 +02:00 |
|
vgilc
|
b21e09deef
|
Merge branch '635-reset-or-recover-password-in-pandora-node-and-meta-dev' into 'develop'
635 reset or recover password in pandora node and meta dev
See merge request !389
|
2017-05-23 10:14:43 +02:00 |
|
daniel
|
37d3d895b0
|
add new macros all_address and address_n
|
2017-05-23 10:09:32 +02:00 |
|
vgilc
|
3abb9710b1
|
Merge branch '596-default_event_filter_by_user' into 'develop'
596 default event filter by user
See merge request !354
|
2017-05-23 10:05:49 +02:00 |
|
artu30
|
faa353bc5c
|
Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
# Conflicts:
# pandora_console/include/help/clippy/extension_cron_send_email.php
|
2017-05-23 09:50:22 +02:00 |
|
artu30
|
37757f7ace
|
Merge branch 'develop' into '596-default_event_filter_by_user'
# Conflicts:
# pandora_console/godmode/users/configure_user.php
|
2017-05-23 09:48:37 +02:00 |
|
artica
|
eddeb12bcf
|
Auto-updated build strings.
|
2017-05-23 00:01:18 +02:00 |
|
vgilc
|
7b851742b1
|
Merge branch '777-translations-dev' into 'develop'
777 translations dev
See merge request !413
|
2017-05-22 17:57:27 +02:00 |
|
artu30
|
a78b5cc60d
|
Merge branch 'develop' into '777-translations-dev'
# Conflicts:
# pandora_console/godmode/update_manager/update_manager.offline.php
# pandora_console/include/functions_update_manager.php
|
2017-05-22 17:51:21 +02:00 |
|
vgilc
|
50420f79b9
|
Merge branch '836-fixed-margin-top-images-in-vc-lines-open-dev' into 'develop'
Added margin top value to images when have lines
See merge request !496
|
2017-05-22 17:45:57 +02:00 |
|
artu30
|
b5d3893c41
|
Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev'
# Conflicts:
# pandora_console/include/javascript/pandora_visual_console.js
|
2017-05-22 17:38:49 +02:00 |
|
Arturo Gonzalez
|
f58a9151f7
|
Fixed bad merge, thx branches
|
2017-05-22 17:37:21 +02:00 |
|
Arturo Gonzalez
|
309e9e900e
|
Added margin top value to images when have lines
|
2017-05-22 17:31:29 +02:00 |
|
vgilc
|
6bded36a60
|
Merge branch '599-csv_divider_selector' into 'develop'
599 csv divider selector
See merge request !359
|
2017-05-22 17:11:52 +02:00 |
|
artica
|
3b6272a7d2
|
Auto-updated build strings.
|
2017-05-22 00:01:14 +02:00 |
|
artica
|
7d7d5a9cec
|
Auto-updated build strings.
|
2017-05-21 00:01:52 +02:00 |
|
artica
|
7749e7c08a
|
Auto-updated build strings.
|
2017-05-20 00:01:16 +02:00 |
|
vgilc
|
daf3c5d3f7
|
Merge branch 'Ayuda-Upload_max_filesize-PHP-v7' into 'develop'
Update en_GB translations - #886
See merge request !491
|
2017-05-19 12:00:28 +02:00 |
|
enriquecd
|
bb0eec8883
|
Update en_GB translations - #886
|
2017-05-19 11:44:12 +02:00 |
|
vgilc
|
da314c7ed7
|
Merge branch '825-La-pantalla-de-login-con-mysql-parado-no-configurado-no-se-ve-correctamente-2' into 'develop'
Fix logout bad permission with myslq service stopped dialog - #825
See merge request !490
|
2017-05-19 11:24:09 +02:00 |
|
enriquecd
|
57393eb9cf
|
Fix logout bad permission with myslq service stopped dialog - #825
|
2017-05-19 11:12:58 +02:00 |
|
artica
|
8d16f573cc
|
Auto-updated build strings.
|
2017-05-19 00:01:19 +02:00 |
|
vgilc
|
1e8e804ffe
|
Merge branch '700-date-format-in-charts-dev' into 'develop'
Added date format to long periods of time
See merge request !487
|
2017-05-18 17:19:07 +02:00 |
|
Arturo Gonzalez
|
8141dac798
|
Added date format to long periods of time
|
2017-05-18 17:01:15 +02:00 |
|
vgilc
|
f56587e11c
|
Merge branch '851-module-threshold-with-decimals-dev' into 'develop'
Added float parser to module threshold
See merge request !460
|
2017-05-18 16:08:05 +02:00 |
|
vgilc
|
c10df32cf8
|
Merge branch '825-La-pantalla-de-login-con-mysql-parado/no-configurado-no-se-ve-correctamente' into 'develop'
Change load order of homeurl when load config, fix mysql login error dialog - #825
See merge request !461
|
2017-05-18 15:29:01 +02:00 |
|
Enrique Camargo
|
2ccd799cbd
|
Merge branch 'develop' into '825-La-pantalla-de-login-con-mysql-parado/no-configurado-no-se-ve-correctamente'
# Conflicts:
# pandora_console/general/login_page.php
|
2017-05-18 15:23:20 +02:00 |
|
vgilc
|
51538db187
|
Merge branch 'ent-894-fallos-broker-asincronos-windows' into 'develop'
Fixed async issues in windows brokers
See merge request !485
|
2017-05-18 12:10:46 +02:00 |
|
fermin831
|
4b05351df0
|
Fixed async issues in windows brokers
|
2017-05-18 11:55:44 +02:00 |
|
vgilc
|
10e6153574
|
Merge branch '805-change-tip-icon-in-trap-editor-dev' into 'develop'
Added new help tip icon to snmp console
See merge request !443
|
2017-05-18 10:00:31 +02:00 |
|
artica
|
15b65ef3f8
|
Auto-updated build strings.
|
2017-05-18 00:01:18 +02:00 |
|
vgilc
|
cba6f13a3d
|
Merge branch '770-Bug_module_max,_module_min_en_Windows_Server_2016' into 'develop'
The min, max limits for agent modules were exclusives, now are inclusives - #770
See merge request !445
|
2017-05-17 17:53:35 +02:00 |
|
vgilc
|
19a76701a3
|
Merge branch '813-Footer-no-muestra-la-versión-correctamente' into 'develop'
Show package version rather build version in footer (ext. fix update manager css) - #813
See merge request !454
|
2017-05-17 17:51:25 +02:00 |
|
vgilc
|
4cee2eaea8
|
Merge branch '836-bad-parents-line-position-in-visual-console-dev' into 'develop'
836 bad parents line position in visual console dev
See merge request !448
|
2017-05-17 17:48:53 +02:00 |
|
vgilc
|
e89be76e61
|
Merge branch 'fixed-graphs-styles' into 'develop'
Fixed graphs styles Gitlab: #537
See merge request !283
|
2017-05-17 17:45:55 +02:00 |
|
vgilc
|
ab51561ecf
|
Merge branch 'Barra-de-scroll-en-ventana-de-error-de-permisos-de-config.php' into 'develop'
Not show scroll bar in config permission error dialog in index - #728
See merge request !385
|
2017-05-17 17:40:29 +02:00 |
|
vgilc
|
8be3e434c8
|
Merge branch '761-pandora-ux-widget-dev' into 'develop'
761 pandora ux widget dev
See merge request !414
|
2017-05-17 17:39:52 +02:00 |
|
vgilc
|
d7b1d71b95
|
Merge branch 'ent-680-paquetes-deb-exigen-php5-4370' into 'develop'
Added php5.6 deps to debian console package
See merge request !339
|
2017-05-17 17:38:26 +02:00 |
|