artica
|
23e64ab781
|
Auto-updated build strings.
|
2019-11-21 00:01:18 +01:00 |
fbsanchez
|
e9432aaaa5
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-20 15:51:47 +01:00 |
|
artica
|
12123d68df
|
Auto-updated build strings.
|
2019-11-20 00:01:37 +01:00 |
|
fbsanchez
|
471389a72a
|
Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl'
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-19 14:11:38 +01:00 |
|
fbsanchez
|
be1e4324d2
|
missed port
|
2019-11-19 12:02:10 +01:00 |
|
artica
|
04076a04b1
|
Auto-updated build strings.
|
2019-11-19 00:01:12 +01:00 |
|
artica
|
73389a7164
|
Auto-updated build strings.
|
2019-11-18 00:01:07 +01:00 |
|
artica
|
39b449be9c
|
Auto-updated build strings.
|
2019-11-17 00:01:07 +01:00 |
|
artica
|
727b3bde5d
|
Auto-updated build strings.
|
2019-11-16 00:01:11 +01:00 |
|
artica
|
378192a449
|
Auto-updated build strings.
|
2019-11-15 00:01:12 +01:00 |
Alejandro Fraguas
|
27bdf04735
|
Merge branch 'ent-4774-welcome-to-pandorafms' into 'develop'
first changed to welcome window
See merge request artica/pandorafms!2822
|
2019-11-14 16:05:22 +01:00 |
|
artica
|
cfdb5330ae
|
Auto-updated build strings.
|
2019-11-14 00:01:12 +01:00 |
|
fbsanchez
|
83590146b1
|
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
|
2019-11-13 17:38:24 +01:00 |
|
fbsanchez
|
b11dbc639f
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts:
pandora_console/general/header.php
|
2019-11-13 12:20:29 +01:00 |
|
artica
|
c19d760bdb
|
Auto-updated build strings.
|
2019-11-13 00:01:12 +01:00 |
|
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 |
|
artica
|
2ee4f9d88f
|
Auto-updated build strings.
|
2019-11-12 00:01:09 +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
|
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 |
|
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 |