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

12545 Commits

Author SHA1 Message Date
Ramon Novoa ea75bc303e Fix a typo. 2017-03-06 09:14:47 +01:00
artica 4b154290db Auto-updated build strings. 2017-03-05 00:05:00 +01:00
artica aab5cf1ef5 Auto-updated build strings. 2017-03-03 00:02:55 +01:00
artica 7bebbbd6b7 Auto-updated build strings. 2017-03-02 00:01:34 +01:00
Ramon Novoa bdb61fb356 Edit files in place. 
(cherry picked from commit 15064ea3cd)
 2017-03-01 15:59:59 +01:00
artica e05daabc0b Auto-updated build strings. 2017-03-01 00:01:33 +01:00
vgilc 5b22363d7e Merge branch 'cherry-pick-63d58258' into 'pandora_6.0' 
Merge branch '68-creacion-de-usuarios-en-ldap-falla' into 'develop'

See merge request !216
 2017-02-28 14:47:07 +01:00
daniel 8637c50289 Merge branch '68-creacion-de-usuarios-en-ldap-falla' into 'develop' 
fixed error in ldap create new users

See merge request !186
 2017-02-28 13:32:28 +01:00
vgilc 1dd09da582 Merge branch 'revert-f6028640' into 'pandora_6.0' 
Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria…

See merge request !214
 2017-02-28 10:32:50 +01:00
daniel 7ac23cb9b5 Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'" 
This reverts commit f6028640d3
 2017-02-28 09:13:14 +01:00
artica 45332abbe6 Auto-updated build strings. 2017-02-28 00:01:33 +01:00
Ramon Novoa 07ada97ee7 Add a configuration option for the Sync Server's block size. 
(cherry picked from commit e2022297bb)
 2017-02-27 16:16:55 +01:00
Ramon Novoa 8e7cb12593 Update the Tentacle clients. 
(cherry picked from commit 2109fcc875)
 2017-02-27 16:16:55 +01:00
vgilc bc03261efe Merge branch 'fixed_setgid' into 'pandora_6.0' 
Fixed setgid

See merge request !211
 2017-02-27 16:03:22 +01:00
vgilc 2ce30a3015 Merge branch 'cherry-pick-d16138c6' into 'pandora_6.0' 
Modified GIS Maps to print OpenMaps on empty google license

See merge request !209
 2017-02-27 15:54:58 +01:00
vgilc a2c4d4a2e0 Merge branch '385-api_reports_no_data' into 'pandora_6.0' 
Fixed api get module data. Ticket #385

See merge request !213
 2017-02-27 15:37:03 +01:00
Arturo Gonzalez 6d3cb8ebc3 Fixed api get module data. Ticket #385 
(cherry picked from commit 938dc40f77)
 2017-02-27 14:59:26 +01:00
fbsanchez 39e1028e8c Revert "Fixed crontab references in pandora_server_installer" 
This reverts commit 3e977465fa.
 2017-02-27 13:41:14 +01:00
fbsanchez 3e977465fa Fixed crontab references in pandora_server_installer 2017-02-27 13:16:18 +01:00
fbsanchez 4e851a567e Fixed setgid (rpm & pandora_server_installer) 2017-02-27 13:14:04 +01:00
fermin831 f6816fa7f0 Modified GIS Maps to print OpenMaps on empty google license 2017-02-27 12:14:26 +01:00
vgilc 2ccfedf9a5 Merge branch '378-Exception_in_get_module_data_api' into 'pandora_6.0' 
Fixed exception in datetime object. Functions api get_module_data. Ticket #378

See merge request !206
 2017-02-27 11:58:08 +01:00
Arturo Gonzalez 66db2e68a7 Fixed exception in datetime object. Functions api get_module_data. Ticket #378 
(cherry picked from commit fc7e2f69b7)
 2017-02-27 11:06:54 +01:00
artica 023148cacb Auto-updated build strings. 2017-02-27 00:01:32 +01:00
artica e5f3524304 Auto-updated build strings. 2017-02-26 00:01:31 +01:00
artica d4befa47d1 Auto-updated build strings. 2017-02-25 00:01:34 +01:00
Ramon Novoa 6a2833b9a4 SSL_verify_mode must be a number. 2017-02-24 16:39:05 +01:00
Ramon Novoa c6bc284b21 Update all the Tentacle servers. 2017-02-24 15:55:07 +01:00
Ramon Novoa d569d5b121 Add Sync Server SSL configuration parameters to Config.pm. 2017-02-24 08:19:37 +01:00
artica faa0c3ca3b Auto-updated build strings. 2017-02-24 00:01:33 +01:00
nramon dae762305c Merge branch '186-tentacle-inverso-sync-server-pandora_6.0' into 'pandora_6.0' 
186 tentacle inverso sync server pandora 6.0

See merge request !202
 2017-02-23 16:03:52 +01:00
Ramon Novoa 43a7f75343 Send at least . and .. when listing files. 
Tentacle does not like empty data. Make sure we always send something
when listing files.
 2017-02-23 15:44:15 +01:00
Ramon Novoa 9d78d25c1a Squashed commit of the following: 
commit bb6ab10fdb
Merge: 45d2529 fb8f058
Author: Ramon Novoa <rnovoa@artica.es>
Date:   Wed Feb 22 13:41:36 2017 +0100

    Merge branch 'develop' into 186-tentacle-inverso-sync-server

commit 45d2529e38
Author: Ramon Novoa <rnovoa@artica.es>
Date:   Wed Feb 22 13:20:35 2017 +0100

    Merge the tentacle_server with support for insecure operations.

commit 3cada51373
Author: Ramon Novoa <rnovoa@artica.es>
Date:   Wed Feb 22 12:59:29 2017 +0100

    Add a basic implementation of the Sync Server.

(cherry picked from commit 48b5bc54085d5a23a9b7b1d90b9d54be19aabb7d)
 2017-02-23 14:19:08 +01:00
vgilc 6466a69181 Merge branch '75-etiquetas-de-vista-de-agente-6-2' into 'pandora_6.0' 
Change count status modules labels in agent view - #75

See merge request !200
 2017-02-23 11:36:35 +01:00
vgilc 44554a67eb Merge branch '75-etiquetas-de-vista-de-agente-6' into 'pandora_6.0' 
Change count column label text in agent detail section - #75

See merge request !194
 2017-02-23 11:34:58 +01:00
vgilc 081a494d01 Merge branch '74-muestra-last-contact-en-rojo-no-deberia-6' into 'pandora_6.0' 
Functions_module now not use async modules to calc if last contact is major than…

See merge request !191
 2017-02-23 11:34:33 +01:00
vgilc 0e1250c6e5 Merge branch '66-pequenos-arreglos-en-interfaz-de-creacion-de-graficas-combinadas-6' into 'pandora_6.0' 
Improve custom graph interface / 2 - #66

See merge request !182
 2017-02-23 11:33:42 +01:00
vgilc 3a922479c6 Merge branch 'cherry-pick-e5fba881' into 'pandora_6.0' 
fixed visual on movile version. gitlab: #340

See merge request !187
 2017-02-23 11:33:13 +01:00
vgilc 0317e1f20f Merge branch 'cherry-pick-31d7091c-2' into 'pandora_6.0' 
Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agen…

See merge request !183
 2017-02-23 11:32:49 +01:00
vgilc e50a65f62c Merge branch '248-cambiar-etiqueta-de-texto-en-creador-de-informes-y-anadir-tooltip' into 'pandora_6.0' 
Replace label definition and add help tip in custom reports items. Gitlab: #248

See merge request !184
 2017-02-23 11:32:35 +01:00
vgilc 7a2b9ec8d9 Merge branch 'cherry-pick-31d7091c' into 'pandora_6.0' 
Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agen…

See merge request !181
 2017-02-23 11:32:02 +01:00
enriquecd 1b9a9ce0be Change count status modules labels in agent view - #75 2017-02-23 10:39:22 +01:00
enriquecd b4ff780d5a Add not init status count label y agent detail section - #75 2017-02-23 10:27:50 +01:00
artica bb06048712 Auto-updated build strings. 2017-02-23 00:01:32 +01:00
enriquecd e718beb858 Change count column label text in agent detail section - #75 2017-02-22 12:02:22 +01:00
artica 2704d5bb0f Auto-updated build strings. 2017-02-22 00:01:34 +01:00
enriquecd 13f0a737a2 Functions_module now not use async modules to calc if last contact is major than minimum module interval - #74 2017-02-21 19:02:40 +01:00
m-lopez-f 8dc9a280ba fixed visual on movile version. gitlab: #340 2017-02-21 14:27:35 +01:00
m-lopez-f 16cfadca22 Replace label definition and add help tip in custom reports items. Gitlab: #248 2017-02-21 13:37:22 +01:00
Enrique Camargo d5ad258669 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' into 'develop' 
Resolve "Meter un salto de linea entre las opciones "modules first" y "agents firsts" de forma que se anineen bien"

See merge request !180
 2017-02-21 13:11:03 +01:00