fbsanchez
|
b9633933e1
|
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
|
2019-11-12 14:17:45 +01:00 |
|
fbsanchez
|
19d06dc061
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap
|
2019-11-12 10:19:34 +01:00 |
|
artica
|
2ee4f9d88f
|
Auto-updated build strings.
|
2019-11-12 00:01:09 +01:00 |
|
fbsanchez
|
ca9d168e67
|
wip omnishell
|
2019-11-11 18:12:43 +01:00 |
|
artica
|
c390befc2a
|
Auto-updated build strings.
|
2019-11-11 00:01:07 +01:00 |
|
artica
|
7e275febcd
|
Auto-updated build strings.
|
2019-11-10 00:01:07 +01:00 |
|
artica
|
cba38680bd
|
Auto-updated build strings.
|
2019-11-09 00:01:09 +01:00 |
|
artica
|
c8b39740a9
|
Auto-updated build strings.
|
2019-11-08 11:05:59 +01:00 |
|
fbsanchez
|
98237a8d34
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/general/header.php
|
2019-11-06 15:36:53 +01:00 |
|
Alejandro Fraguas
|
37ffff12eb
|
Merge branch '4727-macros-grupos-secundarios' into 'develop'
4727 macros grupos secundarios
See merge request artica/pandorafms!2811
|
2019-11-06 12:20:39 +01:00 |
|
fbsanchez
|
276fc82556
|
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-05 15:39:18 +01:00 |
|
fbsanchez
|
d3e1d34bed
|
SAP discovery
|
2019-11-05 15:38:17 +01:00 |
|
fbsanchez
|
58cbc3c738
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
|
2019-11-05 15:17:09 +01:00 |
|
fbsanchez
|
844414dc8b
|
Discovery SAP - backend start
|
2019-11-04 19:52:38 +01:00 |
|
Alejandro Fraguas
|
777bbdd180
|
Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop'
Added feature sample_agent
See merge request artica/pandorafms!2826
|
2019-11-04 17:54:33 +01:00 |
|
fbsanchez
|
383967f68a
|
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
|
2019-10-29 16:56:01 +01:00 |
|
artica
|
6f3e42e732
|
Auto-updated build strings.
|
2019-10-29 00:01:13 +01:00 |
|
fbsanchez
|
2e629af15c
|
Simplified log message avoid extra symbols "*"
|
2019-10-28 20:43:36 +01:00 |
|
fbsanchez
|
7accbc97c4
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
|
2019-10-28 12:36:19 +01:00 |
|
artica
|
3094d5af05
|
Updated version and build strings.
|
2019-10-28 12:35:59 +01:00 |
|
fbsanchez
|
ccf971c2eb
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
|
2019-10-28 12:18:19 +01:00 |
|
Daniel Rodriguez
|
08247c1952
|
Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop'
changed pandora api functions to include possibility of using agent alias when...
See merge request artica/pandorafms!2819
|
2019-10-28 11:25:38 +01:00 |
|
Alejandro Fraguas
|
405b91a2ac
|
Merge branch 'ent-3584-no-pasa-html_encode-al-alias-de-los-broker_agents' into 'develop'
Encode the agent alias with HTML entities.
See merge request artica/pandorafms!2836
|
2019-10-28 10:01:48 +01:00 |
|
artica
|
88a56a1f22
|
Auto-updated build strings.
|
2019-10-28 00:01:08 +01:00 |
|
artica
|
874ac0c630
|
Auto-updated build strings.
|
2019-10-27 00:01:07 +02:00 |
|
artica
|
8a03486dfc
|
Auto-updated build strings.
|
2019-10-26 00:01:09 +02:00 |
|
Ramon Novoa
|
d3971a3f90
|
Encode the agent alias with HTML entities.
Ref pandora_enterprise#3584
|
2019-10-25 11:08:47 +02:00 |
|
artica
|
86fd1275be
|
Auto-updated build strings.
|
2019-10-25 00:01:11 +02:00 |
|
alejandro-campos
|
ee587a3117
|
Merge remote-tracking branch 'origin/develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name
|
2019-10-24 13:21:08 +02:00 |
|
artica
|
38dfa5cf35
|
Auto-updated build strings.
|
2019-10-24 00:01:09 +02:00 |
|
artica
|
1470241783
|
Auto-updated build strings.
|
2019-10-23 00:01:11 +02:00 |
|
Jose Gonzalez
|
a6d1f3a544
|
Another minor fix applied
|
2019-10-22 16:23:46 +02:00 |
|
Jose Gonzalez
|
305dfa441d
|
Minor fix applied
|
2019-10-22 14:03:24 +02:00 |
|
Jose Gonzalez
|
7c39f3680e
|
Added feature sample_agent
|
2019-10-22 11:54:27 +02:00 |
|
artica
|
f99616723b
|
Auto-updated build strings.
|
2019-10-22 00:01:09 +02:00 |
|
alejandro-campos
|
6cf08dde1e
|
Merge branch 'develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name
|
2019-10-21 09:43:43 +02:00 |
|
artica
|
f72fde0fb5
|
Auto-updated build strings.
|
2019-10-21 00:01:07 +02:00 |
|
artica
|
bb9d18b6d8
|
Auto-updated build strings.
|
2019-10-20 00:01:07 +02:00 |
|
artica
|
88248fd226
|
Auto-updated build strings.
|
2019-10-19 00:01:11 +02:00 |
|
artica
|
22af1a3654
|
Auto-updated build strings.
|
2019-10-18 00:01:11 +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 |
|
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 |
|
artica
|
361f2022f4
|
Auto-updated build strings.
|
2019-10-17 00:01:10 +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 |
|
artica
|
a3a456da92
|
Auto-updated build strings.
|
2019-10-16 00:01:08 +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 |
|
Jose Gonzalez
|
7d4b75c4b3
|
Solved an issue with uninizialized variable
|
2019-10-15 17:04:08 +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 |
|
artica
|
6c21d57677
|
Auto-updated build strings.
|
2019-10-15 00:01:09 +02:00 |
|