Commit Graph

13540 Commits

Author SHA1 Message Date
daniel ffb5df9f23 Merge branch 'resolve-conflict-events-reports' into 'develop'
fixed errors in reports evnts

See merge request !106
2017-02-02 10:14:52 +01:00
daniel 5dad591b02 fixed errors in reports evnts 2017-02-02 10:13:58 +01:00
artica 707381284e Auto-updated build strings. 2017-02-02 00:01:16 +01:00
Enrique Camargo 06a0b3b885 Merge branch '25-edicion-de-timethreshold-en-accion-de-alerta-integria-4372' into 'develop'
Timethreshold_alert_edition_fix - 2 / Load fields fired in popup - #25

See merge request !105
2017-02-01 19:22:03 +01:00
enriquecd af763e14e9 Timethreshold_alert_edition_fix - 2 / Load fields fired in popup - #25 2017-02-01 19:17:20 +01:00
Enrique Camargo 3fe4518464 Merge branch '37-agregar-filtros-a-masivas-agentes-integria-4333' into 'develop'
Disabled and enabled or all agents selector in agent massive operations - #37

See merge request !103
2017-02-01 17:38:26 +01:00
enriquecd 363c147043 Disabled and enabled or all agents selector in agent massive operations - #37 2017-02-01 17:31:39 +01:00
daniel 0366937903 Merge branch '36-cli-locate_agent-integria-4388' into 'develop'
fixed error CLI

See merge request !101
2017-02-01 12:49:00 +01:00
daniel 09e1657583 fixed error CLI 2017-02-01 12:47:45 +01:00
Arturo Gonzalez 5971870b1c Added images to meta update manager. 2017-02-01 12:09:19 +01:00
Arturo Gonzalez 83241de441 Fixed default value in config. Ticket #218 2017-02-01 12:02:33 +01:00
Arturo Gonzalez d4a35a0097 Added old d3 lib to servicemap. Ticket #218 2017-02-01 11:58:39 +01:00
Arturo Gonzalez afd3322d52 Added new options to servicemap. Ticket #218 2017-02-01 11:57:10 +01:00
artica 295cd3806f Auto-updated build strings. 2017-02-01 00:01:16 +01:00
Enrique Camargo d4f70d2d6c Merge branch '35-configurar-portada-de-informes-integria-4325' into 'develop'
Show/hide front page custom report display or not in setup visual on click - #35

See merge request !98
2017-01-31 19:16:26 +01:00
enriquecd 7c761c8080 Show/hide front page custom report display or not in setup visual on click - #35 2017-01-31 19:13:37 +01:00
fbsanchez bcbcb308f7 Removed wmic requirement for pandorafms_server RPM 2017-01-31 18:00:38 +01:00
daniel c6784af7bf Merge branch 'fixed-errors-reports-events-and-alert' into 'develop'
fixed errors in reports evnts and alerts groups

See merge request !96
2017-01-31 17:01:44 +01:00
daniel d1f49bebe5 fixed errors in reports evnts and alerts groups 2017-01-31 17:01:12 +01:00
daniel 083ef3d83a Merge branch '209-optimizar-widget-general-and-quick-group-status-report-integria-4401-open' into 'develop'
fixed errors in widgets groups status

See merge request !94
2017-01-31 16:19:06 +01:00
daniel a2dee9edfd fixed errors in widgets groups status 2017-01-31 16:18:15 +01:00
Arturo Gonzalez 3976a45e89 Now times under 1 day will be shown in a correct format. Ticket #215 2017-01-31 15:46:56 +01:00
Enrique Camargo 7fde04ebb3 Merge branch '34-tablas-script-de-migracion-integria-4389' into 'develop'
Add titem, tmap, trel_item tables to migration 6 - 6.1 script - #34

See merge request !92
2017-01-31 15:41:32 +01:00
enriquecd 08f4f9524b Add titem, tmap, trel_item tables to migration 6 - 6.1 script - #34 2017-01-31 15:39:06 +01:00
Arturo Gonzalez b5438effbc Deleted agent version update. Ticket #212 2017-01-31 13:25:21 +01:00
Arturo Gonzalez f9c56237fd Fixed mac, avg and min values in reports and visual maps. Ticket #159 2017-01-31 12:42:10 +01:00
Enrique Camargo 375bea910a Merge branch '33-buscador-en-gestion-de-agentes-es-case-sensitive-integria-4398' into 'develop'
Make agent manager search bar case insensitive - #33

See merge request !90
2017-01-31 11:44:36 +01:00
enriquecd cf4283c632 Make agent manager search bar case insensitive - #33 2017-01-31 11:42:12 +01:00
Arturo Gonzalez 9d5a79b6fc Fixed events with non privileges user. Ticket #208 2017-01-31 11:01:54 +01:00
m-lopez-f 29a0b192b1 Fixed a typo error. GitHub #78 2017-01-31 09:35:29 +01:00
artica 2f7a6f0286 Auto-updated build strings. 2017-01-31 00:01:18 +01:00
Arturo Gonzalez fea6a1134d Fixed update manager online open version. Ticket #201 2017-01-30 11:28:59 +01:00
artica c3c9189cc0 Auto-updated build strings. 2017-01-30 00:01:16 +01:00
cesar991 a2aa29e4bf Add Views_metaconsole.py test 2017-01-29 16:45:49 +01:00
artica 6ad1682ef9 Auto-updated build strings. 2017-01-29 00:01:14 +01:00
artica 5cf006e82e Auto-updated build strings. 2017-01-28 00:01:14 +01:00
Enrique Camargo f5169b4816 Merge branch '32-anadir-seccion-description-a-html-view-integria-4323' into 'develop'
Add description section in html viewer, settable on setup/visual styles - #36

See merge request !86
2017-01-27 17:28:04 +01:00
enriquecd 60d8a6603e Add description section in html viewer, settable on setup/visual styles - #36 2017-01-27 17:25:10 +01:00
Arturo Gonzalez 1346e04157 Added images to ux console and meta update manager online. 2017-01-27 13:14:25 +01:00
artica ce306aa1d6 Auto-updated build strings. 2017-01-27 00:01:16 +01:00
Arturo Gonzalez c8806fe7df Added update manager online to metaconsole. Ticket #191 2017-01-26 14:54:26 +01:00
Ramon Novoa 5d67fd49df Disable console tests until they are stable. 2017-01-26 12:41:21 +01:00
Enrique Camargo 5fc52c343e Merge branch '31-mostrar-espacio-en-descripcion-agente-windows-integria-4378' into 'develop'
Show free space in windows agent - #31

See merge request !84
2017-01-26 12:39:14 +01:00
enriquecd 1ecf471ab8 Show free space in windows agent - #31 2017-01-26 12:37:50 +01:00
Enrique Camargo 99220f4400 Merge branch '30-anadir-transicion-al-hover-de-los-botones-laterales-de-menu-y-de-la-ventana-de-alerta' into 'develop'
Add transition to hover change color in alert windows and left menu bar buttons - #30

See merge request !82
2017-01-26 12:12:25 +01:00
enriquecd f14f0d923f Add transition to hover change color in alert windows and left menu bar buttons - #30 2017-01-26 12:10:28 +01:00
Ramon Novoa e707f65a6f Set the type for async_abs modules. 2017-01-26 11:22:17 +01:00
artica 8465cd5266 Auto-updated build strings. 2017-01-26 00:01:16 +01:00
artu30 20fcd7ef32 Merge branch 'feature/ux_modules_hierarchy' into 'develop'
Feature/ux modules hierarchy

See merge request !81
2017-01-25 15:35:09 +01:00
Arturo Gonzalez 42dc9d2522 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-01-25 14:00:03 +01:00