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

7742 Commits

Author SHA1 Message Date
artica ed5c0c71b2 Updated version and build strings. 2017-08-16 10:38:02 +02:00
artica 70988d8c8c Auto-updated build strings. 2017-08-16 10:38:02 +02:00
daniel 2d3d9e782f fixed errors metaconsole reports serialize data 2017-08-16 10:38:02 +02:00
Daniel Maya 7d578093d9 Fixed label in automatic graph in node 2017-08-16 10:38:01 +02:00
daniel afc481098d fixed error exportation csv in custom graphs 2017-08-16 10:36:30 +02:00
Daniel Maya 43285a9192 Added label in automatic graph 2017-08-16 10:36:30 +02:00
Daniel Maya 860a81aee8 Fixed urlencode in event popup 2017-08-16 10:36:30 +02:00
Arturo Gonzalez 09bb7d8cd8 Changed field in sql request 2017-08-16 10:36:30 +02:00
daniel 571c74d558 fixed error export csv custom graph 2017-08-16 10:16:04 +02:00
artica b0f3a737a9 Auto-updated build strings. 2017-08-16 00:01:15 +02:00
artica a12f0de8b7 Auto-updated build strings. 2017-08-15 00:01:13 +02:00
vgilc 9c32a72c9f Merge branch 'develop' into '1077-sql-error-in-log4x-data-module-dialog-dev' 
# Conflicts:
#   pandora_console/include/functions_modules.php
 2017-08-14 15:26:54 +02:00
Daniel Maya 2f8e8703b7 Fixed 2017-08-14 14:53:56 +02:00
Daniel Maya c3d1d7e397 Xaxisname deleted from xaxes 2017-08-14 12:36:49 +02:00
vgilc aa54f0cc9a Merge branch '1156-Serialize_data_en_metaconsola_no_funciona' into 'develop' 
fixed errors metaconsole reports serialize data

See merge request !712
 2017-08-14 12:24:43 +02:00
vgilc 4d0b360bf8 Merge branch '1112-PopUp-eventos-no-carga-gráfica-de-módulos-con-espacios-dev' into 'develop' 
Fixed urlencode in event popup

See merge request !676
 2017-08-14 12:18:22 +02:00
vgilc f5d161b108 Merge branch '1167-Fallo_en_exportación_a_CSV_de_Custom_Graphs' into 'develop' 
fixed error exportation csv in custom graphs

See merge request !708
 2017-08-14 12:16:47 +02:00
vgilc baf9b6aa5a Merge branch '1173-Campo-label-no-funciona-en-templates-de-informe-en-la-metaconsola-dev' into 'develop' 
Added label in automatic graph

See merge request !706
 2017-08-14 12:13:58 +02:00
Hirofumi Kosaka 70a226540e "Massive Operations" had remained at Pandora Console. #161 2017-08-14 12:03:35 +09:00
artica 8462e9d3d5 Auto-updated build strings. 2017-08-14 00:01:13 +02:00
artica cc7b00bb39 Auto-updated build strings. 2017-08-13 00:01:12 +02:00
artica bc022aba2b Auto-updated build strings. 2017-08-12 00:01:13 +02:00
daniel 33ccab173e fixed errors visual console 2017-08-11 09:13:26 +02:00
artica 941341585e Auto-updated build strings. 2017-08-11 00:01:13 +02:00
daniel 0915e46e4c fixed errors in visual console on simple value 2017-08-10 17:45:00 +02:00
Daniel Maya e1d4a81034 Fixed issue with simple value 2017-08-10 15:45:53 +02:00
artica 8309e4fffb Updated version and build strings. 2017-08-10 10:37:06 +02:00
artica bbe63a30ec Auto-updated build strings. 2017-08-10 00:01:15 +02:00
daniel 1d7d55a451 fixed errors in form wux 2017-08-09 13:27:51 +02:00
daniel 788cb8cbd8 fixed errors in form wux 2017-08-09 12:08:52 +02:00
daniel 7e649b78b3 wux new form 2017-08-09 11:29:16 +02:00
artica f96032eeaa Auto-updated build strings. 2017-08-09 00:01:15 +02:00
artica d5cff43128 Auto-updated build strings. 2017-08-08 00:01:14 +02:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +02:00
Daniel Maya 160ad7e866 Fixed Connection failure in ldap 2017-08-07 09:21:26 +02:00
artica 5164624dca Auto-updated build strings. 2017-08-07 00:01:14 +02:00
artica 5a0da66b3d Auto-updated build strings. 2017-08-06 00:01:13 +02:00
artica c826d0951e Auto-updated build strings. 2017-08-05 00:01:13 +02:00
daniel e875ce9b4e fixed errors in update manager open 2017-08-04 14:07:27 +02:00
artica 2d8697eaeb Auto-updated build strings. 2017-08-04 00:01:14 +02:00
daniel c4171ac248 fixed errors metaconsole reports serialize data 2017-08-03 17:09:27 +02:00
Daniel Maya 78d4eb68bc Fixed problem in node 2017-08-03 13:29:18 +02:00
Daniel Maya 0932004781 Fixed label in automatic graph in node 2017-08-03 13:13:34 +02:00
daniel fb9f187287 fixed error exportation csv in custom graphs 2017-08-03 13:09:41 +02:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
Daniel Maya 362ab94781 Added label in automatic graph 2017-08-03 12:41:47 +02:00
daniel 20fc24b99e allow UNION sql reports 2017-08-03 11:32:43 +02:00
artica 5860d29e37 Auto-updated build strings. 2017-08-03 00:01:15 +02:00
daniel 89b0ec2584 fixed errors in graphs value negative 2017-08-02 16:46:50 +02:00
daniel 14422413a3 add helps in pandora macromodulegraphth 2017-08-02 12:00:26 +02:00
daniel 6e45b3cd9e add threshold graph send for mail 2017-08-02 11:48:37 +02:00
artica 408efec325 Updated version and build strings. 2017-08-02 10:12:45 +02:00
artica c363a2e085 Auto-updated build strings. 2017-08-02 00:01:14 +02:00
Daniel Maya dd5cb8088c added service functions in the API 2017-08-01 10:39:02 +02:00
artica 7e508a4137 Auto-updated build strings. 2017-08-01 00:01:14 +02:00
Arturo Gonzalez d298ba4d40 Center texts 2017-07-31 14:55:38 +02:00
Arturo Gonzalez 4ce9a96b74 Fixed last timestamp in interface charts 2017-07-31 12:50:50 +02:00
vgilc dc462550ef Merge branch 'reset_commit_acl_open' into 'develop' 
Revert "Use session and not exec sql if already exists acl perms in session - #1017"

See merge request !697
 2017-07-31 10:26:40 +02:00
artica 6a4a199c96 Auto-updated build strings. 2017-07-31 00:01:13 +02:00
artica 50c4419ef7 Auto-updated build strings. 2017-07-30 00:01:13 +02:00
artica cc40fcccc2 Auto-updated build strings. 2017-07-29 00:01:14 +02:00
daniel 179325447f Revert "Use session and not exec sql if already exists acl perms in session - #1017" 
This reverts commit 78bb583824.
 2017-07-28 12:46:17 +02:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
 2017-07-28 10:30:17 +02:00
vgilc ca43066ce8 Merge branch '1085-Añadir-sección-Description-a-HTML-view-meta-enterprise-open' into 'develop' 
Add report info option in metaconsole 7 open - #1085

See merge request !687
 2017-07-28 10:22:42 +02:00
vgilc 333171c2b6 Merge branch '1124-4288-agrupar-graficas-combinadas-ii_open' into 'develop' 
fixed errors in graph container

See merge request !688
 2017-07-28 10:19:15 +02:00
artica 55c70098ba Auto-updated build strings. 2017-07-28 00:01:13 +02:00
artica 9d6bd697a7 Auto-updated build strings. 2017-07-27 00:01:13 +02:00
artica a9d76e2748 Updated version and build strings. 2017-07-26 17:03:41 +02:00
artica 729503f509 Auto-updated build strings. 2017-07-26 00:01:13 +02:00
Arturo Gonzalez 6b30accd11 Added new function to redirect with dbclick when fictinal have a map link 2017-07-25 15:38:28 +02:00
vgilc a2d15f9f34 Merge branch '1129-new-events-bar-in-metaconsole-dev' into 'develop' 
1129 new events bar in metaconsole dev

See merge request !690
 2017-07-25 10:45:10 +02:00
Arturo Gonzalez 836cc384e9 Added good colours to meta tactical events bar 2017-07-25 08:36:21 +02:00
artica daa952649b Auto-updated build strings. 2017-07-25 00:01:13 +02:00
Arturo Gonzalez 9ddb47741f Added new events bar to meta 2017-07-24 16:34:22 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
daniel 741cc05268 fixed errors in graph container 2017-07-24 10:53:04 +02:00
artica f3d6d7262e Auto-updated build strings. 2017-07-24 00:01:17 +02:00
artica c51cf9774f Auto-updated build strings. 2017-07-23 00:01:13 +02:00
artica b5caec31b5 Auto-updated build strings. 2017-07-22 00:01:45 +02:00
enriquecd 75a9a41a0b Add report info option in metaconsole 7 open - #1085 2017-07-21 14:57:03 +02:00
artica 1d35620ea6 Auto-updated build strings. 2017-07-21 00:01:16 +02:00
enriquecd ef007f8a6f Fix labels - #1088 2017-07-20 15:53:43 +02:00
Enrique Camargo 9cc461ec8b Update functions_reporting.php 2017-07-20 15:23:46 +02:00
enriquecd f88f375ea3 Filter agents by server automatico module graph and fix bug - #1088 2017-07-20 15:14:20 +02:00
vgilc 8971560f5d Merge branch '412-consola-visual-Módulo-imagen-2-size' into 'develop' 
Fix restore element width when press double click over data image simple_value - #412

See merge request !681
 2017-07-20 09:42:31 +02:00
artica 728fb7cc69 Auto-updated build strings. 2017-07-20 00:01:18 +02:00
enriquecd 31a8995176 Fix restore element width when press double click over data image simple_value - #412 2017-07-19 19:02:20 +02:00
Daniel Maya f060a2cdd8 Extended number of characters allowed 2017-07-19 16:12:09 +02:00
Arturo Gonzalez 5baa1ae559 Added styles to service map elements 2017-07-19 15:40:33 +02:00
Daniel Maya 06eadbaf81 Fixed urlencode in event popup 2017-07-19 10:52:01 +02:00
Arturo Gonzalez 1ff3202c43 Added the last things to the new vc item (module events) 2017-07-19 10:36:24 +02:00
vgilc ef0e6a2093 Merge branch '713-Asignar-políticas-a-grupos-dev' into 'develop' 
713 asignar políticas a grupos dev

See merge request !667
 2017-07-19 09:55:10 +02:00
artica b8b6937284 Auto-updated build strings. 2017-07-19 00:01:16 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' 
# Conflicts:
#   pandora_console/extras/mr/4.sql
 2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
Arturo Gonzalez e9e10d3a79 Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev 
pandora_console/include/functions_visual_map.php
	pandora_console/include/functions_visual_map_editor.php
 2017-07-18 11:57:13 +02:00
Arturo Gonzalez bec023dc4d Fixed meta event table in cli and api functions 2017-07-18 11:36:57 +02:00
artica d65ad2693e Auto-updated build strings. 2017-07-18 00:01:17 +02:00
vgilc 7dd0e989fa Merge branch '412-consola-visual-Módulo-imagen' into 'develop' 
Add data image option to simple data visual console element - #412

See merge request !584
 2017-07-17 17:03:04 +02:00
vgilc 0bd74d92f0 Merge branch '1040-autorefresh-in-user-section-is-separated-by-user-dev' into 'develop' 
Added refresh by user

See merge request !607
 2017-07-17 10:54:06 +02:00
Enrique Camargo 1e7fbc443e Merge branch 'develop' into '412-consola-visual-Módulo-imagen' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-07-17 10:39:20 +02:00
artica 3fb887f516 Auto-updated build strings. 2017-07-17 00:01:15 +02:00
artica c5c748c831 Auto-updated build strings. 2017-07-16 00:01:15 +02:00
artica 8f88f87203 Auto-updated build strings. 2017-07-15 00:01:15 +02:00
artica 65cbbd1bae Auto-updated build strings. 2017-07-14 00:01:19 +02:00
vgilc f8a1b77158 Merge branch '1115-Redimensiónde-los-iconos-y-texto-en-mapas-GIS' into 'develop' 
Hold mark labels font size when autorefresh and fix drag map font size bug - #1115

See merge request !660
 2017-07-13 17:16:49 +02:00
Arturo Gonzalez b4c31df636 Fixed module events graph in vc 2017-07-13 16:57:53 +02:00
Arturo Gonzalez d57508f09e Added sla_auto_graph item to vc first version 2017-07-13 16:23:16 +02:00
Daniel Maya 27077dad6f Resolving conflicts 2017-07-13 15:23:22 +02:00
Arturo Gonzalez 8f2b4fb783 Added more changes to the first version 2017-07-13 13:25:28 +02:00
Arturo Gonzalez 19caa3ebfb Added js image 2017-07-13 12:26:13 +02:00
Enrique Camargo 0ff56b0856 Update openlayers.pandora.js 2017-07-13 12:07:53 +02:00
vgilc 38b42a26a2 Merge branch '845-Mejoras-en-SNMP-Browser-dev' into 'develop' 
845 mejoras en snmp browser dev

See merge request !602
 2017-07-13 12:07:46 +02:00
vgilc fb57ea216e Merge branch '997-Active-SNMP-filters-in-snmp-console-dev' into 'develop' 
Added active filters to snmp console

See merge request !611
 2017-07-13 12:02:39 +02:00
vgilc 3e527dfec4 Merge branch '1003-No-se-muestra-correctamente-el-histórico-de-módulos-log4x-dev' into 'develop' 
Fixed sql error in tagente_datos_log4x

See merge request !576
 2017-07-13 11:50:03 +02:00
vgilc ab1980b5c8 Merge branch '977-change-format-in-module-data-dev' into 'develop' 
Changed format

See merge request !560
 2017-07-13 11:48:26 +02:00
vgilc 5711e3ae75 Merge branch '1017-Re-implementacion-de-ACL-Enterprise-open' into 'develop' 
Use session and not exec sql if already exists acl perms in session - #1017

See merge request !624
 2017-07-13 11:36:13 +02:00
artica b0c2a9e25c Auto-updated build strings. 2017-07-13 00:01:16 +02:00
enriquecd c9219107bf Hold mark labels font size when autorefresh and fix drag map font size bug - #1115 2017-07-12 18:49:39 +02:00
Arturo Gonzalez 63d07e1416 Added more things to new vc item 2017-07-12 13:34:20 +02:00
Arturo Gonzalez 9db5669f16 Added item in button palette with default fields 2017-07-12 11:51:00 +02:00
vgilc f907f3cdb7 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes' into 'develop' 
Fix automatic combined graph macros in name and labels - #1088

See merge request !657
 2017-07-12 10:12:45 +02:00
artica 7536b1fd56 Auto-updated build strings. 2017-07-12 00:01:15 +02:00
enriquecd 39fb79bbb4 Fix automatic combined graph macros in name and labels - #1088 2017-07-11 18:22:25 +02:00
Daniel Maya 57f6ad097a update 2017-07-11 10:10:48 +02:00
Arturo Gonzalez 2402141c4f Changed text line 2017-07-11 10:04:26 +02:00
artica 2872686042 Auto-updated build strings. 2017-07-11 00:01:16 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +02:00
artica ede763cecf Updated version and build strings. 2017-07-10 15:11:14 +02:00
Arturo Gonzalez d0bd0b3a3b Changed field in sql request 2017-07-10 12:46:02 +02:00
artica 7002f24586 Auto-updated build strings. 2017-07-10 00:01:15 +02:00
artica 6fff54b0f0 Auto-updated build strings. 2017-07-09 00:01:15 +02:00
artica f1520483fd Auto-updated build strings. 2017-07-08 00:01:21 +02:00
Arturo Gonzalez a9ca7b6a8d Added a virgensita de guadalupe fix to generate networkmaps in windows systems 2017-07-07 13:21:05 +02:00
vgilc c19aaa1d64 Merge branch '151-actualizar-el-cliente-de-ehorus' into 'develop' 
Replaced references to switch.ehorus.com with portal.ehorus.com.

See merge request !647
 2017-07-07 11:05:25 +02:00
vgilc 35d722a13f Merge branch 'upload-new-ehorus-bundle' into 'develop' 
Upload new ehorus buldle

See merge request !633
 2017-07-07 10:52:57 +02:00
vgilc e49c2351ae Merge branch '1075-Operaciones-masivas-ponen-postprocess-a-0-dev' into 'develop' 
Fixed post process in Edit modules in bulk

See merge request !638
 2017-07-07 09:38:48 +02:00
vgilc 3c2ef0ea2c Merge branch '155-4248-calculo-dinamico-de-umbrales-en-tipos-booleanos-sla-disponibilidad' into 'develop' 
Fixes boolean modules threshold calc

Closes #155

See merge request !646
 2017-07-07 09:37:37 +02:00
artica 60e92e759b Auto-updated build strings. 2017-07-07 00:01:19 +02:00
fbsanchez ff6173ae54 Fixes boolean modules threshold calc 2017-07-06 14:10:08 +02:00
artica 872e36672c Auto-updated build strings. 2017-07-06 00:01:16 +02:00
vgilc cbc813a3a5 Merge branch '975-fixed-windows-graphviz-bin-path-conf-value-dev' into 'develop' 
Fixed conf field

See merge request !629
 2017-07-05 12:01:46 +02:00
vgilc 0fd6d38a6b Merge branch '853-Custom-SQL-que-afecten-a-BDD-de-histórico-enterprise-open' into 'develop' 
Add historical db check to reports template SQL items - #853

See merge request !640
 2017-07-05 11:45:18 +02:00
vgilc 6cc4e1756a Merge branch '1025-problems-with-charts-when-have-history-db-data-dev' into 'develop' 
Added changes to resolve bad history database data

See merge request !643
 2017-07-05 11:42:15 +02:00
Arturo Gonzalez ba829e78ce Removed interface link function in fictional nodes 2017-07-05 09:07:55 +02:00
artica 7e376fc6dd Auto-updated build strings. 2017-07-05 00:01:15 +02:00
artica 2fef8a39dd Auto-updated build strings. 2017-07-04 00:01:16 +02:00
Arturo Gonzalez b282063325 Added changes to resolve bad history database data 2017-07-03 15:09:31 +02:00
Daniel Maya d75511ba92 Fixed module counter 2017-07-03 12:58:36 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
artica acbe200f90 Auto-updated build strings. 2017-07-03 00:01:16 +02:00
artica ef6cf3d5d7 Auto-updated build strings. 2017-07-02 00:01:15 +02:00
artica 83fef400ae Auto-updated build strings. 2017-07-01 00:01:18 +02:00
Ramon Novoa 9a85c47f9e Replaced references to switch.ehorus.com with portal.ehorus.com. 2017-06-30 21:14:55 +02:00
Daniel Maya cfc7050bab Fixed post process in Edit modules in bulk 2017-06-30 14:18:23 +02:00
artica 5eb53d599a Auto-updated build strings. 2017-06-30 00:01:18 +02:00
enriquecd 95184cab21 Change pandorin dialog font color with black theme - #1060 2017-06-29 18:19:58 +02:00
m-lopez-f 25ede84c47 Upload new ehorus buldle 2017-06-29 16:10:25 +02:00
nramon 031ff3f6d2 Merge branch '310-Mejoras_pandora_revent_para_TMB_rev' into 'develop' 
fixed autovalidate event in pandora_revent with extra_id

See merge request !621
 2017-06-29 09:15:39 +02:00
nramon 5669c1b1a0 Merge branch '874_Anadir_posibilidad_de_ver_todos_los_eventos_rev' into 'develop' 
fixed minor error

See merge request !628
 2017-06-29 09:15:24 +02:00
artica 470ff1857b Auto-updated build strings. 2017-06-29 00:01:17 +02:00
Arturo Gonzalez e642c15c78 Fixed conf field 2017-06-28 17:49:39 +02:00
daniel 39d090db1e fixed minor error 2017-06-28 16:39:54 +02:00
Arturo Gonzalez 9348562ee4 Added good match to tags list 2017-06-28 16:20:57 +02:00
enriquecd 5c4b5a0242 Add link in minor release update dialog to documentation - #951 2017-06-28 15:47:24 +02:00
enriquecd 78bb583824 Use session and not exec sql if already exists acl perms in session - #1017 2017-06-28 11:31:45 +02:00
artica bd6088135d Auto-updated build strings. 2017-06-28 00:01:14 +02:00
daniel 9b1338b4c2 fixed autovalidate event in pandora_revent with extra_id 2017-06-27 10:51:35 +02:00
artica d678760e5d Auto-updated build strings. 2017-06-27 00:01:15 +02:00
artica ef22945b80 Auto-updated build strings. 2017-06-26 00:01:16 +02:00
artica 849a4d14e1 Auto-updated build strings. 2017-06-25 00:01:15 +02:00
artica 6ac3df710e Auto-updated build strings. 2017-06-24 00:01:16 +02:00
artica 41e1d42b22 Auto-updated build strings. 2017-06-23 00:01:16 +02:00
vgilc 87db7368c0 Merge branch '1028-Filtro-de-búsqueda-Agent-Detail-se-borra-al-cambiar-de-página-dev' into 'develop' 
Fixed error in filter pagination

See merge request !597
 2017-06-22 10:21:40 +02:00
Arturo Gonzalez e6efe5825b Added active filters to snmp console 2017-06-22 09:28:07 +02:00
artica 0ea3bc90fb Auto-updated build strings. 2017-06-22 00:01:16 +02:00
daniel d3a0c4b52b fixed errors in pandora revent 2017-06-21 14:34:06 +02:00
Arturo Gonzalez e86c87d23b Added refresh by user 2017-06-21 13:50:05 +02:00
artica 1b262808f2 Auto-updated build strings. 2017-06-21 00:01:18 +02:00
Daniel Maya c942fce068 added snmp_browser.ajax 2017-06-20 15:47:29 +02:00
Daniel Maya b7f4ecbe69 update css and added gif 2017-06-20 15:46:35 +02:00
Daniel Maya b38b41b942 updated files 2017-06-20 15:32:24 +02:00
vgilc 72202ae357 Merge branch '984-Meter-fondo-de-imagen-de-cuadros-grises-blancos-para-textarea-de-etiquetas-de-texto-en-la-consola-visual' into 'develop' 
Change vconsole label editor background color when rightclick on it - #984

See merge request !586
 2017-06-20 11:31:26 +02:00
Daniel Maya c678d8ba50 Merge branch 'develop' into '330-Agentes-sin-alertas-dev' 
# Conflicts:
#   pandora_console/include/functions_ui.php
 2017-06-20 11:06:24 +02:00
Daniel Maya a81b5b8239 Fixed error in filter pagination 2017-06-20 10:52:02 +02:00
Daniel Maya 4398b47d92 updated 2017-06-20 10:31:14 +02:00
artica e56d147345 Auto-updated build strings. 2017-06-20 00:01:16 +02:00
slerena c1166f280a Merge branch '1025-bug-with-more-than-6-months-charts-dev' into 'develop' 
Fixed more than 6 months charts

See merge request !591
 2017-06-19 17:50:48 +02:00
vgilc 6c087b0f6b Merge branch '989-um-online-open-js-error-dev' into 'develop' 
Added correct button declaration

See merge request !561
 2017-06-19 09:10:47 +02:00
vgilc 4b031d3337 Merge branch '992-Modulo-data-server-se-queda-en-desconocido-dev' into 'develop' 
Fixed current_interval in data server

See merge request !572
 2017-06-19 09:10:14 +02:00
vgilc 2e72025bbf Merge branch '874-Añadir-posibilidad-de-ver-todos-los-eventos' into 'develop' 
add checkbox for show all events in view agent detail

See merge request !585
 2017-06-19 09:09:24 +02:00
artica 5e4b1d6965 Auto-updated build strings. 2017-06-19 00:01:14 +02:00
artica 89ea98f505 Auto-updated build strings. 2017-06-18 00:01:14 +02:00
artica 8e94fd58f4 Auto-updated build strings. 2017-06-17 00:01:16 +02:00
Arturo Gonzalez 687e970c8e Fixed more than 6 months charts 2017-06-16 14:42:16 +02:00
artica 0059f79012 Auto-updated build strings. 2017-06-16 00:01:14 +02:00
Daniel Maya e68858e4c2 new feature in snmp browser 2017-06-15 15:12:27 +02:00
artica 70c651466e Auto-updated build strings. 2017-06-15 00:01:27 +02:00
enriquecd 8b83b94a40 Change vconsole label editor background color when rightclick on it - #984 2017-06-14 16:59:59 +02:00
daniel 80a38cbd9f add checkbox for show all events in view agent detail 2017-06-14 12:45:40 +02:00
Daniel Maya f07f0d1a00 fixed conflict 2017-06-14 12:06:41 +02:00
vgilc d8fc3ac9e9 Merge branch 'No-funciona-módulo-system-dev' into 'develop' 
Fixed problem in data display snmp wizard

See merge request !534
 2017-06-14 11:50:26 +02:00
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' 
539 encrypt agent custom fields in pandora console dev

See merge request !520
 2017-06-14 11:42:51 +02:00
vgilc 7bfd3254a7 Merge branch '656-changes-in-system-log-viewer-dev' into 'develop' 
Added changes

See merge request !518
 2017-06-14 11:32:44 +02:00
vgilc 9b35a7f5ba Merge branch '975-dot-and-plain-files-path-in-windows-dev' into 'develop' 
Added OS filter

See merge request !557
 2017-06-14 10:48:44 +02:00
vgilc 91f8e9d65c Merge branch '1010-Actualizar-servername-cuando-haya-cambio-de-mayúculas' into 'develop' 
fixed errors caase sensitive servername

See merge request !583
 2017-06-14 10:41:46 +02:00
artica d090692412 Auto-updated build strings. 2017-06-14 00:01:12 +02:00
enriquecd 2ede057298 Add data image option to simple data visual console element - #412 2017-06-13 16:49:25 +02:00
daniel d85ec51220 fixed errors caase sensitive servername 2017-06-13 12:42:21 +02:00
Arturo Gonzalez c506c9cce6 Added a condition to small charts 2017-06-13 09:45:08 +02:00
Arturo Gonzalez e237198d06 Added a final fix 2017-06-13 09:26:08 +02:00
artica 8ba1cf66af Auto-updated build strings. 2017-06-13 00:02:03 +02:00
vgilc 03e17e335f Merge branch '637-moduledata-macro-dev' into 'develop' 
Added moduledata macro help text

See merge request !580
 2017-06-12 18:04:54 +02:00
Arturo Gonzalez 0af82fd69d Added some code to manage timestamps in chart data 2017-06-12 17:48:42 +02:00
Arturo Gonzalez 6f343ccd74 Added moduledata macro help text 2017-06-12 17:10:19 +02:00
vgilc dbd510f6a0 Merge branch '757-fullscale-charts-all-data-dev' into 'develop' 
Added some code to put all data in the chart

See merge request !579
 2017-06-12 16:56:32 +02:00
Arturo Gonzalez e3443e044f Added some code to put all data in the chart 2017-06-12 16:39:46 +02:00
artica d3df682528 Updated version and build strings. 2017-06-12 16:05:06 +02:00
enriquecd 131753cfba Inprove event title format and alias rather name - #523 2017-06-12 14:34:03 +02:00
Daniel Maya 4693702741 Fixed sql error in tagente_datos_log4x 2017-06-12 13:43:53 +02:00
Arturo Gonzalez 00ac431216 Added code to manage timestamps in fullscale mode 2017-06-12 13:33:41 +02:00
artica ff30396595 Auto-updated build strings. 2017-06-12 00:01:16 +02:00
artica 0d458763b9 Auto-updated build strings. 2017-06-11 00:01:13 +02:00
artica 97bf8f1fda Auto-updated build strings. 2017-06-10 00:01:13 +02:00
artica 1f94295c0c Auto-updated build strings. 2017-06-09 00:01:17 +02:00
Daniel Maya aec9251b88 Fixed current_interval in data server 2017-06-08 17:04:43 +02:00
daniel 2d441437a8 fixed errors in login page 2017-06-08 11:26:16 +02:00
Arturo Gonzalez 4e02e31c8b Trace removed 2017-06-08 09:01:36 +02:00
artica bb17348087 Auto-updated build strings. 2017-06-08 00:01:15 +02:00
Arturo Gonzalez 7782b08b59 Added lost value 2017-06-07 15:10:51 +02:00
artu30 01f6f6ef5b Merge branch 'develop' into '851-new-report-type-max+min+avg-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.item_editor.php
#   pandora_console/include/functions_reporting_html.php
 2017-06-07 14:56:44 +02:00
Daniel Maya 5e099a0da3 added graph colors in dahsboard 2017-06-07 11:43:11 +02:00
Arturo Gonzalez 474957249b Added correct button declaration 2017-06-07 10:29:01 +02:00
vgilc 149a77a559 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7_rev' into 'develop'" 
This reverts merge request !558
 2017-06-07 09:32:35 +02:00
vgilc c674892709 Revert "Merge branch 'fixed-errors-in-login' into 'develop'" 
This reverts merge request !559
 2017-06-07 09:31:46 +02:00
artica a19b321f9a Auto-updated build strings. 2017-06-07 00:01:14 +02:00
Arturo Gonzalez 5d9d1cf77b Added better idea, thanks luis 2017-06-06 15:53:56 +02:00
Arturo Gonzalez f0492c370c Changed format 2017-06-06 15:48:58 +02:00
daniel c25c5acfeb fixed errors instalation 2017-06-06 15:22:58 +02:00
daniel 5d3a0c4ab7 fixed errors in login page 2017-06-06 13:57:10 +02:00
Arturo Gonzalez 8b75167cf8 Added OS filter 2017-06-06 13:11:28 +02:00
vgilc aedb440ea2 Merge branch '757-full-scale-graph-dev' into 'develop' 
757 full scale graph dev

See merge request !552
 2017-06-06 09:51:04 +02:00
vgilc 164f70cb7d Merge branch '959-Masivas-de-plugins-no-funcionan' into 'develop' 
Decode html entities in module plugin selector for edit bulk operation - #959

See merge request !553
 2017-06-06 09:50:14 +02:00
artica a90906f2c9 Auto-updated build strings. 2017-06-06 00:01:16 +02:00
enriquecd ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-06-05 09:38:06 +02:00
artica 291ae3a192 Auto-updated build strings. 2017-06-05 00:01:13 +02:00
artica f9da9b404b Auto-updated build strings. 2017-06-04 00:01:14 +02:00
artica 9f041fb76b Auto-updated build strings. 2017-06-03 00:01:19 +02:00
vgilc a4ecc9374d Merge branch '949-node-events-with-event-replication-dev' into 'develop' 
Fixed readonly validation in nodes

See merge request !542
 2017-06-02 11:04:22 +02:00
vgilc eab92ce1c8 Merge branch '925-UM-Offline-y-current_package_enterprise-dev' into 'develop' 
Changed current_package_enterprise

See merge request !516
 2017-06-02 11:00:51 +02:00
vgilc 1c4f64ac2a Merge branch '936-weird-general-item-in-reports-dev' into 'develop' 
Fixed general item in reports

See merge request !526
 2017-06-02 10:59:02 +02:00
vgilc db43f909fd Merge branch '920-Wrong-visualization-with-custom-graphs-items-in-visual-console-dev' into 'develop' 
Changed custom graph size specs in visual console

See merge request !517
 2017-06-02 10:32:58 +02:00
vgilc 12008fee56 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop'" 
This reverts merge request !547
 2017-06-02 10:31:48 +02:00
vgilc 6ad0dde2b7 Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop' 
fixed errors in errors login

See merge request !547
 2017-06-02 09:19:35 +02:00
artica 475a56f6bd Auto-updated build strings. 2017-06-02 00:01:19 +02:00
daniel 00f5c2027c fixed errors in errors login 2017-06-01 18:23:06 +02:00
Daniel Maya f72f61c49e Added new functionality to create alerts on modules without alerts 2017-06-01 16:54:51 +02:00
Arturo Gonzalez 5d2a3fc094 Fixed readonly validation in nodes 2017-06-01 12:17:30 +02:00
Arturo Gonzalez 77b5e74343 Added new condition to dashboard and non avg only in simple graphs 2017-06-01 11:24:59 +02:00
vgilc b9db37f663 Merge branch '523-deteccion-de-cambios-en-inventario-modulo-software-y-otros-con-varias-lineas-open' into 'develop' 
Format module inventary to show only changes on events - #523

See merge request !508
 2017-06-01 09:47:48 +02:00
vgilc 3aa4fc7315 Merge branch '943-header-refresh-no-stops-in-events-view-dev' into 'develop' 
Removed old code that breaks the autorefresh pause

See merge request !538
 2017-06-01 09:32:42 +02:00
artica 40cc85ab43 Auto-updated build strings. 2017-06-01 00:01:17 +02:00
vgilc 87f3cb46f6 Merge branch '923-New-sound-events-console-view-dev' into 'develop' 
Added new visual styles to event sound console

See merge request !513
 2017-05-31 17:46:11 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop' 
807 module massive operations with tag filter dev

See merge request !476
 2017-05-31 17:42:09 +02:00
vgilc e085a8a006 Merge branch '843-Error-Perfil-en-copia-masiva-de-modulos' into 'develop' 
fixed errors in massive copy modules

See merge request !451
 2017-05-31 17:40:27 +02:00
vgilc 4e4415a102 Merge branch '826-Error-en-paginación-de-usuarios-despues-de-borrar-crear-un-usuario' into 'develop' 
Pagination links include delete, create and other params, now not use these para…

See merge request !442
 2017-05-31 17:38:54 +02:00
vgilc 61a9d923a4 Merge branch '889-Remove-babel-auth-in-pandora-dev' into 'develop' 
Removed babel

See merge request !502
 2017-05-31 17:34:47 +02:00
vgilc 18a2ff1701 Merge branch '937-Gráficas-de-servicios-muestran-datos-en-desconocido-entre-las-muestras-de-datos-correctos-almacenados-2' into 'develop' 
Fill empty data in graphs with last known data, no with nodata point - #937

See merge request !535
 2017-05-31 17:26:11 +02:00
vgilc 8eb4300e1a Merge branch '888-Last-contact-en-rojo-en-Agent-detail-Ext-4032' into 'develop' 
Ignore 0 value modules interval when check last contact in agent details - #888

See merge request !480
 2017-05-31 16:58:18 +02:00
Arturo Gonzalez 4ba94f065e Removed old code that breaks the autorefresh pause 2017-05-31 16:40:10 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
Arturo Gonzalez bca10d7b5a Changed text to fix it 2017-05-31 12:16:18 +02:00
vgilc bad1a72c69 Merge branch 'update-japanese-help' into 'develop' 
japanese help for cascade protection.

See merge request !474
 2017-05-31 11:30:30 +02:00
vgilc 55d94f386e Merge branch 'update-japanese-help-alert_macros' into 'develop' 
Update japanese help for alert macros.

See merge request !483
 2017-05-31 11:30:19 +02:00
vgilc d4a448e2db Merge branch 'update-japanese-translation' into 'develop' 
Update Japanese translations.

See merge request !515
 2017-05-31 11:29:41 +02:00
artica 619014733b Auto-updated build strings. 2017-05-31 00:01:19 +02:00
enriquecd d33621ffa7 Fill empty data in graphs with last known data, no with nodata point - #937 2017-05-30 16:34:30 +02:00
Daniel Maya 5cf6962de0 Fixed problem in data display snmp wizard 2017-05-30 15:40:50 +02:00
artica 3b481af7d6 Updated version and build strings. 2017-05-30 11:22:26 +02:00
Arturo Gonzalez ab86e62cd9 Changes spanish translations 2017-05-30 10:43:24 +02:00
artica 05c9b7c4da Auto-updated build strings. 2017-05-30 00:01:17 +02:00
Arturo Gonzalez 33534244c8 Fixed general item in reports 2017-05-29 17:03:52 +02:00
Arturo Gonzalez 9133f2edca Moved from ent to password 2017-05-29 12:20:07 +02:00
Arturo Gonzalez 463c393c00 Added changes to encrypt custom values with a new token 2017-05-29 11:48:50 +02:00
artica 0fe95248c1 Auto-updated build strings. 2017-05-29 00:01:13 +02:00
artica 63d3cefe0b Auto-updated build strings. 2017-05-28 00:01:12 +02:00
artica 5ca2065013 Auto-updated build strings. 2017-05-27 00:01:14 +02:00
Arturo Gonzalez 6bf672a846 Added changes 2017-05-26 14:47:37 +02:00
Arturo Gonzalez 54b70e5927 Changed custom graph size specs in visual console 2017-05-26 12:55:37 +02:00
Daniel Maya b7e7e9e66a Changed current_package_enterprise 2017-05-26 11:15:00 +02:00
Junichi Satoh b42bfb7793 Updated Japanese translations. 2017-05-26 18:03:05 +09:00
artica 474d22ed30 Auto-updated build strings. 2017-05-26 00:01:14 +02:00
Arturo Gonzalez 2e71af2568 Added new visual styles to event sound console 2017-05-25 17:11:35 +02:00
Arturo Gonzalez 09b90be1ca Works in good dashboards module graphs 2017-05-25 10:08:30 +02:00
artica faa96927dd Auto-updated build strings. 2017-05-25 00:01:12 +02:00
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
Arturo Gonzalez 63554c54a2 Removed babel 2017-05-23 17:55:37 +02:00
Daniel Maya e1b867069b Remove quotation marks in agent deletion 2017-05-23 17:50:37 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
Arturo Gonzalez d744cb9220 Added end date to fullscale chart view 2017-05-23 15:16:34 +02:00
Arturo Gonzalez 53f4c6edb8 Added fullscale setting in boolean chart 2017-05-23 15:15:28 +02:00
Arturo Gonzalez 5bb3cd2ad6 Added some code to fullscale graphs 2017-05-23 15:02:53 +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
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
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
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
Arturo Gonzalez 16fe10d1af Added fullscale to boolean charts. Continue with the tests. 2017-05-19 12:04:54 +02:00
enriquecd bb0eec8883 Update en_GB translations - #886 2017-05-19 11:44:12 +02:00
artica 8d16f573cc Auto-updated build strings. 2017-05-19 00:01:19 +02:00
Arturo Gonzalez 913aa4334b Save work and continue with more tests 2017-05-18 17:06:49 +02:00
Arturo Gonzalez 8141dac798 Added date format to long periods of time 2017-05-18 17:01:15 +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
Junichi Satoh 9d59f4cf2a Updated help. 2017-05-18 14:26:24 +09:00
artica 15b65ef3f8 Auto-updated build strings. 2017-05-18 00:01:18 +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 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 15a63f6b2b Merge branch '735-Global-profile-user-with-pm-cannot-edit-module-treshold-in-policies-dev' into 'develop' 
Added lost id to dynamic threshold select

See merge request !384
 2017-05-17 17:31:26 +02:00
vgilc 3118a70f66 Merge branch 'dashboards-in-home-page-dev' into 'develop' 
Added dashboards to "edit my user" section

See merge request !391
 2017-05-17 17:20:29 +02:00
vgilc eb7514dcd0 Merge branch '700-wrong_format_in_graphs' into 'develop' 
Added new ranges to graph period

See merge request !355
 2017-05-17 17:17:47 +02:00
vgilc 7d62f6ff50 Merge branch '797-infinite-session-time-dev' into 'develop' 
797 infinite session time dev

See merge request !438
 2017-05-17 17:15:18 +02:00
vgilc 5e442bcb0b Merge branch '711-Agent-name-en-lugar-de-alias-en-visor-de-actividad-dev' into 'develop' 
Changed name by alias when deleting agent

See merge request !380
 2017-05-17 17:12:46 +02:00
vgilc a2f664f0c9 Merge branch 'ent-531-Macro-alert_unknown_instructions_' into 'develop' 
Added _alert_unkown_instructions_ macro

See merge request !279
 2017-05-17 17:10:46 +02:00
vgilc 56fd0f85ba Merge branch 'ent-565-pintado-del-menu-lateral-con-acl-enterprise-activado' into 'develop' 
Modified menu position to fit it with ACL enterprise

See merge request !304
 2017-05-17 17:10:11 +02:00
vgilc b384d058d9 Merge branch '653-ayuda-descuadrada' into 'develop' 
Fixed tet in a help pop-up.

See merge request !323
 2017-05-17 17:06:47 +02:00
enriquecd 6e951bf50b Ignore 0 value modules interval when check last contact in agent details - #888 2017-05-17 13:26:10 +02:00
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Junichi Satoh a077c3a59d Updated japanese help for cascade protection. 2017-05-17 14:59:41 +09:00
artica ead3556700 Auto-updated build strings. 2017-05-17 00:01:21 +02:00
artu30 1546e48e15 Merge branch 'develop' into '689-Change_translations_in_mr_and_um_section' 
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
 2017-05-16 11:57:58 +02:00
Arturo Gonzalez 0346b49f1e Fixed jquery request 2017-05-16 10:42:41 +02:00
artica 63cc6f5244 Auto-updated build strings. 2017-05-16 00:01:15 +02:00
artica 45239e4cdd Auto-updated build strings. 2017-05-15 00:01:14 +02:00
artica 31970c521d Auto-updated build strings. 2017-05-14 00:01:14 +02:00
artica afff44138c Auto-updated build strings. 2017-05-13 00:01:16 +02:00
artica 3d0c77709e Auto-updated build strings. 2017-05-12 00:01:25 +02:00
enriquecd 12dde46552 Change load order of homeurl when load config, fix mysql login error dialog - #825 2017-05-11 15:44:18 +02:00
Arturo Gonzalez 8653b8530c Removed trace 2017-05-11 15:12:38 +02:00
Arturo Gonzalez 77a563eb29 Added new general table view to html 2017-05-11 14:00:59 +02:00
vgilc 31bc5e08a1 Merge branch '787-help-in-cascade-protection-dev' into 'develop' 
Changed help section in cascade protection help button and fixed help language.

See merge request !421
 2017-05-11 12:12:08 +02:00
artica 46e16f65ea Auto-updated build strings. 2017-05-11 00:01:21 +02:00
m-lopez-f 808e579af7 Merge branch 'develop' into fixed-graphs-styles 2017-05-10 11:07:39 +02:00
daniel 400fcdca26 fixed errors in massive copy modules 2017-05-10 09:42:39 +02:00
artica 71f8f29107 Auto-updated build strings. 2017-05-10 00:01:15 +02:00
Arturo Gonzalez 6f40069aa9 Added a new system to draw lines in visual console when element have an image 2017-05-09 17:29:17 +02:00
Arturo Gonzalez eb1dafe807 Fixed lines in visual console 2017-05-09 12:40:22 +02:00
artica ce179c39aa Auto-updated build strings. 2017-05-09 00:01:18 +02:00
enriquecd 626111279b Pagination links include delete, create and other params, now not use these params, and not retry the previous action - #826 2017-05-08 16:55:05 +02:00
Arturo Gonzalez 658ff78efb Added homedir lost reference to functions_html 2017-05-08 11:49:54 +02:00
artica 3865f13f8f Auto-updated build strings. 2017-05-08 00:01:14 +02:00
artica 3935442574 Auto-updated build strings. 2017-05-07 00:01:14 +02:00
artica 2c56de48f8 Auto-updated build strings. 2017-05-06 00:01:15 +02:00
artica 02e1c6c8d2 Auto-updated build strings. 2017-05-05 00:01:17 +02:00
artica 96a13fe84c Auto-updated build strings. 2017-05-04 00:01:14 +02:00
artica 8b3102f29a Auto-updated build strings. 2017-05-03 00:01:14 +02:00
artica 026c498c46 Auto-updated build strings. 2017-05-02 00:01:14 +02:00
artica 186fc2422e Auto-updated build strings. 2017-05-01 00:01:14 +02:00
artica 17437c197f Auto-updated build strings. 2017-04-30 00:01:13 +02:00
artica 36dd55148a Auto-updated build strings. 2017-04-29 00:01:14 +02:00
artica 682b7938ab Auto-updated build strings. 2017-04-28 00:01:15 +02:00
Arturo Gonzalez ba312476e3 Changed help section in cascade protection help button and fixed help language. 2017-04-27 15:49:23 +02:00
fermin831 36aa71df56 Added macro _agentos_ to help actions 2017-04-27 10:14:50 +02:00
artica 7493da21cc Auto-updated build strings. 2017-04-27 00:01:16 +02:00
Arturo Gonzalez 504665aaf0 Added more width to widget container 2017-04-26 13:27:53 +02:00
Arturo Gonzalez ca1d0b3981 Added new translations 2017-04-26 12:19:24 +02:00
Arturo Gonzalez 6aab4e60ae Added buttons text to translate them 2017-04-26 09:50:42 +02:00
artica aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +02:00
Arturo Gonzalez 40a42a6a29 Added ; to code 2017-04-25 17:43:26 +02:00
Arturo Gonzalez ed195ff909 Added pie slice by time, good job arturo. Thanks arturo. 2017-04-25 16:57:59 +02:00
vgilc 1e5cf2d44e Merge branch '409-change-font-size-of-map-gis' into 'develop' 
Gis Maps Feature: When scrolling in map, change font-size of labels.

See merge request !360
 2017-04-25 16:27:37 +02:00
vgilc d420c98560 Merge branch 'ent-515-Macro-para-SO' into 'develop' 
Added macro _agentos_

See merge request !275
 2017-04-25 16:18:00 +02:00
Arturo Gonzalez 8383552a1f Added minor changes to ux widget 2017-04-25 16:16:25 +02:00
vgilc ea6afb3701 Merge branch '681-Añadir-control-flotante-a-vistas-fullscreen' into 'develop' 
Added floating control in agents/modules, event list and snmp traps list

See merge request !351
 2017-04-25 16:15:41 +02:00
artica 4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
Arturo Gonzalez 078d5e4357 Added data donut to ux widget 2017-04-25 15:34:11 +02:00
artica d3f998b081 Auto-updated build strings. 2017-04-25 00:01:17 +02:00
enriquecd f2d52e80b6 Chango left margin in pie float - #99 2017-04-24 17:29:13 +02:00
enriquecd c7af5c3b07 Change default pie custom graph width size in visual console custom graph creator - #99 2017-04-24 16:09:09 +02:00
artica e32d353cc2 Revert "Updated version and build strings." 
This reverts commit 8c49cfffd7.
 2017-04-24 15:59:34 +02:00
artica 8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
enriquecd 7f927bfdd3 Change strings in minor release update manager / open / 2 - #486 2017-04-24 13:14:14 +02:00
artica 0aa6835df7 Auto-updated build strings. 2017-04-24 00:01:12 +02:00
artica 37e1daca9f Auto-updated build strings. 2017-04-23 00:01:13 +02:00
artica 37fcc10551 Auto-updated build strings. 2017-04-22 00:01:56 +02:00
Arturo Gonzalez a2cff4195f Added code to autocomplete with ux transactions 2017-04-21 14:32:31 +02:00
artica f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
enriquecd 01a50a76af Change license activation popup color text - #133 2017-04-20 19:04:22 +02:00
Arturo Gonzalez b10f1f422f Added more restrictions to user dashboard function 2017-04-20 18:02:34 +02:00
Arturo Gonzalez 87f3798499 Added dashboards to "edit my user" section 2017-04-20 17:36:26 +02:00
Arturo Gonzalez d93fa1bb3f Added new option to enable and disable reset pass 2017-04-20 15:31:39 +02:00
Arturo Gonzalez 4c07fe5d3f Added nodes regeneration in map group updates 2017-04-20 13:18:55 +02:00
Arturo Gonzalez ad065e2464 Changed cron help message 2017-04-20 12:56:22 +02:00
Arturo Gonzalez 63254ac7e4 Move mail setup section to enterprise setup 2017-04-20 12:54:15 +02:00
Arturo Gonzalez a1f23af142 Added new setup menu to mail 2017-04-20 12:15:45 +02:00
Arturo Gonzalez df80304a80 Move code to enterprise section 2017-04-20 11:36:40 +02:00
Arturo Gonzalez 727bd095f5 Added function to reset password in node 2017-04-20 10:59:32 +02:00
artica dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +02:00
Arturo Gonzalez 4a4f52c459 Added send mail function 2017-04-19 17:29:22 +02:00
Arturo Gonzalez 48f7fa50dd Added error control and email handler 2017-04-19 16:04:24 +02:00
Arturo Gonzalez 7011eee871 Added a new page to reset password, for now without code, only visual page and error control 2017-04-19 13:26:20 +02:00
Enrique Camargo 6259a62095 Merge branch 'develop' into '486-Mejoras-visuales-de-las-ventanas-modales-de-las-MRs-open' 
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
 2017-04-19 11:39:57 +02:00
artica 43993e1a14 Auto-updated build strings. 2017-04-19 00:01:21 +02:00
Arturo Gonzalez 8531e9847b Added lost id to dynamic threshold select 2017-04-18 17:46:50 +02:00
vgilc 6805dcf363 Merge branch '549-errores-en-dashboard-moviles' into 'develop' 
Fixed a typo error

See merge request !382
 2017-04-18 16:48:49 +02:00
m-lopez-f 3454490220 Fixed a typo error 2017-04-18 16:20:50 +02:00
vgilc 41e30eb39b Merge branch '546-widgets-de-dashboard-open' into 'develop' 
Resolve jquery library bug (holagram dashboard) - #546

See merge request !289
 2017-04-18 16:01:22 +02:00
vgilc 0d65afda8e Merge branch '549-errores-en-dashboard-moviles' into 'develop' 
Fixed styles of diferents graphs in dashboards when active mobile version.

See merge request !306
 2017-04-18 16:01:01 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user 
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
 2017-04-18 11:28:02 +02:00
Daniel Maya 42c7a400f0 Changed name by alias when deleting agent 2017-04-18 10:42:23 +02:00
artica e6a8f6afa2 Auto-updated build strings. 2017-04-18 00:01:21 +02:00
artica 9d0fde648a Auto-updated build strings. 2017-04-17 00:01:21 +02:00
artica 98f61b991a Auto-updated build strings. 2017-04-16 00:01:15 +02:00
artica 5f2884950d Auto-updated build strings. 2017-04-15 00:01:15 +02:00
artica 3dfdfad220 Auto-updated build strings. 2017-04-14 00:01:18 +02:00
artica f081f81569 Auto-updated build strings. 2017-04-13 00:01:18 +02:00
Arturo Gonzalez d499cc1b84 Added modification to new report item in meta 2017-04-12 17:12:16 +02:00
Arturo Gonzalez cc1ab47a65 Added fixes to new report item 2017-04-12 15:53:36 +02:00
Arturo Gonzalez b912834ce7 Added the new item to item editor builder and to html view 2017-04-12 15:00:09 +02:00
artica b3e1125526 Auto-updated build strings. 2017-04-12 00:01:17 +02:00
artica ac738f682f Auto-updated build strings. 2017-04-11 00:01:17 +02:00
m-lopez-f f8d3c8804e Gis Maps Feature: When scrolling in map, change font-size of labels. 2017-04-10 17:46:32 +02:00
Arturo Gonzalez 9cd99307dd Added selector in visual conf to select a csv divider 2017-04-10 13:58:42 +02:00
Arturo Gonzalez 41b49770ee Added new ranges to graph period 2017-04-10 11:10:32 +02:00
artica ea6deaea04 Auto-updated build strings. 2017-04-10 08:54:41 +02:00
artica b3d6575176 Auto-updated build strings. 2017-04-10 00:01:18 +02:00
artica 20caf87fd5 Auto-updated build strings. 2017-04-09 00:01:19 +02:00
artica 16b0bc83a1 Auto-updated build strings. 2017-04-08 00:01:18 +02:00
vgilc 553e58deba Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales' into 'develop' 
Filter custom graph size in  visual console editor, autoset size - #99

See merge request !287
 2017-04-07 12:51:37 +02:00
vgilc 999162f380 Merge branch '38-no-funciona-event-alerts-sobre-alertas-de-snmp-traps-integria-4383' into 'develop' 
Alert in sound console with snmp alerts events - #38

See merge request !291
 2017-04-07 12:50:31 +02:00
vgilc c3157f2aea Merge branch '106-faltan-los-no-iniciados-en-agents_get_status' into 'develop' 
Added not init state if there are no initialized modules

Closes #106

See merge request !309
 2017-04-07 12:49:53 +02:00
vgilc ca7d887bd4 Merge branch '108-tooltip-de-descripcion-cortado-por-comillas' into 'develop' 
Show quotes in module template managment items description - #108

See merge request !316
 2017-04-07 12:48:18 +02:00
vgilc ebec14322c Merge branch 'ent-449-umbrales-en-las-graficas-de-modulos' into 'develop' 
Fit thresholds on module graphs

See merge request !288
 2017-04-07 12:46:28 +02:00
vgilc 814db18d15 Merge branch 'cherry-pick-4563ef34' into 'develop' 
Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533

See merge request !264
 2017-04-07 12:44:47 +02:00
vgilc 78567fa588 Merge branch 'ent-554-informes-pdf-de-netflow-no-funcionan' into 'develop' 
Fixed pdf netflow reports

See merge request !294
 2017-04-07 12:42:07 +02:00
vgilc 9d7d4b9cad Merge branch '566-visual-console-graficas-de-area-y-creador-de-elementos-open' into 'develop' 
Adjust area graph position in vconsole dashboard / open - #566

See merge request !302
 2017-04-07 12:38:53 +02:00
vgilc ab70607156 Merge branch '562-problema-acls-politicas-7-open' into 'develop' 
Change sec param in policies section, gpolicies to gmodules / 7 / open - #562

See merge request !301
 2017-04-07 12:37:35 +02:00
Daniel Maya 6d1dc162e8 Added floating control in agents/modules, event list and snmp traps list 2017-04-07 12:08:42 +02:00
artica 6b0d42c4a4 Auto-updated build strings. 2017-04-07 00:01:16 +02:00
Arturo Gonzalez df42f2a26b Fixed bad bucle 2017-04-06 17:38:05 +02:00
artica 37142657a5 Auto-updated build strings. 2017-04-06 00:01:16 +02:00
Arturo Gonzalez 640fee4b82 Added lost url to um open online 2017-04-05 16:23:30 +02:00
Arturo Gonzalez 629439f271 Added some modifications to adapt um and rr in meta 2017-04-05 10:26:12 +02:00
artica d25dc0b13a Auto-updated build strings. 2017-04-05 00:01:20 +02:00
Arturo Gonzalez 94d85d9f6e Translations changed 2017-04-04 17:35:11 +02:00
vgilc 3f27e0a306 Revert "Merge branch 'remove-traces-debug' into 'develop'" 
This reverts merge request !266
 2017-04-04 13:48:11 +02:00
vgilc 6b2cdb9784 Merge branch 'remove-traces-debug' into 'develop' 
remove debug console.log traces.

See merge request !266
 2017-04-04 13:47:41 +02:00
vgilc fb0cca8bad Merge branch 'cherry-pick-b333e79e' into 'develop' 
Fixed name of agents and images status in report Agents/Modules. Gitlab: #553

See merge request !286
 2017-04-04 09:16:01 +02:00
artica 6039772b20 Auto-updated build strings. 2017-04-04 00:01:19 +02:00
Arturo Gonzalez 12203f9c2b Added time improvements to networkmaps 2017-04-03 14:20:11 +02:00
vgilc 6fbd8b9978 Merge branch '673-674-networkmap_visual_changes' into 'develop' 
Added visual changes to module nodes in networkmap and added a new option to change the node name

See merge request !334
 2017-04-03 13:53:17 +02:00
vgilc 4c8ebe44a3 Merge branch '112-error-footer-en-mapas-de-red' into 'develop' 
Reposition of footer after load ajax elements in networkmap dialog - #112

See merge request !337
 2017-04-03 13:50:00 +02:00
artica b769531d16 Auto-updated build strings. 2017-04-03 00:01:17 +02:00
artica 6ca2d24786 Auto-updated build strings. 2017-04-02 00:01:18 +02:00
artica 1121f8ffc5 Auto-updated build strings. 2017-04-01 00:01:18 +02:00
enriquecd 3d89007adb Reposition of footer after load ajax elements in networkmap dialog - #112 2017-03-31 14:16:52 +02:00
Arturo Gonzalez 5f29a8f831 Added visual changes to module nodes in networkmap and added a new option to change the node name 2017-03-31 13:18:28 +02:00
artica 3d1bdc799e Auto-updated build strings. 2017-03-31 00:01:19 +02:00
Arturo Gonzalez a67d40a447 Added a few modifications to move the footer when nodes table is too long and recolocate interface text with every movement to see it well 2017-03-30 15:56:00 +02:00
m-lopez-f ce5b5dab66 Fixed images. Only simple images in item Agent/modules report 2017-03-30 13:23:30 +02:00
m-lopez-f af7af852b7 Fixed tet in a help pop-up. 2017-03-30 12:33:23 +02:00
artica da17532889 Auto-updated build strings. 2017-03-30 00:01:18 +02:00
Daniel Maya 0dea7fb690 Text change warn by thresholds 2017-03-29 12:41:42 +02:00
enriquecd 4d4f4669ac Show quotes in module template managment items description - #108 2017-03-29 11:25:50 +02:00
vgilc f7b4523b1f Merge branch 'problems-with-interfaces-snmp' into 'develop' 
Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541

See merge request !277
 2017-03-29 10:12:53 +02:00
artica a6a9f7eff4 Auto-updated build strings. 2017-03-29 00:01:21 +02:00
vgilc 81e15f3d9c Merge branch '555-Network_maps_must_show_all_mm_links' into 'develop' 
555 network maps must show all mm links

See merge request !311
 2017-03-28 16:38:14 +02:00
mlopez f2b0d28d63 Update functions_flot.php 2017-03-28 14:54:57 +02:00
Arturo Gonzalez a8b7f055f4 Added a lot of changes to networkmaps 2017-03-28 14:37:40 +02:00
m-lopez-f 881b86031c Fixed visual of graphs in dashboardswhen used mobile version. 2017-03-28 13:01:40 +02:00
Daniel Maya 967b43061d Added not init state if there are no initialized modules 2017-03-28 11:59:30 +02:00
Arturo Gonzalez bcb8968bec Added a few modifications to networkmaps 2017-03-28 11:32:58 +02:00
artica f81998b294 Auto-updated build strings. 2017-03-28 00:01:18 +02:00
Arturo Gonzalez a0d9ddd8e6 Added some changes to networkmap 2017-03-27 17:55:17 +02:00
m-lopez-f 7dc9f9f21b Fixed styles of diferents graphs in dashboards when active mobile version. 2017-03-27 17:06:55 +02:00
Arturo Gonzalez 27e8ddcdaf Added AMA edges to list of links with the same parent and children 2017-03-27 16:37:26 +02:00
Arturo Gonzalez 311143067a Fixed identical text to multiple links delimiter 2017-03-27 16:28:24 +02:00
Arturo Gonzalez 9512d61e16 Added interface text to add i.link or u.link 2017-03-27 16:03:25 +02:00
fermin831 d7fbc62eca Modified menu_calculate_top to works well with fixed menu option 2017-03-27 15:47:48 +02:00
Arturo Gonzalez 949fbc3660 Added the second interface text 2017-03-27 15:33:27 +02:00
fermin831 2b74fbe57e Modified menu position to fit it with ACL enterprise 2017-03-27 15:32:05 +02:00
Arturo Gonzalez fc7afffb2c Added curved lines to networkmap to support more than 1 MM edges between the same node 2017-03-27 14:28:11 +02:00