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

21694 Commits

Author SHA1 Message Date
Daniel Rodriguez 61e07abf3a Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop' 
Ent 4238 eventos csv e historico

See merge request artica/pandorafms!2515
 2019-06-25 18:33:49 +02:00
Daniel Rodriguez 35c914dc34 Merge branch 'ent-4181-7962-LDAP-no-parsea-Advanced-Permissions-LDAP' into 'develop' 
Fixed Advanced Permissions LDAP

See merge request artica/pandorafms!2521
 2019-06-25 18:21:42 +02:00
fbsanchez e1bf12a1fb Credential store 2019-06-25 18:21:23 +02:00
fbsanchez 8f914b69a6 Minor fixes 2019-06-25 17:24:16 +02:00
fbsanchez 22d936d4f3 credential store some js controls 2019-06-25 16:43:38 +02:00
fbsanchez 96ca26dc97 minor fix in event mass response process 2019-06-25 16:05:56 +02:00
Daniel Rodriguez 6af895b9c1 Merge branch 'ent-3999-No-se-ve-icono-SO-en-eventos-en-metaconsola' into 'develop' 
Added meta option in function ui_print_os_icon - #3999

See merge request artica/pandorafms!2502
 2019-06-25 16:04:51 +02:00
Daniel Maya ae4a9dc324 Fixed uninitialized value in pattern match 2019-06-25 15:33:19 +02:00
fbsanchez 4ec8299b0c Merge branch 'fix/alert-color' into 'ent-4238-eventos-csv-e-historico' 
Fix/alert color

See merge request artica/pandorafms!2541
 2019-06-25 15:31:44 +02:00
fbsanchez c5675ded4c fixed alert color 2019-06-25 15:24:42 +02:00
fbsanchez 004eb11048 MR29 2019-06-25 15:24:15 +02:00
Daniel Rodriguez 10aa0631af Merge branch 'ent-4208-Ayuda-vacia-modulos-unknown' into 'develop' 
Removed empty help in unknown modules - #4208

See merge request artica/pandorafms!2499
 2019-06-25 14:47:20 +02:00
Daniel Rodriguez b18de5cb1c Merge branch 'ent-4160-Fallo-visual-SNMP-browser' into 'develop' 
Fixed visual bug in snmp browser - #4160

See merge request artica/pandorafms!2531
 2019-06-25 14:46:25 +02:00
Daniel Rodriguez 01514ba5b6 Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop' 
Ent 3699 descuadre visual recuperar password

See merge request artica/pandorafms!2336
 2019-06-25 14:26:57 +02:00
Daniel Rodriguez 63eca254f6 Merge branch 'ent-3888-cambio-titulo-plugin-creation' into 'develop' 
changed title plugin creation to plugin registration

See merge request artica/pandorafms!2358
 2019-06-25 14:25:34 +02:00
fbsanchez 1966c81f2d Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-25 14:10:32 +02:00
Jose Gonzalez afd72eff42 Changed variable that modify min values 2019-06-25 13:37:44 +02:00
Daniel Rodriguez a3d0e3b55d Merge branch 'ent-4040-menu-resources-no-esta-resaltado-en-vista-de-agente' into 'develop' 
Condition is added to keep the selection color in the main menu

See merge request artica/pandorafms!2464
 2019-06-25 13:10:15 +02:00
Daniel Rodriguez 2ab7e26d07 Merge branch 'ent-3821-Option-servers-operator-read' into 'develop' 
Deleted Servers menu option for operator(read)

See merge request artica/pandorafms!2328
 2019-06-25 13:09:23 +02:00
fbsanchez 674c68bd2b avoided issue latin1 btoa javascript event transfer 2019-06-25 12:49:17 +02:00
fbsanchez 86600ca454 RSS menu filter loaded 2019-06-25 12:21:18 +02:00
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