artica
|
8b92c0ffc1
|
Auto-updated build strings.
|
2021-03-30 01:00:51 +02:00 |
|
artica
|
96d63e2029
|
Updated version and build strings.
|
2021-03-29 14:57:41 +02:00 |
|
artica
|
3e8214850f
|
Auto-updated build strings.
|
2021-03-29 01:00:18 +02:00 |
|
artica
|
cf78261d0b
|
Auto-updated build strings.
|
2021-03-28 01:00:14 +01:00 |
|
artica
|
e46845e864
|
Auto-updated build strings.
|
2021-03-27 01:00:19 +01:00 |
|
artica
|
c10c1b09cf
|
Auto-updated build strings.
|
2021-03-26 01:00:18 +01:00 |
fbsanchez
|
fdc4133eaa
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
|
2021-03-25 10:20:02 +01:00 |
|
artica
|
1934c04388
|
Auto-updated build strings.
|
2021-03-25 01:00:21 +01:00 |
|
fbsanchez
|
0179e89740
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
|
2021-03-24 13:16:54 +01:00 |
|
artica
|
00375710c2
|
Auto-updated build strings.
|
2021-03-24 01:00:25 +01:00 |
|
artica
|
b1bfd70feb
|
Auto-updated build strings.
|
2021-03-23 01:00:17 +01:00 |
|
fbsanchez
|
e0aa1bfc68
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/styles/pandora.css
|
2021-03-22 09:59:07 +01:00 |
|
artica
|
49e7ba7312
|
Auto-updated build strings.
|
2021-03-22 01:00:10 +01:00 |
|
artica
|
2dcc0cf9ee
|
Auto-updated build strings.
|
2021-03-21 01:00:09 +01:00 |
|
artica
|
db007bc0cf
|
Auto-updated build strings.
|
2021-03-20 01:00:09 +01:00 |
|
artica
|
3a384dae0a
|
Auto-updated build strings.
|
2021-03-19 01:00:13 +01:00 |
|
artica
|
572f8c9908
|
Auto-updated build strings.
|
2021-03-18 01:00:22 +01:00 |
|
artica
|
610d41290e
|
Auto-updated build strings.
|
2021-03-17 01:00:20 +01:00 |
Daniel Rodriguez
|
cb6bb195b5
|
Merge branch 'ent-5700-traza-ejecucion-pandora-db-tgraph-source' into 'develop'
Added log on deleting tgraph_source data in pandora_db
See merge request artica/pandorafms!3721
|
2021-03-16 09:13:00 +00:00 |
|
artica
|
df269f52c1
|
Auto-updated build strings.
|
2021-03-16 01:00:18 +01:00 |
|
artica
|
fc29160c91
|
Auto-updated build strings.
|
2021-03-15 01:00:15 +01:00 |
|
artica
|
0f848d48e8
|
Auto-updated build strings.
|
2021-03-14 01:00:14 +01:00 |
|
artica
|
5fca622b3b
|
Auto-updated build strings.
|
2021-03-13 01:00:19 +01:00 |
alejandro.campos@artica.es
|
3c5bf3eeef
|
Merge remote-tracking branch 'origin/develop' into temp
|
2021-03-12 12:34:47 +01:00 |
|
artica
|
d4bf4b9cad
|
Auto-updated build strings.
|
2021-03-12 01:00:20 +01:00 |
|
alejandro.campos@artica.es
|
2f7a826253
|
minor fixes
|
2021-03-11 17:54:20 +01:00 |
|
fbsanchez
|
95f1a2abcc
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
|
2021-03-11 10:00:17 +01:00 |
|
artica
|
74fb084ba5
|
Auto-updated build strings.
|
2021-03-11 01:00:18 +01:00 |
|
Daniel Rodriguez
|
96d5555ed2
|
Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop'
Ent 6464 discovery id recon server no cambia si no existe
Closes pandora_enterprise#6464
See merge request artica/pandorafms!3788
|
2021-03-10 15:53:28 +00:00 |
|
alejandro.campos@artica.es
|
71e9452988
|
Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora
|
2021-03-10 10:28:45 +01:00 |
|
alejandro.campos@artica.es
|
5913313bae
|
Increased number of possible custom fields for Integria action
|
2021-03-10 10:28:27 +01:00 |
|
artica
|
e34a1c47c8
|
Auto-updated build strings.
|
2021-03-10 01:01:06 +01:00 |
|
artica
|
f9d5767027
|
Auto-updated build strings.
|
2021-03-09 01:00:17 +01:00 |
|
artica
|
2bd9515152
|
Auto-updated build strings.
|
2021-03-08 01:00:14 +01:00 |
|
artica
|
438c388423
|
Auto-updated build strings.
|
2021-03-07 01:00:17 +01:00 |
|
artica
|
80c568bbdd
|
Auto-updated build strings.
|
2021-03-06 01:00:19 +01:00 |
|
artica
|
eb912405a6
|
Auto-updated build strings.
|
2021-03-05 01:00:53 +01:00 |
|
Alejandro Campos
|
d4054f15d0
|
Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
# Conflicts:
# pandora_console/extras/mr/45.sql
# pandora_console/godmode/alerts/configure_alert_action.php
# pandora_server/util/pandora_db.pl
|
2021-03-04 10:27:07 +00:00 |
|
artica
|
4d1cab6b67
|
Auto-updated build strings.
|
2021-03-04 01:00:19 +01:00 |
|
artica
|
442d0d440a
|
Auto-updated build strings.
|
2021-03-03 01:00:23 +01:00 |
|
fbsanchez
|
d96590aea5
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
pandora_console/include/functions_ui.php
pandora_console/include/styles/pandora.css
|
2021-03-02 09:40:15 +01:00 |
|
artica
|
19ab53cfb8
|
Auto-updated build strings.
|
2021-03-02 01:00:21 +01:00 |
|
artica
|
0587500074
|
Auto-updated build strings.
|
2021-03-01 01:00:09 +01:00 |
|
artica
|
0cf47e4b00
|
Auto-updated build strings.
|
2021-02-28 01:00:06 +01:00 |
|
artica
|
814a39235e
|
Auto-updated build strings.
|
2021-02-27 01:00:19 +01:00 |
|
artica
|
dc04a2b2b5
|
Auto-updated build strings.
|
2021-02-26 01:00:19 +01:00 |
|
alejandro.campos@artica.es
|
901d12fec0
|
Integration with Integria
|
2021-02-25 13:18:04 +01:00 |
|
artica
|
078ab1657f
|
Auto-updated build strings.
|
2021-02-25 01:00:25 +01:00 |
|
artica
|
508b953496
|
Auto-updated build strings.
|
2021-02-24 01:00:21 +01:00 |
|
artica
|
a5b1128014
|
Auto-updated build strings.
|
2021-02-23 01:00:16 +01:00 |