tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,271 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

13271 Commits

Author SHA1 Message Date
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
Arturo Gonzalez 3c8bc86ab7 Added cascade protection by module (agent, massive and api). Ticket #187 2017-01-25 13:59:14 +01:00
Enrique Camargo 7394873568 Merge branch '29-eliminar-la-integracion-de-incidentes-con-tickets-de-integria' into 'develop' 
Erase integria incidents integration with integria tickets - #29

See merge request !80
 2017-01-25 12:48:38 +01:00
enriquecd d066c5f88f Erase integria incidents integration with integria tickets - #29 2017-01-25 12:40:42 +01:00
artica 1970167df4 Auto-updated build strings. 2017-01-25 00:01:13 +01:00
Arturo Gonzalez e41af015fb UX console in progress... (Added hierachy system to modules in tree view) 2017-01-24 16:02:09 +01:00
Enrique Camargo 93db05634f 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-01-24 15:07:39 +01:00
enriquecd 07c7d54566 Modify force button label in agent view - #28 2017-01-24 15:06:08 +01:00
Enrique Camargo d4b60a5225 Merge branch '26-algunos-umbrales-criticos-string-no-se-ven-integria-4376' into 'develop' 
Escape quotes in str_warning and str_critical fields in agent editor - #26

See merge request !75
 2017-01-24 11:58:05 +01:00
enriquecd 3cec295b9e Escape quotes in str_warning and str_critical fields in agent editor - #26 2017-01-24 11:55:46 +01:00
artica c4a49f1ac9 Auto-updated build strings. 2017-01-24 00:01:16 +01:00
Arturo Gonzalez c99ff92c86 UX console in progress... (Fixed vcharts) 2017-01-23 17:55:27 +01:00
Enrique Camargo 5bb4e747ec Merge branch '24-general-report-ordenar-por-nombre-de-agente-y-luego-por-nombre-modulo-integria-4367' into 'develop' 
Order by agent and module in general reports, fix group reports - #24

See merge request !73
 2017-01-23 17:41:20 +01:00
enriquecd 25535445fa Order by agent and module in general reports, fix group reports - #24 2017-01-23 17:39:33 +01:00
Enrique Camargo 823687ae3a Merge branch '25-edicion-de-timethreshold-en-accion-de-alerta-integria-4372' into 'develop' 
Timethreshold_alert_edition_fix - #25

See merge request !71
 2017-01-23 15:29:46 +01:00
enriquecd 0fec55fd82 Timethreshold_alert_edition_fix - #25 2017-01-23 15:27:22 +01:00
Arturo Gonzalez 265e440a4f UX console in progress... (init treeview modules hierachy) 2017-01-23 12:55:15 +01:00
artica 33301a89d0 Auto-updated build strings. 2017-01-22 00:01:13 +01:00
artica 5042fedfd6 Auto-updated build strings. 2017-01-21 00:01:16 +01:00
Enrique Camargo 65da4818c7 Merge branch '23-general-report-hay-un-error-de-traduccion-en-el-campo-operation-integria-4366' into 'develop' 
Change item minimum / maximum title in general reports - #23

See merge request !68
 2017-01-20 17:35:10 +01:00
enriquecd 29af08169f Change item minimum / maximum title in general reports - #23 2017-01-20 17:32:27 +01:00
Enrique Camargo 9916419f05 Merge branch '15-mejora_visuales_en_consola_visual_2_fixed_error_merge_pandoracss' into 'develop' 
Improve_visual_console_fix_pandoracss - #15

See merge request !67
 2017-01-20 16:05:35 +01:00
enriquecd e6dd14fcb6 Improve_visual_console_fix_pandoracss - #15 2017-01-20 16:02:34 +01:00
vgilc 3d6277178b Merge branch 'cherry-pick-add928bd' into 'develop' 
Merge branch '4261_no_meter_archivos_open' into 'pandora_6.0'

See merge request !66
 2017-01-20 14:52:32 +01:00
vgilc 2086eba5c5 Merge branch '4261_no_meter_archivos_open' into 'pandora_6.0' 
fixed errors

See merge request !65
 2017-01-20 14:52:14 +01:00
Arturo Gonzalez f9d6bbf323 UX console in progress... (ux console v3.0) 2017-01-20 12:20:00 +01:00
daniel 45938463cf Merge branch '22-graficas-estaticas-en-correos-con-problemas' into 'develop' 
fixed error in legend graph selected

See merge request !60
 2017-01-20 11:16:35 +01:00
daniel e4f8fa8341 fixed error in legend graph selected 2017-01-20 11:15:50 +01:00
Enrique Camargo 8ed84bf780 Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop' 
21-Mensaje no access solo aparece con alertas [INTEGRIA: #4368]

See merge request !58
 2017-01-20 11:09:35 +01:00
enriquecd 6f0a1dfb00 Mensaje no access solo aparece con alertas [INTEGRIA: #4368] 2017-01-20 11:00:32 +01:00
artica f154705317 Auto-updated build strings. 2017-01-20 00:01:17 +01:00
enriquecd 75177057e7 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-01-19 16:29:00 +01:00
enriquecd 919119e7be Add definition_file content to bd for web modules - #4261 2017-01-19 16:27:53 +01:00
daniel 688cec8f42 Merge branch 'fixed-errors-in-net_tools-open' into 'develop' 
fixed minor error in net_tool

See merge request !54
 2017-01-19 13:26:47 +01:00
daniel f3d18132f3 fixed minor error in net_tool 2017-01-19 13:24:57 +01:00
daniel 0f4c640f7b Merge branch '20-codificacion-de-nombre-en-el-tree-view-malas' into 'develop' 
fixed errors in tree-view

See merge request !52
 2017-01-19 12:46:23 +01:00
daniel 0ba7e76152 fixed errors in tree-view 2017-01-19 12:44:44 +01:00
Arturo Gonzalez 1d9bf2a1d5 UX console in progress... (ux console v1.0) 2017-01-19 12:35:59 +01:00
Arturo Gonzalez cfce014ad3 UX console in progress... (Fixed filter form in policy modules) 2017-01-19 10:13:59 +01:00
artica fea876396a Auto-updated build strings. 2017-01-19 00:01:12 +01:00
daniel 3ddff5c19e Merge branch '135-informe-de-eventos-sale-agrupado-int-4330-open' into 'develop' 
fixed errors in events reports #135

See merge request !6
 2017-01-18 17:40:20 +01:00
daniel 1b26423867 Merge branch 'develop' into 135-informe-de-eventos-sale-agrupado-int-4330-open 2017-01-18 17:39:04 +01:00
Arturo Gonzalez 55063a20dc UX console in progres... (Added hierachy mode in modules list) 2017-01-18 17:33:28 +01:00
daniel dd58ea3ee0 Merge branch '157-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208-parte2-open' into 'develop' 
ip dinamic in policies

See merge request !49
 2017-01-18 17:23:07 +01:00
daniel c8a33eb115 ip dinamic in policies 2017-01-18 17:20:55 +01:00