tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,178 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

248 Commits

Author SHA1 Message Date
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
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
marcos.alconada ad00492ad6 se elimina la query del 27 
Former-commit-id: 1756d296ad9c13c62c4eb46a854291dfc4200256
 2019-05-06 18:23:12 +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
marcos.alconada c5c84d7421 Deleted row Integria IMS incident from event on tevent_responoses 
Former-commit-id: 76e41297003d537f8b0ea74394dd433e71ca2976
 2019-04-29 12:32:06 +02:00
manuel c075d5caad Added condition type not normal in alert templates 
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
 2019-04-24 10:51:55 +02:00
fbsanchez bbedf36235 minor update 
Former-commit-id: da7ef108bd3b71ece515407fb932e6b9bef761fd
 2019-04-23 16:28:22 +02:00
fbsanchez cbdd8e7104 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
 2019-04-22 09:01:24 +02:00
Marcos Alconada d3d5312f40 Update 27.sql 
Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d
 2019-04-15 11:14:41 +02:00
marcos.alconada 1b5786aedb Merge remote-tracking branch 'origin/develop' into ent-3790-sobra-una-columna-de-tnetflow_filter 
Former-commit-id: 652770c2bad08caef82584fc440736ee36abd03d
 2019-04-12 10:32:07 +02:00
fbsanchez 342e4b78c9 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
 2019-04-11 15:12:46 +02:00
fbsanchez 79bd37ee5b Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7
 2019-04-08 16:28:26 +02:00
Daniel Barbero 49d925d96a Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop 
Conflicts:
	pandora_console/extras/mr/27.sql


Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
 2019-04-05 16:48:58 +02:00
manuel 49c913c6de Added custom fields to report templates 
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
 2019-04-04 17:31:11 +02:00
fbsanchez 798a2aad16 WIP discovery F3 
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
 2019-04-03 18:13:19 +02:00
fbsanchez 11b2fbc245 WIP db 
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
 2019-04-02 16:25:29 +02:00
manuel 1fd40447e1 Custom fields in availability report type 
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
 2019-04-02 16:24:29 +02:00
daniel 431c807f61 Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop' 
# Conflicts:
#   pandora_console/extras/mr/27.sql

Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
 2019-04-02 10:21:04 +02:00
Daniel Rodriguez 2afc16c8dc Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop' 
Ent 1901 enviar reportes por mail en otros formatos que no sean pdf

See merge request artica/pandorafms!2272

Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937
 2019-04-01 17:51:37 +02:00
marcos.alconada 48c4eb9c01 Add changes in migrate and 27.sql file 
Former-commit-id: 60c2e2f2dc9a78ff9fb236efe7ac57a288d3717a
 2019-03-29 13:58:53 +01:00
Daniel Barbero Martin e3222626dc fixed error in bbdd 
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
 2019-03-28 09:49:16 +01:00
Daniel Barbero Martin 626aacbf43 Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop 
Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e
 2019-03-28 08:49:08 +01:00
Daniel Barbero Martin a3865a3181 flip flop keep counters 
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
 2019-03-27 18:16:53 +01:00
fbsanchez 128a97d254 fix mr 26 
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
 2019-03-27 17:38:08 +01:00
fbsanchez 66b2102052 Merge remote-tracking branch 'origin/develop' into fix/mr 
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
 2019-03-27 17:09:46 +01:00
fbsanchez 6ebbe54448 minor fix 
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
 2019-03-27 17:06:14 +01:00
fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/include/class/ConsoleSupervisor.php
	pandora_console/include/class/NetworkMap.class.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/menu.php

Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
 2019-03-27 12:11:23 +01:00
alejandro-campos d1bd5fbb1a Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2 
Former-commit-id: 914a944b96af8bceb26bbb89dbac25452097e20a
 2019-03-26 13:06:12 +01:00
fbsanchez 1238f15190 discovery task advanced summary support 
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
 2019-03-25 17:32:18 +01:00
fermin831 2711eb59ea Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql

Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
 2019-03-25 09:20:06 +01:00