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

15091 Commits

Author SHA1 Message Date
nramon a99b75da4c Merge branch '832-add-server-exec-proxy-to-policy-wizard-dev' into 'develop' 
Added db changes to mr 6

See merge request !765
 2017-08-31 11:46:41 +02:00
nramon 83da33a53f Merge branch '137-global-module-search-get-disabled-modules-dev' into 'develop' 
Added condition to query

See merge request !762
 2017-08-31 11:39:17 +02:00
nramon 02bf6dbd5c Merge branch '1058-rework-elements-labels-in-service-map-dev' into 'develop' 
Added styles to service map elements

See merge request !679
 2017-08-31 11:38:21 +02:00
nramon 17201b5dd8 Merge branch '1190-Error-in-module-cascade-selector-dev' into 'develop' 
Do the autocomplete field correct

See merge request !761
 2017-08-31 11:36:44 +02:00
Ramon Novoa 83fef97c17 Add dependencies to test the Satellite Server. 2017-08-31 11:35:31 +02:00
Arturo Gonzalez 2fe8849708 Added db changes to mr 6 2017-08-31 11:33:08 +02:00
artu30 914f09c559 Merge branch 'develop' into '1058-rework-elements-labels-in-service-map-dev' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2017-08-31 08:19:00 +02:00
artica e45face2fc Auto-updated build strings. 2017-08-31 00:01:15 +02:00
slerena 0a11d3d086 Merge branch '1228-massive-module-deletes-all-modules-with-any-tag-dev' into 'develop' 
Fixed "any" filter with selects unknown and not init modules in massive delete operation

See merge request !756
 2017-08-30 17:50:15 +02:00
slerena 10a145fe98 Merge branch '1248-deadlocks-en-pandora-4452' into 'develop' 
Remove nested queries to prevent deadlocks with the Data Server.

See merge request !760
 2017-08-30 17:48:53 +02:00
nramon 7da6dd02ca Merge branch '124-anadir-enlace-a-los-iconos-de-la-columna-remote-config-de-la-vista-de-agentes-2' into 'develop' 
Fix agent view remote config column order - #124

See merge request !763
 2017-08-30 17:44:13 +02:00
enriquecd 68aa0f91ac Fix agent view remote config column order - #124 2017-08-30 17:30:36 +02:00
Arturo Gonzalez 573a0f5534 Added condition to query 2017-08-30 16:26:06 +02:00
Arturo Gonzalez 0eabf7a0ce Do the autocomplete field correct 2017-08-30 15:52:28 +02:00
artica 0594a7bcbc Auto-updated build strings. 2017-08-30 00:01:13 +02:00
slerena 9c4eb3086e Merge branch '832-exec-proxy-dev' into 'develop' 
832 exec proxy dev

See merge request !755
 2017-08-29 16:11:03 +02:00
Arturo Gonzalez 976581e983 Adjust timeout in events response commands 2017-08-29 15:54:12 +02:00
Ramon Novoa 29cecf2e29 Remove nested queries to prevent deadlocks with the Data Server. 
Ref pandora_enterprise#1248.
 2017-08-29 14:34:14 +02:00
slerena 347a6d3a3d Merge branch '1244-sql-error-in-massive-agents-edition-dev' into 'develop' 
Added filter when id groups comes empty

See merge request !759
 2017-08-29 13:49:21 +02:00
slerena 6bcc209d62 Merge branch '1177-Graficas_con_valores_negativos_rev' into 'develop' 
fixed errors in simple graphs value negative

See merge request !758
 2017-08-29 13:42:21 +02:00
Arturo Gonzalez 63fb488176 Clean code 2017-08-29 11:52:34 +02:00
Arturo Gonzalez 32ad745c62 Added filter when id groups comes empty 2017-08-29 11:32:25 +02:00
Arturo Gonzalez 8daa66d6ee Added option to set exec proxy in server 2017-08-29 11:14:42 +02:00
daniel 487711d567 fixed errors in simple graphs value negative 2017-08-29 09:28:05 +02:00
artica 8616015f38 Auto-updated build strings. 2017-08-29 00:01:14 +02:00
Arturo Gonzalez 0e7b00f26e Added correct user and fixed db error 2017-08-28 16:38:30 +02:00
Arturo Gonzalez fc0db16d5e Fixed "any" filter with selects unknown and not init modules in massive delete operation 2017-08-28 15:47:16 +02:00
slerena 2ce481de54 Merge branch '1210-error-in-create-networkmaps-when-autorefresh-is-enabled-dev' into 'develop' 
Added code to separate networkmap manage and networkmap view

See merge request !743
 2017-08-28 13:12:47 +02:00
Arturo Gonzalez bab1f14a31 Added remote command execute to agent wizard 2017-08-28 12:44:51 +02:00
slerena c1a755bc09 Merge branch '124-anadir-enlace-a-los-iconos-de-la-columna-remote-config-de-la-vista-de-agentes' into 'develop' 
Add link to remote config column icons y agent view list - #124

See merge request !370
 2017-08-28 12:35:33 +02:00
Enrique Camargo 092bbd12ff Merge branch 'develop' into '124-anadir-enlace-a-los-iconos-de-la-columna-remote-config-de-la-vista-de-agentes' 
# Conflicts:
#   pandora_console/operation/agentes/estado_agente.php
 2017-08-28 12:32:06 +02:00
slerena b504c0bc6f Merge branch '1229-Codigos-QR-de-Pandora' into 'develop' 
Fix agent view qr mobile code - #1229

See merge request !751
 2017-08-28 12:28:43 +02:00
slerena 88acc6352d Merge branch '309-Mejoras-CLI-para-TMB-3' into 'develop' 
Add instructions,user and force_create_agent parameters to CLI event_creator - #309

See merge request !744
 2017-08-28 12:20:01 +02:00
slerena fb88f44cff Merge branch '1233-Macros-_date_-y-_time_-en-consola-visual' into 'develop' 
Add _data_ _time_ macros for visual console - #1233

See merge request !749
 2017-08-28 12:16:28 +02:00
slerena d3a845a6b5 Merge branch '1151-Ayuda_de_alerta_en_actions_faltan_macros_que_si_estan_en_Templates' into 'develop' 
fixed errors in helps macros

See merge request !750
 2017-08-28 12:14:54 +02:00
Arturo Gonzalez 6b4dfe9885 Added remote server to snmp browser 2017-08-28 10:02:46 +02:00
artica ab48fabc0b Auto-updated build strings. 2017-08-28 00:01:12 +02:00
artica ed72e8c342 Auto-updated build strings. 2017-08-27 00:01:12 +02:00
artica b907a65921 Auto-updated build strings. 2017-08-26 00:01:37 +02:00
artica 8f373edf84 Auto-updated build strings. 2017-08-25 00:01:13 +02:00
Arturo Gonzalez 88834d6ea1 Added a first version of snmp browser with a proxy server 2017-08-24 16:26:58 +02:00
enriquecd 8b718371f9 Fix agent view qr mobile code - #1229 2017-08-24 16:09:04 +02:00
daniel 45f33f9748 fixed errors in helps macros 2017-08-24 15:40:03 +02:00
Arturo Gonzalez ffed7359bc Added execution in server proxy to event response commands 2017-08-24 13:25:03 +02:00
enriquecd c64d0bb082 Add _data_ _time_ macros for visual console - #1233 2017-08-24 12:50:55 +02:00
Arturo Gonzalez f021bedb5c Added proxy servers to events response form 2017-08-24 12:34:06 +02:00
Arturo Gonzalez 2521727ee1 Added ssh check connection 2017-08-24 11:05:10 +02:00
artica 1bf7d8278a Auto-updated build strings. 2017-08-24 00:01:14 +02:00
Arturo Gonzalez dce27f3ac2 Added new items to satellite editor view 2017-08-23 15:01:09 +02:00
Arturo Gonzalez 3291526195 Added new fields to server table 2017-08-23 12:41:36 +02:00