fbsanchez
|
6def88472a
|
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
# Conflicts:
# pandora_console/extras/mr/32.sql
|
2019-09-19 10:18:15 +02:00 |
Luis Calvo
|
43af2269ee
|
Fixed default values uncompress data
|
2019-09-18 11:51:01 +02:00 |
|
Luis Calvo
|
e409b33c6c
|
Added changes to treport_content_template to db
|
2019-09-17 12:32:07 +02:00 |
|
Luis Calvo
|
e89efea022
|
Added column 'uncompressed_module' to 'treport_content'
|
2019-09-16 11:18:01 +02:00 |
|
fbsanchez
|
aa6c105841
|
Update 32.sql missed ';'
|
2019-09-12 17:47:49 +02:00 |
|
fbsanchez
|
ebcce5cad4
|
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
# Conflicts:
# pandora_console/extras/mr/32.sql
|
2019-09-12 11:17:44 +02:00 |
|
fbsanchez
|
148cd5cce6
|
db updates pandora_db
|
2019-09-05 10:45:17 +02:00 |
|
fbsanchez
|
5c535514e1
|
Updated MR reference
|
2019-09-02 15:44:48 +02:00 |
Daniel Maya
|
de47275735
|
Fixed mr
|
2019-08-30 10:34:52 +02:00 |
|
Daniel Maya
|
63da85798e
|
Change mr
|
2019-08-26 16:10:06 +02:00 |
|
fbsanchez
|
62ec37cf59
|
propagate tdatabase updates
|
2019-08-10 03:18:45 +02:00 |
|
fbsanchez
|
adbb48ab87
|
pandora HA review
|
2019-08-10 02:13:01 +02:00 |
Alejandro Campos
|
12eacc1933
|
Merge branch 'develop' into 'ent-4388-Nuevos-eventos'
# Conflicts:
# pandora_console/extras/mr/31.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-08-05 09:26:18 +02:00 |
Daniel Rodriguez
|
7ff5e23792
|
Merge branch 'ent-4460-Eliminar-antigua-integracion-con-integria' into 'develop'
removed all deprecated references to integria from code and db data
See merge request artica/pandorafms!2626
|
2019-08-02 12:28:03 +02:00 |
|
alejandro-campos
|
a36a293f19
|
added changes to pandora migrate and MR
|
2019-07-31 17:18:52 +02:00 |
|
alejandro-campos
|
927b1fa37f
|
removed all deprecated references to integria from code and db data
|
2019-07-31 16:46:26 +02:00 |
|
fbsanchez
|
db25d3b231
|
Cleared unused table
|
2019-07-26 21:56:37 +02:00 |
|
fbsanchez
|
ce346bd604
|
agent deployment
|
2019-07-24 17:38:25 +02:00 |
|
fbsanchez
|
62d8c04ab3
|
Agent deployment v1
|
2019-07-23 13:01:50 +02:00 |
|
fbsanchez
|
8d9c4682c7
|
WIP Agent repository
|
2019-07-17 20:37:13 +02:00 |
|
fbsanchez
|
17dc0b82ac
|
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
|
2019-07-17 17:19:58 +02:00 |
|
fbsanchez
|
f0bfe6910d
|
WIP agent deployment
|
2019-07-16 20:56:47 +02:00 |
|
fbsanchez
|
3bbd01026e
|
WIP agent deployment
|
2019-07-15 19:37:04 +02:00 |
Daniel Barbero
|
ecaba5ebd3
|
fixed errorsr macros reports
|
2019-07-12 10:24:46 +02:00 |
|
fbsanchez
|
47cc0d9d6e
|
WIP: Agent deployment center
|
2019-07-10 23:59:09 +02:00 |
|
Daniel Barbero Martin
|
000cdfdcfd
|
WIP failover
|
2019-07-04 12:09:08 +02:00 |
|
Daniel Barbero Martin
|
22734a4ea2
|
WIP failover
|
2019-07-03 17:51:47 +02:00 |
|
Daniel Barbero
|
209681e4c2
|
ADD failover option availability_graph
|
2019-07-02 11:50:58 +02:00 |
|
Daniel Barbero Martin
|
0064bc0cba
|
fixed errors
|
2019-07-01 17:07:39 +02:00 |
|
fbsanchez
|
5ccc16d7d6
|
Revert 28.sql
|
2019-06-27 15:04:58 +02:00 |
|
fbsanchez
|
225de6b5ea
|
MR forgotten change
|
2019-06-26 19:33:42 +02:00 |
|
fbsanchez
|
4754e20784
|
Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion
|
2019-06-26 09:52:22 +02:00 |
|
fbsanchez
|
004eb11048
|
MR29
|
2019-06-25 15:24:15 +02:00 |
|
fbsanchez
|
a507d28c1f
|
Update Aws agent names
|
2019-06-25 10:12:25 +02:00 |
|
fbsanchez
|
180948c51c
|
Import previous aws account
|
2019-06-24 19:36:50 +02:00 |
|
fbsanchez
|
e4f6a95a89
|
MR29 credential store
|
2019-06-21 23:05:21 +02:00 |
|
fbsanchez
|
6682bad19f
|
first steps credential store
|
2019-06-21 12:03:25 +02:00 |
marcos.alconada
|
833248991b
|
Add mr 29
|
2019-06-07 11:24:00 +02:00 |
|
Daniel Maya
|
30b8872ab3
|
fixed mr 28
|
2019-05-29 17:06:25 +02:00 |
|
Daniel Maya
|
552467286c
|
Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
# Conflicts:
# pandora_console/extras/mr/28.sql
|
2019-05-29 11:10:31 +02:00 |
|
Luis Calvo
|
5966367f8f
|
eHorus user level login conf added in user editor
|
2019-05-28 13:14:42 +02:00 |
|
Luis Calvo
|
3736d84589
|
Edit ehorus user
|
2019-05-27 18:49:47 +02:00 |
|
Luis Calvo
|
588d19102f
|
Resolve merge conflict
|
2019-05-27 18:30:24 +02:00 |
|
marcos.alconada
|
01d96728c8
|
changed PK to NULL
|
2019-05-24 11:03:09 +02:00 |
|
Daniel Maya
|
4c874e152c
|
Merge
|
2019-05-23 10:43:32 +02:00 |
|
Daniel Maya
|
2de2d1f482
|
Added expiration and deleted old cache data in pandora_db
|
2019-05-23 10:35:03 +02:00 |
|
Daniel Maya
|
5c0a197b6b
|
Added cache
|
2019-05-20 15:15:54 +02:00 |
|
fbsanchez
|
5e9b2479eb
|
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
|
2019-05-20 13:11:39 +02:00 |
|
fbsanchez
|
034480bf88
|
minor fixes
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
|
2019-05-16 12:28:46 +02:00 |
|
Luis Calvo
|
702926cf85
|
solved merge conflict mr 28.sql
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
|
2019-05-16 10:15:46 +02:00 |