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

22683 Commits

Author SHA1 Message Date
Daniel Rodriguez 13898da4c1 Merge branch 'ent-4733-no-funciona-buscador-general-de-politicas' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2777
 2019-10-18 11:42:30 +02:00
artica 22af1a3654 Auto-updated build strings. 2019-10-18 00:01:11 +02:00
fbsanchez e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +02:00
Daniel Barbero Martin 4e56f6751a Continue work diagnostics 2019-10-17 15:17:28 +02:00
Daniel Rodriguez e5890b038d Merge branch 'ent-4069-Graphs-containers-in-Custom-graphs-error' into 'develop' 
Ent 4069 graphs containers in custom graphs error

See merge request artica/pandorafms!2787
 2019-10-17 14:20:06 +02:00
Alejandro Fraguas be29f1dd55 Merge branch 'ent-4746-boton-de-aspecto-raro-en-forgot-your-password' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2782
 2019-10-17 13:20:14 +02:00
Alejandro Fraguas cb269789a7 Merge branch 'ent-4818-cambio-en-plugin-tools' into 'develop' 
Updated file names to avoid collision

See merge request artica/pandorafms!2816
 2019-10-17 12:14:51 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
alejandro-campos 3a5bbb22bd changed pandora api functions to include possibility of using agent alias when agent id is accepted as argument 2019-10-17 11:14:42 +02:00
Daniel Rodriguez 2dfc2b7a8a Merge branch 'ent-3989-graficas-sql-metaconsola' into 'develop' 
Available in metaconsole sql charts in reports for metaconsole server

See merge request artica/pandorafms!2697
 2019-10-17 11:07:37 +02:00
Daniel Rodriguez 3cb80e5d32 Merge branch '4820-planned_downtimes_created-no-se-almacena-correctamente' into 'develop' 
Solved issue with date_from and dato_to missing time data

See merge request artica/pandorafms!2817
 2019-10-17 10:16:07 +02:00
Daniel Rodriguez e80ef83d66 Merge branch 'ent-4692-vodat-al-editar-un-item-de-un-custom-report-devuelve-la-pantalla-de-item-editor' into 'develop' 
When an item is updated, it is redirected to the item lists

See merge request artica/pandorafms!2755
 2019-10-17 10:13:40 +02:00
Daniel Rodriguez 269f1f2da4 Merge branch 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos' into 'develop' 
Ent 4720 redireccion erronea de meta a nodo desde eventos

See merge request artica/pandorafms!2771
 2019-10-17 09:54:31 +02:00
Tatiana Llorente 5264de2008 Merge branch 'develop' into 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos' 
Conflicts:
   pandora_console/operation/events/events.php
 2019-10-17 09:27:00 +02:00
artica 361f2022f4 Auto-updated build strings. 2019-10-17 00:01:10 +02:00
Daniel Rodriguez b6db2aa041 Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop' 
Fixed open and enterprise network map migration

See merge request artica/pandorafms!2745
 2019-10-16 19:03:24 +02:00
Jose Gonzalez 4a29057a1b Solved issue with date_from and dato_to missing time data 2019-10-16 16:41:22 +02:00
Alejandro Fraguas 039d854441 Merge branch 'ent-4784-Selector-de-intervalo-en-bulks-pule-el-conf-de-los-agentes-con-remote-dependiendo-de-la-opción-que-seleccionemos' into 'develop' 
Ent 4784 selector de intervalo en bulks pule el conf de los agentes con remote dependiendo de la opción que seleccionemos

See merge request artica/pandorafms!2800
 2019-10-16 14:16:13 +02:00
fbsanchez 5f2adbfb7a Updated file names to avoid collision 2019-10-16 13:40:46 +02:00
Alejandro Fraguas 2d801a0109 Merge branch '3366-mensajes-ejecutar-pandora_db' into 'develop' 
Solved an issue with uninizialized variable

See merge request artica/pandorafms!2815
 2019-10-16 12:05:48 +02:00
Daniel Rodriguez 5f0dffb816 Merge branch 'ent-4559-desajuste-en-custom-fields' into 'develop' 
Ent 4559 desajuste en custom fields

See merge request artica/pandorafms!2684
 2019-10-16 11:38:38 +02:00
Marcos Alconada e7a948bb71 Update HelpFeedBack.class.php 2019-10-16 11:03:21 +02:00
Alejandro Fraguas 7e54a26b49 Merge branch 'ent-4618-8580-4526-Bug-en-los-CSV-report' into 'develop' 
Fixed csv reports download

See merge request artica/pandorafms!2742
 2019-10-16 09:58:00 +02:00
artica a3a456da92 Auto-updated build strings. 2019-10-16 00:01:08 +02:00
fbsanchez 4cceb38762 1st RC WebSocketProxy 2019-10-15 22:16:54 +02:00
Marcos Alconada 1a77e3e381 Update HelpFeedBack.class.php 2019-10-15 18:11:50 +02:00
Marcos Alconada 43d3f32d0c Update help_feedback.css 2019-10-15 18:11:21 +02:00
Marcos Alconada 5a73b67545 Update help_feedback.css 2019-10-15 17:59:22 +02:00
Daniel Rodriguez 68c064feee Merge branch '4673-mal-funcionamiento-use-xml-timestamp' into 'develop' 
Changed parameter of use_xml_timestamp

See merge request artica/pandorafms!2797
 2019-10-15 17:28:59 +02:00
fbsanchez 06f8f920b8 wip WS redirection 2019-10-15 17:20:23 +02:00
Jose Gonzalez 7d4b75c4b3 Solved an issue with uninizialized variable 2019-10-15 17:04:08 +02:00
Marcos Alconada d04544fa66 Update HelpFeedBack.class.php 2019-10-15 16:34:01 +02:00
Marcos Alconada 03ada6fb1f Update HelpFeedBack.class.php 2019-10-15 16:28:12 +02:00
Daniel Rodriguez 402bd6b58f Merge branch 'ent-4778-macro-policy-no-funciona' into 'develop' 
Fixed macro _policy_ in alerts

See merge request artica/pandorafms!2792
 2019-10-15 16:17:49 +02:00
marcos 8999f408ef redirect to list items when update item 2019-10-15 14:13:07 +02:00
Alejandro Fraguas ca5a31db6a Merge branch 'ent-3830-autorrefresh-en-mapas-gis' into 'develop' 
add gis maps to autorefresh list

See merge request artica/pandorafms!2731
 2019-10-15 13:21:19 +02:00
Marcos Alconada f8636e77cc Update HelpFeedBack.class.php 2019-10-15 12:45:40 +02:00
marcos a31e66a9bd add feedback 2019-10-15 12:16:50 +02:00
Alejandro Fraguas 78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop' 
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
 2019-10-15 11:42:00 +02:00
Marcos Alconada 89843fcc3b Update functions_ui 2019-10-15 11:13:40 +02:00
artica 6c21d57677 Auto-updated build strings. 2019-10-15 00:01:09 +02:00
fbsanchez 3a9e5fa477 wip: gotty redirection experiment p2 2019-10-14 19:33:00 +02:00
Daniel Barbero Martin 13a72426cd fixed diagnostics 2019-10-14 17:21:38 +02:00
Daniel Rodriguez febe54e3c8 Merge branch '4779-call-set-planned_downtimes-no-se-muestra' into 'develop' 
Added date control

See merge request artica/pandorafms!2794
 2019-10-14 16:21:39 +02:00
Alejandro Fraguas 8407d7fe9a Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop' 
Added current gis location to agent gis view list

See merge request artica/pandorafms!2772
 2019-10-14 15:57:27 +02:00
Luis Calvo a1c4b3eaeb Fixed minor bug 2019-10-14 13:38:10 +02:00
Alejandro Fraguas 1cbeed7b06 Merge branch '3366-mensajes-ejecutar-pandora_db' into 'develop' 
Added a string with information of the caller of pandora_server. Modified too...

See merge request artica/pandorafms!2786
 2019-10-14 11:45:08 +02:00
Daniel Rodriguez 8fb672f27c Merge branch '4611-despliegue-plugins-meta-nodos' into 'develop' 
Modified character for string fusion (| ---> ~)

See merge request artica/pandorafms!2806
 2019-10-14 11:25:18 +02:00
fbsanchez 86170b3ad8 experiments 2019-10-14 07:59:29 +02:00
artica 83b16d9d84 Auto-updated build strings. 2019-10-14 00:01:07 +02:00