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

11777 Commits

Author SHA1 Message Date
Arturo Gonzalez bc557573ec Fixed combo in editor 2017-08-23 10:19:56 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
artica dcd5fd2e5e Auto-updated build strings. 2017-08-23 00:01:14 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
enriquecd 418906add5 Fix bad ordination in mobile pandora events list - #1169 2017-08-22 17:24:26 +02:00
daniel f5da86ac0a no apply policies in wux 2017-08-22 11:39:21 +02:00
enriquecd 44cf079b20 Change 24h event histogram function in pandora mobile to same that desktop pandora - #1170 2017-08-22 11:33:15 +02:00
daniel d4b0fc0e6b fixed errors in wux 2017-08-22 11:12:20 +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
fbsanchez ef132fde80 Removed sshgateway extension 
Ehorus!!!!!
 2017-08-21 19:48:19 +02:00
enriquecd 2f5127d517 Change pandora help window style - #1122 2017-08-21 15:58:19 +02:00
daniel 0408a2bee6 resize pie graph 2017-08-21 13:53:50 +02:00
enriquecd a399652873 Fix dbmanager when insert db activity in activity login info panel - #1194 2017-08-21 11:29:58 +02:00
enriquecd f70763d739 Apply padding to event 24h event history bar for agent view - #1203 2017-08-21 10:48:03 +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
daniel 86125a3c40 changes visual console wux 2017-08-18 13:29:07 +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
daniel 1b5979113a hidden tab wux 2017-08-18 12:42:48 +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 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
daniel f0efe69ad4 fixed error in wux 2017-08-18 12:02:47 +02:00
artica 3ce15d5814 Auto-updated build strings. 2017-08-18 00:01:12 +02:00
daniel ab3cd7dcc0 wux console view 2017-08-17 18:38:12 +02:00
Daniel Maya 498272d75d Update setup log collector 2017-08-17 11:07:22 +02:00
artica f7ecefcc60 Auto-updated build strings. 2017-08-17 00:01:13 +02:00
Daniel Maya 059dec7cc9 Fixed delimiter 2017-08-16 17:04:21 +02:00
daniel 104a1a83b4 fixed minor error 2017-08-16 16:30:44 +02:00
artica f7ea07d559 Updated version and build strings. 2017-08-16 13:09:03 +02:00
Daniel Maya 2963f18ed3 Added text line in label help 2017-08-16 12:05:17 +02:00
artica 8958dd0900 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica c08e17084f Auto-updated build strings. 2017-08-16 10:38:02 +02:00
Daniel Maya e99ef7d0f1 Fixed 2017-08-16 10:38:02 +02:00
Daniel Maya 80faddcbb8 Xaxisname deleted from xaxes 2017-08-16 10:38:02 +02:00
artica 9ddf454e09 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica b973e12a51 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica 5542bd8947 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
Daniel Maya 3c18f706fa fixed errors in visual console on simple value 2 2017-08-16 10:38:02 +02:00
daniel 4b26cf119c fixed errors visual console 2017-08-16 10:38:02 +02:00
artica 31d5699a2b Auto-updated build strings. 2017-08-16 10:38:02 +02:00
daniel 61ffae2ae1 fixed errors in visual console on simple value 2017-08-16 10:38:02 +02:00
Daniel Maya 07c115eb4e Fixed issue with simple value 2017-08-16 10:38:02 +02:00
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 Maya fba5a38482 Fixed time range with user no admin 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 bf77ea14d1 Added recover delimiter 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 47c851be95 Merge branch '1109-mysql-procedure-error-in-pandora-migrate-dev' into 'develop' 
Added recover delimiter

See merge request !666
 2017-08-14 12:25:35 +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 Maya 5973ec7545 fixed errors in visual console on simple value 2 2017-08-11 11:48:25 +02:00
Ramon Novoa 7c0f0e3b31 Restored install.php. 2017-08-11 11:22:03 +02:00
Ramon Novoa 2f069c37dc Add an alpha version of the WUXServer. 2017-08-11 11:08:40 +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 Maya 2bcc01c9ba Fixed time range with user no admin 2017-08-09 11:33:12 +02:00
daniel 7e649b78b3 wux new form 2017-08-09 11:29:16 +02:00
daniel be0a91ed2c fixed minor error sql delete module 2017-08-09 10:35:57 +02:00
vgilc e250e0eeae Revert "Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop'" 
This reverts merge request !722
 2017-08-09 09:27:06 +02:00
artica f96032eeaa Auto-updated build strings. 2017-08-09 00:01:15 +02:00
Daniel Maya 032995fc83 Disabled select for not admins 2017-08-08 14:59:30 +02:00
daniel 4cbd005137 fixed error in graph container 2017-08-08 12:07:28 +02:00
Daniel Maya 3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +02:00
artica d5cff43128 Auto-updated build strings. 2017-08-08 00:01:14 +02:00
daniel 6a2d3a7011 fixed minor error 2017-08-07 17:02:56 +02:00
daniel 590bfbfe84 mr-5 add queries 2017-08-07 13:57:04 +02:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +02:00
Daniel Maya 5df61b95b9 Fixed issue in public console 2017-08-07 11:30:49 +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
Hirofumi Kosaka 76c951183c [bug fix] deleting a module had caused unextected alert deletion. #156 2017-08-02 15:41:44 +09: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
vgilc 03cb255562 Merge branch '1071-Formulario-gráfica-combinada-automática-open' into 'develop' 
Add column id_server to tgraph_source and fix metaconsole automatic_graph report_template - #1071

See merge request !634
 2017-07-28 14:31:46 +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
Enrique Camargo 88879462a3 Merge branch 'develop' into '1071-Formulario-gráfica-combinada-automática-open' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2017-07-28 10:34:06 +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 94f6683c16 Merge branch '1114-En-la-vista-de-agente-modulo-se-distorsionan-las-imágenes-2' into 'develop' 
Change agent / module icons height a width - #1114

See merge request !659
 2017-07-28 10:25:14 +02:00
vgilc 9c534ce2dc Merge branch '1127-Elementos-desplazados-en-mapas-GIS-con-Google-maps-dev' into 'develop' 
Expand layer

See merge request !685
 2017-07-28 10:24:44 +02:00
vgilc 9a791dc0a5 Merge branch '1082-some-modifications-in-change-pass-feature-dev' into 'develop' 
Added some fixes to reset pass feature

See merge request !677
 2017-07-28 10:23:31 +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 e2a175327e Merge branch '1140-Gráficas_con_entities' into 'develop' 
fixed errors entities in mail

See merge request !682
 2017-07-28 10:21:04 +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
vgilc f0afe8431f Merge branch '1120-Nombre-de-agente-en-mapas-GIS-dev' into 'develop' 
Change agent name by alias in gis map

See merge request !678
 2017-07-28 10:16:27 +02:00
artica 55c70098ba Auto-updated build strings. 2017-07-28 00:01:13 +02:00
Arturo Gonzalez 02ce575d9f Added a last fix 2017-07-27 12:39:38 +02:00
Arturo Gonzalez 39f4b48d84 Added some changes about update modules from local component with macros 2017-07-27 11:08:19 +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
enriquecd 240b6e017f Adapt historical_db checkbox for sql reports to sql templates - #1157 2017-07-26 13:50:55 +02:00
Arturo Gonzalez 82b6904289 Changed some lines in configurar_agente 2017-07-26 13:36:42 +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
Daniel Maya b4765a0a9a Expand layer 2017-07-21 12:19:56 +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
daniel 66d9dd9d27 fixed errors entities in mail 2017-07-20 13:36:16 +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 5fd6c03917 Change agent name by alias in gis map 2017-07-19 12:32:45 +02:00
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +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
Daniel Maya d29aa2c246 Fixed email column 2017-07-18 13:07:25 +02:00
Arturo Gonzalez 329050b02b Fixed error 2017-07-18 12:26:29 +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 d594b98cc3 Added recover delimiter 2017-07-18 11:48:59 +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 e56eac3648 Merge branch 'MR4-1015' into 'develop' 
Set texport_server table name field varchar 600 - #1015

See merge request !664
 2017-07-17 17:05:00 +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
enriquecd 4aa04cfef0 Set texport_server table name field varchar 600 - #1015 2017-07-17 16:19:38 +02:00
vgilc 66ad86a302 Merge branch '1015-Aumentar-tamaño-del-campo-nombre-en-tabla-texport_server_data' into 'develop' 
Change tserver_export_data to varchar 600 - #1015

See merge request !600
 2017-07-17 15:41:45 +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
Arturo Gonzalez 1ea465b7d4 Added db changes to package 708 2017-07-17 10:46:26 +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
Daniel Maya c13644951f update agent 2017-07-17 09:22:28 +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
vgilc 54b90c75fe Merge branch '1019-Editar-modulo-no-muestra-nombre' into 'develop' 
Fix module editor can not show name with quotes - #1019

See merge request !587
 2017-07-13 13:17:34 +02:00
vgilc f10e67342d Merge branch '844-Error-en-la-posición-al-crear-un-elemento-con-imagen-en-las-consolas-visuales' into 'develop' 
Fix image align when create a static graph in vconsole - #844

See merge request !642
 2017-07-13 13:15:26 +02:00
Arturo Gonzalez 19caa3ebfb Added js image 2017-07-13 12:26:13 +02:00
vgilc c2c677de65 Merge branch '1014-Aparece-el-agent-name-en-lugar-del-alias-en-la-consola-SNMP-dev' into 'develop' 
Changed agent name by alias

See merge request !590
 2017-07-13 12:11:18 +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 cc9191b676 Merge branch 'develop' into '1014-Aparece-el-agent-name-en-lugar-del-alias-en-la-consola-SNMP-dev' 
# Conflicts:
#   pandora_console/operation/snmpconsole/snmp_view.php
 2017-07-13 11:59:19 +02:00
vgilc 1772cc273b Merge branch '1012-Problema-con-configuración-de-LDAP-dev' into 'develop' 
Erase functionality

See merge request !613
 2017-07-13 11:56:17 +02:00
vgilc 9e3fa2d310 Merge branch '1023-module-graph-in-visual-console-with-non-administrator-user-dev' into 'develop' 
Added Borja line to fix module graph period in visual console with non-administrator users

See merge request !609
 2017-07-13 11:55:23 +02:00
vgilc 6829c8734f Merge branch '1029-Falta-cuadro-de-búsqueda-en-filtro-de-metaconsola-dev' into 'develop' 
Style change text in user management

See merge request !599
 2017-07-13 11:53:36 +02:00
vgilc bbc54cfcfc Merge branch '890-No-esta-funcionando-el-GIS-en-Pandora-dev' into 'develop' 
Fixed display of data

See merge request !617
 2017-07-13 11:53:00 +02:00
vgilc 24728cc062 Merge branch '1042-Descuadre-en-consola-visual-dev' into 'develop' 
Fixed visual console render img

See merge request !612
 2017-07-13 11:51:25 +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 fa29d4072f Merge branch '1001-Alert-detail-muestra-el-agent_name-dev' into 'develop' 
Changed agent name by alias in alerts details

See merge request !573
 2017-07-13 11:49:00 +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 fd955112fb Merge branch '994-No-se-muestra-correctamente-la-versión-en-el-footer-dev' into 'develop' 
Fixed version in footer

See merge request !570
 2017-07-13 11:47:57 +02:00
vgilc 43f7bcde39 Merge branch '1041-module-charts-with-standar-perms-dev' into 'develop' 
Added second check to period field in module charts (admin have diferent field name)

See merge request !610
 2017-07-13 11:42:11 +02:00
vgilc 614fbebded Merge branch '868-Consola-visual-a-pantalla-completa-no-hace-autorefresco' into 'develop' 
Change ajax call method get to post for autorefresh and use new timecount param - #868

See merge request !555
 2017-07-13 11:39:25 +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
vgilc 97e897c0d4 Merge branch '963-Ventana-Welcome-to-Pandora-FMS-siempre-aparece' into 'develop' 
Change jquery ajax call method in welcome window dont show get to post - #963

See merge request !551
 2017-07-13 11:30:47 +02:00
vgilc f855d25b54 Merge branch '1030-DB-Status-no-va' into 'develop' 
Change connection data for mysql queries - #1030

See merge request !603
 2017-07-13 11:29:53 +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
enriquecd d9e6585234 Change agent / module icons height a width - #1114 2017-07-12 11:20:19 +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
Arturo Gonzalez dac5b6f237 Added correct filter name 2017-07-10 10:04:04 +02:00
Arturo Gonzalez 75b82847b0 Fixed search field in agents list 2017-07-10 09:34:13 +02:00