Commit Graph

19 Commits

Author SHA1 Message Date
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00: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
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
José González b7bd28ba07 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
2021-03-10 10:17:27 +00:00
Daniel Maya b54845fdcf Ent 6851 quitar marquesina de vista de eventos 2021-03-09 16:39:26 +00:00
Jose Gonzalez f1dd050333 Solve deleted files 2021-03-09 15:19:28 +01:00
fbsanchez dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
2021-01-28 16:12:47 +01:00
Luis e6cf2fe9eb Remove visual console manager extension 2021-01-28 11:57:52 +01:00
Luis Calvo a09ee55d13 Added event_statistics to delete txt 2021-01-27 09:42:50 +01:00
fbsanchez d9428ce215 WIP DBMainainer, fixed Websockets library placement 2021-01-25 13:33:02 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
fbsanchez 7be305298a Remove file - old cluster files 2020-05-22 14:15:10 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
Jose Gonzalez 25e5f0914a Added delete_files entry for recon view deletion 2019-06-27 16:58:48 +02:00
Rafael Ameijeiras b428797004 delete_file 2019-06-19 10:12:06 +02:00
fbsanchez c40e0ec702 pandora_console/extras/delete_files/delete_files.txt
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
2019-05-16 15:38:51 +02:00
fbsanchez 2dd427100e errata fix
Former-commit-id: 3e4ce53635dc02387ec1d2d46698fa4a81372dd0
2019-03-27 16:44:08 +01:00
Daniel Barbero Martin daf72a4bac fixed errors delete files update manager open and metaconsole
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
2019-03-20 13:35:24 +01:00