tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
22,709 Commits 34 Branches 30 Tags
Commit Graph

22709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Tatiana Llorente
30caad5a6c Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810 2019-10-15 16:50:05 +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
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
Jose Gonzalez
e0ff5bf9cc Solved an issue with japanese wiki 2019-10-14 17:13:13 +02:00
Jose Gonzalez
01148749a6 Added secondarygroups macro and updated spanish, english and japanses wiki 2019-10-14 17:10:48 +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
artica
838fcfa3a1 Auto-updated build strings. 2019-10-13 00:01:06 +02:00
artica
df2acbce96 Auto-updated build strings. 2019-10-12 00:01:10 +02:00
Tatiana Llorente
dd2ace99e1 Check permissions to reset a network map - #4728 2019-10-11 13:51:52 +02:00
Jose Gonzalez
5ffa93bb25 Modified character for string fusion 2019-10-11 13:49:19 +02:00
Daniel Rodriguez
e4775a3e6d Merge branch 'ent-4607-8644-informe-histograma-no-funciona-bien' into 'develop' 
Fixed bug in histogram graph report

See merge request artica/pandorafms!2803
 2019-10-11 13:06:27 +02:00
Daniel Rodriguez
adaead5f8f Merge branch 'ent-4763-paginacion-datatables' into 'develop' 
datatables hide when only 1 page

See merge request artica/pandorafms!2784
 2019-10-11 12:46:22 +02:00
Daniel Rodriguez
c1853523f5 Merge branch 'ent-4545-Bug-creacion-infrome-con-graficas-MAX-Value-fallo-tabla' into 'develop' 
Ent 4545 bug creacion infrome con graficas max value fallo tabla

See merge request artica/pandorafms!2719
 2019-10-11 12:30:36 +02:00
Tatiana Llorente
8c556d7d19 Changed permissions for management users - #4794 2019-10-11 11:47:38 +02:00
manuel
f139fb0d2c Merge branch 'develop' into ent-4618-8580-4526-Bug-en-los-CSV-report 2019-10-11 11:39:41 +02:00
Alejandro Fraguas
7fc31d127d Merge branch 'ent-4662-bug-creacion-agente-API-visualizacion-Metaconsola' into 'develop' 
Ent 4662 bug creacion agente api visualizacion metaconsola

See merge request artica/pandorafms!2764
 2019-10-11 11:25:16 +02:00
manuel
a69cfb63f1 Fixed bug in histogram graph report 2019-10-11 09:04:13 +02:00
artica
9a165dc9d8 Auto-updated build strings. 2019-10-11 00:01:08 +02:00
Alejandro Fraguas
41b84ccd81 Merge branch 'pulido/discovery-duplicados-alhambra' into 'develop' 
Locate instead search before create new Discovered agent

See merge request artica/pandorafms!2790
 2019-10-10 18:51:23 +02:00
fbsanchez
fb4f4b4046 minor error cleanup 2019-10-10 17:31:57 +02:00
fbsanchez
97f246ae60 discovery os detection 2019-10-10 17:28:02 +02:00
fbsanchez
f1ec7d2339 minor fix in str comparison 2019-10-10 17:23:19 +02:00
Daniel Rodriguez
f8dc0596ba Merge branch 'ent-4653-item-agent-modules-blank-on-template' into 'develop' 
Removed item agent/modules from templates

See merge request artica/pandorafms!2760
 2019-10-10 17:00:28 +02:00
Daniel Rodriguez
ea9fd23b89 Merge branch 'ent-4760-error-pandora_smpp-pl' into 'develop' 
Allowed several destination numbers in a single script call

See merge request artica/pandorafms!2801
 2019-10-10 16:43:20 +02:00
Luis Calvo
bf19fbffd3 Added API and cli function get_agents_id_by_alias 2019-10-10 14:25:17 +02:00
Kike
0433718612 Allowed several destination numbers in a single script call 2019-10-10 14:07:22 +02:00
Tatiana Llorente
fc0e4827ea No change interval if is empty in massive edit - #4784 2019-10-10 13:37:01 +02:00
artica
edb3c806ce Auto-updated build strings. 2019-10-10 00:01:08 +02:00