tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
21,673 Commits 34 Branches 30 Tags
Commit Graph

21673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Rodriguez
c5be8e55ae Merge branch 'ent-3807-html-special-chars-conversion' into 'develop' 
Ent 3807 html special chars conversion

See merge request artica/pandorafms!2320
 2019-06-25 12:19:01 +02:00
fbsanchez
fc0d9463d5 Fixed 2019-06-25 12:07:56 +02:00
Daniel Rodriguez
569bfa2329 Merge branch 'ent-3697-no-hay-opcion-a-ver-todos-los-grupos-con-permisos-correctos' into 'develop' 
Pending Q&A

See merge request artica/pandorafms!2262
 2019-06-25 12:06:07 +02:00
Daniel Rodriguez
ea7e4892c3 Merge branch 'ent-4064-7999-pandora-ha-eventserver-alertas-duplicadas' into 'develop' 
HA related fixes to the Recon Server.

See merge request artica/pandorafms!2529
 2019-06-25 10:36:16 +02:00
fbsanchez
a507d28c1f Update Aws agent names 2019-06-25 10:12:25 +02:00
Tatiana Llorente
ea9540ddce Changed size for modal window for module graph- #4234 2019-06-25 09:19:47 +02:00
artica
a469ff29da Auto-updated build strings. 2019-06-25 00:01:09 +02:00
fbsanchez
882aa67b3a aws multi account viewer rc1 2019-06-24 20:35:24 +02:00
fbsanchez
2a95fbb87a Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-24 19:58:33 +02:00
fbsanchez
180948c51c Import previous aws account 2019-06-24 19:36:50 +02:00
fbsanchez
381e30941d Merge branch 'ent-4244-hearbeat-designs-gif' into 'develop' 
new hearbeat designs

See merge request artica/pandorafms!2535
 2019-06-24 19:32:11 +02:00
fbsanchez
c24d7dbbda new hearbeat designs 2019-06-24 19:28:19 +02:00
fbsanchez
c1ac6b7ed6 mini_severity virtual column added 2019-06-24 19:23:41 +02:00
fbsanchez
c85965d793 SQLerror tasg reference 2019-06-24 19:05:46 +02:00
Daniel Maya
52f762bd5a Merge branch 'ent-4258-visual-console-movement-redimension-mode' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4258-visual-console-movement-redimension-mode 2019-06-24 18:52:58 +02:00
Daniel Maya
a96b2359ca Fixed getFillColor 2019-06-24 18:52:39 +02:00
fbsanchez
0ea8904e0a SQLerror tasg reference 2019-06-24 18:52:38 +02:00
fbsanchez
0ed382c42c SQLerror tasg reference 2019-06-24 18:48:44 +02:00
Alejandro Gallardo Escobar
31f63af6fa The color cloud vc element now maintain its aspect ratio when resized 2019-06-24 18:44:22 +02:00
Alejandro Gallardo Escobar
8339188824 Removed a debug trace 2019-06-24 18:40:57 +02:00
Alejandro Gallardo Escobar
48f4861141 The vc line item cannot be moved or resized now 2019-06-24 18:39:40 +02:00
Alejandro Gallardo Escobar
e268dfe319 Updated the bundle of the visual console client 2019-06-24 18:27:57 +02:00
Alejandro Gallardo Escobar
f8a0ee7442 Merge branch 'ent-4258-visual-console-movement-redimension-mode' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4258-visual-console-movement-redimension-mode 2019-06-24 18:27:06 +02:00
Daniel Maya
a06cc36713 Merge branch 'ent-4258-visual-console-movement-redimension-mode' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4258-visual-console-movement-redimension-mode 2019-06-24 18:24:53 +02:00
Daniel Maya
5ee9c6c536 Fixed encoded 2019-06-24 18:24:22 +02:00
Alejandro Gallardo Escobar
3409e321d3 Fixed the vc item redimension when it has a label 2019-06-24 18:24:21 +02:00
Alejandro Gallardo Escobar
bc84ad4e5e Fixed the vc item redimension when it has a label 2019-06-24 18:24:01 +02:00
Alejandro Gallardo Escobar
b6f10f89d0 Fixed missing styles 2019-06-24 17:57:45 +02:00
Alejandro Gallardo Escobar
83acaf3164 Updated the visual console client bundles 2019-06-24 17:25:36 +02:00
Alejandro Gallardo Escobar
94764bf92e Bugfixes 
(cherry picked from commit 3421f21cdf71447bf029028c138e203689aa38a2)
 2019-06-24 17:23:55 +02:00
Tatiana Llorente
13ecec40c2 Fixed visual bug in snmp browser - #4160 2019-06-24 17:08:21 +02:00
Ramon Novoa
3fe4256743 HA related fixes to the Recon Server. 2019-06-24 11:25:26 +02:00
Alejandro Gallardo Escobar
d9fee539a8 Merge branch 'develop' into 'ent-4258-visual-console-movement-redimension-mode' 
# Conflicts:
#   pandora_console/include/visual-console-client/vc.main.css
 2019-06-24 10:31:53 +02:00
Alejandro Gallardo Escobar
84f2129f5e Updated the visual console client bundles 2019-06-24 10:18:27 +02:00
fbsanchez
d6cb1bc207 minor fix in type check 2019-06-24 10:13:47 +02:00
fbsanchez
3616d6e871 Added get_lock/release_lock functions to functions_db 2019-06-24 10:00:16 +02:00
Alejandro Fraguas
ce1231eae6 Merge branch 'ent-3916-bulk-operation-alerts-no-entuentra-alertas' into 'develop' 
Added option in massive delete alerts to show alerts on disabled modules

See merge request artica/pandorafms!2396
 2019-06-24 09:55:44 +02:00
artica
c56f1dea9e Auto-updated build strings. 2019-06-24 00:01:06 +02:00
artica
3bd4743247 Auto-updated build strings. 2019-06-23 00:01:08 +02:00
fbsanchez
38f72bed8d AWS multi account 2019-06-22 13:11:35 +02:00
fbsanchez
c11cd556ce WIP: AWS CS controller 2019-06-22 01:10:05 +02:00
artica
0878af4ab1 Auto-updated build strings. 2019-06-22 00:01:08 +02:00
fbsanchez
5658b98f0b intuitive credential store 2019-06-21 23:51:22 +02:00
fbsanchez
e4f6a95a89 MR29 credential store 2019-06-21 23:05:21 +02:00
fbsanchez
e9ef9b64a3 credential_store 2019-06-21 19:34:47 +02:00
Alejandro Gallardo Escobar
9076e9f2d8 Improved the vc items movement 2019-06-21 14:16:19 +02:00
Daniel Maya
8f5a206027 Fixed vc-control in public visual console 2019-06-21 13:17:37 +02:00
Daniel Maya
379a0039ae Fixed vc-control 2019-06-21 12:41:05 +02:00
fbsanchez
6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
artica
e2e53cf248 Auto-updated build strings. 2019-06-21 00:01:08 +02:00