artica
|
de77e52297
|
Auto-updated build strings.
|
2018-11-22 00:01:28 +01:00 |
nramon
|
8735adc252
|
Merge branch 'feature/offline-license' into 'develop'
Add support for offline licenses.
See merge request artica/pandorafms!2001
|
2018-11-21 12:10:13 +01:00 |
|
Ramon Novoa
|
054546fd0f
|
Add support for offline licenses.
Ref pandora_enterprise#3098.
|
2018-11-21 12:05:20 +01:00 |
|
artica
|
fd6d830de3
|
Auto-updated build strings.
|
2018-11-21 00:01:25 +01:00 |
|
artica
|
01ba290a68
|
Auto-updated build strings.
|
2018-11-20 00:01:29 +01:00 |
|
artica
|
ce5c679ad6
|
Auto-updated build strings.
|
2018-11-19 00:01:29 +01:00 |
|
artica
|
f2bf27d367
|
Auto-updated build strings.
|
2018-11-18 00:01:28 +01:00 |
|
artica
|
4021af48f9
|
Auto-updated build strings.
|
2018-11-17 00:01:31 +01:00 |
|
artica
|
a0fde9503f
|
Auto-updated build strings.
|
2018-11-16 00:01:29 +01:00 |
|
artica
|
e9e132589c
|
Auto-updated build strings.
|
2018-11-15 00:01:29 +01:00 |
|
artica
|
633d6987eb
|
Auto-updated build strings.
|
2018-11-14 00:01:29 +01:00 |
artica
|
f308e1f590
|
Updated version and build strings.
|
2018-11-13 15:59:16 +01:00 |
vgilc
|
72691ffe8d
|
Merge branch '2677-no-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted
See merge request artica/pandorafms!1961
|
2018-11-13 08:37:45 +01:00 |
|
artica
|
e29160f34d
|
Auto-updated build strings.
|
2018-11-13 00:01:29 +01:00 |
alejandro-campos
|
e45dc3a981
|
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted
|
2018-11-12 18:39:14 +01:00 |
|
artica
|
0dd6c54651
|
Auto-updated build strings.
|
2018-11-12 00:01:25 +01:00 |
|
artica
|
4f928c8c22
|
Auto-updated build strings.
|
2018-11-11 00:01:25 +01:00 |
|
artica
|
76b24c3214
|
Auto-updated build strings.
|
2018-11-10 00:01:28 +01:00 |
|
artica
|
2ed98eac77
|
Auto-updated build strings.
|
2018-11-09 00:01:27 +01:00 |
|
artica
|
d28b229423
|
Auto-updated build strings.
|
2018-11-08 00:01:29 +01:00 |
|
vgilc
|
c7a54182a3
|
Merge branch '6219_Comprobacion_Paradas_planificadas_CLI_2' into 'develop'
Added check for the creation of planned downtimes by pandora manage
See merge request artica/pandorafms!1936
|
2018-11-07 08:48:48 +01:00 |
|
artica
|
a01f79d294
|
Auto-updated build strings.
|
2018-11-07 00:01:31 +01:00 |
samucarc
|
a80c7e493e
|
Added check for the creation of planned downtimes by pandora manage
|
2018-11-06 16:42:03 +01:00 |
|
vgilc
|
919a800a0a
|
Revert "Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'"
This reverts merge request !1727
|
2018-11-06 16:41:15 +01:00 |
|
artica
|
3ffad9fda8
|
Auto-updated build strings.
|
2018-11-06 00:01:27 +01:00 |
|
artica
|
50b8886916
|
Auto-updated build strings.
|
2018-11-05 00:01:25 +01:00 |
|
artica
|
f9e2936df5
|
Auto-updated build strings.
|
2018-11-04 00:01:25 +01:00 |
|
artica
|
afd922426e
|
Auto-updated build strings.
|
2018-11-03 00:01:27 +01:00 |
|
artica
|
fc82a9d172
|
Auto-updated build strings.
|
2018-11-02 00:01:26 +01:00 |
|
artica
|
f47918b4cc
|
Auto-updated build strings.
|
2018-11-01 00:01:31 +01:00 |
|
artica
|
d9f8616b2c
|
Auto-updated build strings.
|
2018-10-31 00:01:26 +01:00 |
|
artica
|
5a057490ad
|
Auto-updated build strings.
|
2018-10-30 00:01:29 +01:00 |
|
artica
|
696abbdead
|
Auto-updated build strings.
|
2018-10-29 00:01:25 +01:00 |
|
artica
|
507bbcff56
|
Auto-updated build strings.
|
2018-10-28 00:01:22 +02:00 |
|
artica
|
01e9251a88
|
Auto-updated build strings.
|
2018-10-27 00:01:26 +02:00 |
|
vgilc
|
7a4b7d4289
|
Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop'
2221 actualizacion de pandora a version 7 de php
See merge request artica/pandorafms!1875
|
2018-10-26 14:41:15 +02:00 |
|
artica
|
dba51e07b3
|
Auto-updated build strings.
|
2018-10-26 00:01:33 +02:00 |
daniel
|
0b0bad8a73
|
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
|
2018-10-25 17:43:28 +02:00 |
|
vgilc
|
ea0474e704
|
Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted
See merge request artica/pandorafms!1727
|
2018-10-25 10:37:11 +02:00 |
|
artica
|
db802c5a2e
|
Auto-updated build strings.
|
2018-10-25 00:01:22 +02:00 |
|
artica
|
7a64bb4855
|
Auto-updated build strings.
|
2018-10-24 00:01:28 +02:00 |
|
artica
|
9a77256198
|
Auto-updated build strings.
|
2018-10-23 00:01:29 +02:00 |
|
artica
|
f899910dd0
|
Updated version and build strings.
|
2018-10-22 09:45:06 +02:00 |
|
daniel
|
6bb478ea1a
|
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
|
2018-10-22 08:04:36 +02:00 |
|
artica
|
1d0d656996
|
Auto-updated build strings.
|
2018-10-22 00:01:23 +02:00 |
|
artica
|
b01362a873
|
Auto-updated build strings.
|
2018-10-21 00:01:26 +02:00 |
|
artica
|
5ced50863c
|
Auto-updated build strings.
|
2018-10-20 00:01:25 +02:00 |
|
daniel
|
ffc7734ebc
|
delete flash_charts and library pchart
|
2018-10-19 11:31:06 +02:00 |
|
artica
|
f340a3dda0
|
Auto-updated build strings.
|
2018-10-19 00:01:26 +02:00 |
|
artica
|
0c39e321e4
|
Auto-updated build strings.
|
2018-10-18 00:01:24 +02:00 |