fbsanchez
|
5ccc16d7d6
|
Revert 28.sql
|
2019-06-27 15:04:58 +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 |
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 |
|
fbsanchez
|
3bf06f0b72
|
MR minor updates
Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c
|
2019-05-15 00:00:21 +02:00 |
|
fbsanchez
|
8004e096fd
|
MR 28 and minor fixes
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
|
2019-05-14 18:09:34 +02:00 |
Alejandro Fraguas
|
3548070ec1
|
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop'
Add new message to News board
See merge request artica/pandorafms!2415
Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
|
2019-05-14 17:56:43 +02:00 |
|
fbsanchez
|
53e9113b7e
|
UM notifications MR update
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
|
2019-05-14 17:15:28 +02:00 |
Daniel Barbero Martin
|
79701bba60
|
Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
|
2019-05-14 12:34:40 +02:00 |
|
Marcos Alconada
|
cf45be2c60
|
Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews'
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46
|
2019-05-14 10:03:37 +02:00 |
|
marcos.alconada
|
9501187ebc
|
Se cambian las consultas sql sin la imagen en la consulta
Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e
|
2019-05-14 10:01:30 +02:00 |
|
Luis Calvo
|
8c1c337522
|
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
|
2019-05-13 17:36:32 +02:00 |
Alejandro Campos
|
9347fc17aa
|
Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'
# Conflicts:
# pandora_console/extras/mr/28.sql
Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
|
2019-05-13 17:10:06 +02:00 |
|
Luis Calvo
|
27096276ec
|
agent view user acces ehorus
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
|
2019-05-13 15:00:29 +02:00 |
|
marcos.alconada
|
ac60e296c1
|
Add new message to News board
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
|
2019-05-10 11:17:46 +02:00 |
manuel
|
12c9952e4a
|
Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
|
2019-05-10 09:11:17 +02:00 |
|
Marcos Alconada
|
5126c651f7
|
Changed '' of query
|
2019-05-09 17:38:40 +02:00 |
|
Daniel Maya
|
f186cd6201
|
Added cache_expiration in mr, pandoradb and migrate
|
2019-05-09 17:37:01 +02:00 |
|
marcos.alconada
|
e1951c45a4
|
Se añade al 28
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
|
2019-05-06 18:06:59 +02:00 |
|
Daniel Barbero
|
c5884f1ac9
|
add changes sql for mr 28
Former-commit-id: 0650b5ec91188a854fb756d7c2d8b1b8eccc3e0d
|
2019-05-03 14:09:23 +02:00 |
|
alejandro-campos
|
5b3dfcbf74
|
add feature to enable obfuscation on command fields when creating or updating commands
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
|
2019-05-03 13:46:52 +02:00 |
|
manuel
|
c075d5caad
|
Added condition type not normal in alert templates
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
|
2019-04-24 10:51:55 +02:00 |