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

12514 Commits

Author SHA1 Message Date
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
Enrique Camargo 570a057dfc 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:08:33 +01:00
enriquecd c8727ec8af Improve custom graph interface / 2 - #66 2017-02-21 13:05:22 +01:00
vgilc 20b4fb3e6b Merge branch 'cherry-pick-bb1c4f94' into 'pandora_6.0' 
Merge branch '53-no-ejecuta-custom-responses' into 'develop'

See merge request !149
 2017-02-21 09:58:19 +01:00
artica 5f8b826849 Auto-updated build strings. 2017-02-21 00:01:33 +01:00
vgilc be7faf1734 Merge branch '41-error-500-en-consola-falta-enterprise_hook-integria-4406-6' into 'pandora_6.0' 
Add enterprise_hook filter to all config_agents_has_remote_configuration functions/6 - #41

See merge request !114
 2017-02-20 17:43:22 +01:00
vgilc 24d1b576a5 Revert "Merge branch '250-menu_error_with_new_inst' into 'pandora_6.0'" 
This reverts merge request !150
 2017-02-20 17:20:39 +01:00
vgilc b0908ba24a Merge branch 'cherry-pick-4a5a9a5e' into 'pandora_6.0' 
Merge branch '40-ancho-de-los-combobox-integria-4407-2' into 'develop'

See merge request !174
 2017-02-20 17:19:51 +01:00
vgilc a3c1532832 Merge branch 'cherry-pick-0a40939d-4' into 'pandora_6.0' 
Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-i…

See merge request !171
 2017-02-20 17:19:32 +01:00
vgilc 0bdc38b2e2 Merge branch '269-fixed-last-contact' into 'pandora_6.0' 
Fixed problems with column 'last contact'. Gitlab: #269

See merge request !170
 2017-02-20 17:19:12 +01:00
vgilc aac0c11c94 Merge branch 'cherry-pick-0a40939d-3' into 'pandora_6.0' 
Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-i…

See merge request !169
 2017-02-20 17:18:51 +01:00
vgilc af5186cb4a Merge branch 'cherry-pick-8bc12f02' into 'pandora_6.0' 
Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agen…

See merge request !167
 2017-02-20 17:18:21 +01:00
vgilc 3f5d90a8dd Merge branch '250-menu_error_with_new_inst' into 'pandora_6.0' 
Fixed classic menu mode. Ticket #250

See merge request !150
 2017-02-20 17:17:45 +01:00
vgilc 3c3618c453 Merge branch '241-wrong_date_format' into 'pandora_6.0' 
Added "G" in srtftime format from date format. Ticket #241

See merge request !141
 2017-02-20 17:17:00 +01:00
vgilc 83329a16f2 Merge branch 'cherry-pick-c6af6cd5' into 'pandora_6.0' 
Merge branch '237-editar-modulo-web-no-enlazado-a-politica-integria-4421/open' into 'develop'

See merge request !138
 2017-02-20 17:04:20 +01:00
vgilc 79e0984025 Merge branch 'Add-titles-to-all-levels-buttons-in-lateral-menu-buttons/2-6' into 'pandora_6.0' 
Add titles to all levels buttons in lateral menu buttons / 2 - 6 - #234

See merge request !134
 2017-02-20 17:03:58 +01:00
vgilc 72d1d6e477 Merge branch 'cherry-pick-3f893be7' into 'pandora_6.0' 
Merge branch '48-aumentar-altura-de-las-filas-de-la-tabla-agent-contact-en-la-vi…

See merge request !132
 2017-02-20 17:03:41 +01:00
vgilc f3c29f0cc2 Merge branch 'cherry-pick-97c17595' into 'pandora_6.0' 
Merge branch '230-se-descojona-la-solapa-cuando-el-nombre-del-servicio-tiene-mas…

See merge request !126
 2017-02-20 17:03:24 +01:00
vgilc 45944dd1de Merge branch 'cherry-pick-7db496e7' into 'pandora_6.0' 
Merge branch '44-las-plantillas-de-modulos-no-guardan-la-unidad-de-los-modulos-c…

See merge request !121
 2017-02-20 16:35:47 +01:00
vgilc b58fd0ae79 Merge branch 'cherry-pick-0a40939d' into 'pandora_6.0' 
Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-i…

See merge request !118
 2017-02-20 16:19:47 +01:00
vgilc 0b2b41f217 Merge branch 'cherry-pick-332d69d4' into 'pandora_6.0' 
Merge branch '40-ancho-de-los-combobox-integria-4407' into 'develop'

See merge request !112
 2017-02-20 16:18:13 +01:00
vgilc d2adecab19 Merge branch 'cherry-pick-3fe45184' into 'pandora_6.0' 
Merge branch '37-agregar-filtros-a-masivas-agentes-integria-4333' into 'develop'

See merge request !104
 2017-02-20 16:17:28 +01:00
Enrique Camargo e903be6255 Merge branch 'pandora_6.0' into '41-error-500-en-consola-falta-enterprise_hook-integria-4406-6' 
# Conflicts:
#   pandora_console/godmode/agentes/module_manager_editor.php
 2017-02-20 16:17:25 +01:00
vgilc 669deb19da Merge branch 'cherry-pick-083ef3d8-2' into 'pandora_6.0' 
Merge branch '209-optimizar-widget-general-and-quick-group-status-report-integri…

See merge request !95
 2017-02-20 16:16:16 +01:00
vgilc b2f6a211b6 Merge branch 'cherry-pick-99220f44' into 'pandora_6.0' 
Merge branch '30-anadir-transicion-al-hover-de-los-botones-laterales-de-menu-y-d…

See merge request !83
 2017-02-20 16:15:49 +01:00
vgilc fad47ee3b4 Merge branch 'cherry-pick-93db0563' into 'pandora_6.0' 
Merge branch '28-modificar-etiqueta-de-boton-forzar-integria-4341' into 'develop'

See merge request !78
 2017-02-20 16:15:22 +01:00
vgilc 9ed4669d41 Merge branch '26-algunos-umbrales-criticos-string-no-se-ven-integria-4376-6' into 'pandora_6.0' 
Escape quotes in str_warning and str_critical fields in agent editor / 6 - #26

See merge request !76
 2017-02-20 16:09:43 +01:00
Enrique Camargo 9ebcdb45a1 Merge branch '40-ancho-de-los-combobox-integria-4407-2' into 'develop' 
Not limit 300px agent and module comboboxes in graph builder - #40

See merge request !173
 2017-02-20 12:39:18 +01:00
artica ea3a5aaf63 Auto-updated build strings. 2017-02-20 00:01:32 +01:00
artica afe22a3e81 Auto-updated build strings. 2017-02-19 00:01:30 +01:00
artica 0cd03f1fb2 Auto-updated build strings. 2017-02-18 00:01:31 +01:00
Enrique Camargo 6114eb8e5b Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-integria-4405' into 'develop' 
Resolve "La ayuda del post-procesado de módulos crea confusión entre . y , [INTEGRIA: #4405]"

See merge request !117
 2017-02-17 14:41:23 +01:00