91 Commits

Author SHA1 Message Date
Jonathan
da2bef45f2 #12695 wip removing warnings 2024-02-13 17:06:48 +01:00
Daniel Cebrian
f68615cba0 #12460 fixed deprecated 2024-01-30 17:00:38 +01:00
Daniel Cebrian
d504267460 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-22 15:18:01 +01:00
Daniel Cebrian
bb2d908de7 #12460 fixed deprecated log 2024-01-17 12:25:57 +01:00
Daniel Maya
0ac20717f1 #12200 resolved conflict 2023-12-18 13:15:42 +01:00
alejandro.campos@artica.es
60137eb300 changes in discovery extensions 2023-12-05 11:32:19 +01:00
Jorge Rincon
ed9b70725d #11843 Added word legacy in the discovery. It is added only for version 1.0 of discovery. 2023-08-09 14:40:56 +02:00
miguel angel rasteu
db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu
1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu
64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu
933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
daniel
5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Jose Gonzalez
36308b1be0 Minor visual fixes 2023-02-14 16:41:24 +01:00
jose.gonzalez@pandorafms.com
195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
fbsanchez
b17d6349f7 Multiple fixes port defition 2021-02-09 13:44:21 +01:00
fbsanchez
186b807ff7 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery
Conflicts:
	pandora_console/include/styles/wizard.css
2021-01-07 10:50:57 +01:00
fbsanchez
54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez
11dbe46a96 Allowed toggled rows 2020-06-08 15:23:09 +02:00
fbsanchez
acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
fbsanchez
f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
fbsanchez
f0a71e01de minor fixes 2020-03-11 13:35:31 +01:00
fbsanchez
5423e78d62 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/godmode/wizards/Wizard.main.php
	pandora_console/include/functions_agents.php
	pandora_console/include/styles/alert.css
	pandora_console/pandoradb.sql
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2019-11-22 15:49:07 +01:00
daniel
960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez
624a1e0086 WIP alert correlation 2019-11-20 18:17:43 +01:00
fbsanchez
0d3817d64d dynamic toggle in wizard input printForm 2019-11-14 17:45:45 +01:00
fbsanchez
d1fbd36a97 WIP omnishell 2019-11-12 19:31:38 +01:00
marcos
a31e66a9bd add feedback 2019-10-15 12:16:50 +02:00
fbsanchez
d09c071684 discovery ACL 2019-10-09 15:45:02 +02:00
fbsanchez
3bbd01026e WIP agent deployment 2019-07-15 19:37:04 +02:00
fbsanchez
9fb32c4699 Deployment area single targets 2019-07-12 18:29:58 +02:00
fbsanchez
1e05f9a396 WIP agent deployment 2019-07-11 19:25:49 +02:00
fbsanchez
7c8cb75faf WIP discovery agent deployment 2019-07-11 13:25:29 +02:00
fbsanchez
47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
fbsanchez
c11cd556ce WIP: AWS CS controller 2019-06-22 01:10:05 +02:00
Tatiana Llorente
af62bb1ae3 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:47:53 +02:00
Tatiana Llorente
7d54a37e13 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:44:09 +02:00
fbsanchez
f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
fbsanchez
7347324601 Minor fixes - discovery styles 2019-05-27 13:19:08 +02:00
alejandro-campos
0046e209fe lint changes 2019-05-17 14:46:19 +02:00
alejandro-campos
a0b7164d9f lint changes 2019-05-17 14:20:01 +02:00
alejandro-campos
13b32003b3 save changes ticket 3937
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
marcos.alconada
e543b64833 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
Daniel Rodriguez
50e994e065 Merge branch 'ent-bug-conflicto-con-simple-selects-con-atributo-size' into 'develop'
change way to print discovery simple multiple inputs

See merge request artica/pandorafms!2378

Former-commit-id: a4de7318635a68d1c9c1343b3674a93581d5ce23
2019-04-24 13:55:02 +02:00
alejandro-campos
7433d52130 change way to print discovery simple multiple inputs
Former-commit-id: 845171053b2002d036f0f8992a2aacad4ec0a561
2019-04-24 12:32:33 +02:00
Alejandro Fraguas
194f4400f7 Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
Ent 3647 revision estilos discovery con la nueva linea de estilos

See merge request artica/pandorafms!2370

Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
alejandro-campos
4f6a81dc5b visual changes to discovery
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
fbsanchez
ca05867e55 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 3b243ec4bd93ba4cb494f0ea1a53043cc8e890c6
2019-04-22 13:23:58 +02:00
fbsanchez
e9af2b6a1e Breadcrum fix do not rollback...
Former-commit-id: af2a9520e71da6a3287dc8c462a3dea5c72ba602
2019-04-22 10:45:07 +02:00
fbsanchez
e59ce5412c WIP Discovery RDS
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
2019-04-09 18:33:02 +02:00