fbsanchez
|
f16f35ad10
|
Changes styles
|
2019-05-29 17:49:09 +02:00 |
manuel
|
ada49966e0
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
|
2019-05-21 10:05:06 +02:00 |
Daniel Maya
|
b508e40a73
|
Changed simple quote in alerts
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
|
2019-05-14 11:11:27 +02:00 |
|
manuel
|
20dace7de8
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
|
2019-05-13 16:20:12 +02:00 |
Daniel Barbero Martin
|
99f5cab83d
|
fixed filemanager
|
2019-05-08 10:55:20 +02:00 |
|
manuel
|
f5759abcad
|
Merge branch 'develop' into ent-3468-Ayudas_online
|
2019-05-08 09:35:32 +02:00 |
|
manuel
|
6bd8221bc0
|
changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
|
2019-04-29 14:36:02 +02:00 |
marcos.alconada
|
2bafba0764
|
Se añade el contenido del fichero borrado
Former-commit-id: 9d2e8a9d873bd70549bf4bb1a6a9f7318dc4f36a
|
2019-04-23 17:40:49 +02:00 |
|
marcos.alconada
|
fb87b97cd4
|
Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
|
2019-04-17 15:12:56 +02:00 |
|
Marcos Alconada
|
8c27411be6
|
Delete plugin.php
Former-commit-id: c37a85bcf4082a148e72cdc9b1a166a70ec94537
|
2019-04-15 15:18:22 +02:00 |
|
marcos.alconada
|
a3787c687c
|
prueba
Former-commit-id: 61d4bc20b7811c44125b806f960561eb40412818
|
2019-04-15 15:10:43 +02:00 |
Tatiana Llorente
|
f497d3bd2e
|
Added class to action buttons and moved checkbox to the left side
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
|
2019-04-02 13:42:30 +02:00 |
|
Tatiana Llorente
|
26451c41a1
|
New design for the tables - #3707
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
|
2019-03-29 11:05:52 +01:00 |
|
Tatiana Llorente
|
34598f391b
|
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
|
2019-03-27 17:05:50 +01:00 |
|
Tatiana Llorente
|
845cb85c55
|
New design for tables - #3707
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
|
2019-03-27 17:03:55 +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
|
ec999341ba
|
change discovery headers and add breadcrumbs to them
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
|
2019-03-26 15:42:33 +01:00 |
|
fbsanchez
|
05c03d2d46
|
NetworkMap class
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
|
2019-03-20 17:22:06 +01:00 |
|
daniel
|
15ca89068d
|
Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
Conflicts:
pandora_console/godmode/servers/manage_recontask_form.php
pandora_console/include/functions_events.php
Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
|
2019-03-12 13:07:12 +01:00 |
|
daniel
|
560c6090a4
|
deprecated files
Former-commit-id: e5c9fb8f58ee78207514d045b478f5d534d86f89
|
2019-03-07 11:13:44 +01:00 |
|
daniel
|
db150470cb
|
fixed errors in custom net scan
Former-commit-id: 15243259cbffa8c639e6412866349357753e1198
|
2019-03-07 11:09:28 +01:00 |
|
fbsanchez
|
63ee3b0329
|
wip: style checks
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
|
2019-03-05 19:02:23 +01:00 |
Daniel Rodriguez
|
e18eaaf415
|
Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop'
Ent 3287 sincronizacion plugin de servidor
See merge request artica/pandorafms!2199
Former-commit-id: 2153828c0deb35bd72dd6b39612c947b56782c40
|
2019-02-27 09:58:42 +01:00 |
|
Daniel Maya
|
2c0c050507
|
Disabled cache in server plugin synchronization
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
|
2019-02-26 17:20:23 +01:00 |
|
Daniel Maya
|
45419fbfb0
|
Fixed href in plugins with centralized node
Former-commit-id: 03fa2c15b7a9fb14cdc12499c3bc2a204bae3cd5
|
2019-02-26 12:23:46 +01:00 |
|
fbsanchez
|
cdca720d9a
|
minor fix user_edig
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
|
2019-02-25 14:41:27 +01:00 |
|
daniel
|
504a8e9d1a
|
fixed warnings php
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
|
2019-02-25 13:02:39 +01:00 |
|
fbsanchez
|
797f922748
|
Discovery Tasklist minor fixes
Former-commit-id: 693f181168f74f93ad9a3ce628d0defd9ef72d02
|
2019-02-23 12:13:54 +01:00 |
|
Daniel Maya
|
12b8042c53
|
Added server plugins in meta
Former-commit-id: 7f69f55c3fad06c7b15408d755d088d5ac89b111
|
2019-02-22 14:26:58 +01:00 |
|
fbsanchez
|
64679ee72e
|
discovery minor fixes
Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8
|
2019-02-21 18:00:50 +01:00 |
|
manuel
|
ad3e2b88bf
|
Minor fixes Wiz.Discovery
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
|
2019-02-21 11:19:38 +01:00 |
|
fermin831
|
0ed6c6d620
|
Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
|
2019-02-20 16:54:52 +01:00 |
|
fbsanchez
|
1b82a970b1
|
WIP: App wiz
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
|
2019-02-19 14:36:16 +01:00 |
|
fermin831
|
cb94692491
|
Added function addBreadcrum in Wizard main
Former-commit-id: ac40c2fd49ff02a84dc6752c4ea99309a3d4440f
|
2019-02-18 14:30:03 +01:00 |
|
fermin831
|
a6bbd17423
|
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
Former-commit-id: 11a9f65a87b0b479791aa76e4936cebfb5ab7424
|
2019-02-18 10:24:35 +01:00 |
|
fermin831
|
a9caebbbf4
|
Put the list into a function
Former-commit-id: 11e4d0faa3512e46582530f48bab2cfa1031e89f
|
2019-02-18 10:24:19 +01:00 |
|
fermin831
|
2332001884
|
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
Conflicts:
pandora_console/godmode/servers/discovery.php
Former-commit-id: 4e840a1738523e2e0570413e8e7dedb02b265919
|
2019-02-18 08:50:54 +01:00 |
|
fbsanchez
|
5093094d7d
|
H&D tasklist and some visual changes
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
|
2019-02-15 18:05:59 +01:00 |
|
manuel
|
e04a61df98
|
Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices
Former-commit-id: 1744720e44aea863fb01c328cb2d25382d2c40a8
|
2019-02-15 14:03:29 +01:00 |
|
manuel
|
32d34cd09b
|
Changed styles in host and devices
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
|
2019-02-15 14:02:32 +01:00 |
|
fbsanchez
|
ec672d6bfb
|
H&D network scan
Former-commit-id: dcd22994d6addf69ab5d68a6724d12e26e994d15
|
2019-02-15 13:57:33 +01:00 |
|
Fermin
|
6c485795c7
|
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
Former-commit-id: adb71ba49b8d3e6081aaa8c91af8c42e7c18c689
|
2019-02-15 13:48:08 +01:00 |
|
Fermin
|
c9c855da9a
|
Added new Cloud Wizard class
Former-commit-id: 789af2b6cba344bac44b34c4c90228801f2468a0
|
2019-02-15 13:47:11 +01:00 |
|
fbsanchez
|
efdc17b801
|
WIP: H&D
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
|
2019-02-15 13:08:44 +01:00 |
|
fbsanchez
|
f777c59a83
|
WIP: H&D skel files css wiz&discov
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
|
2019-02-15 10:00:23 +01:00 |
|
fbsanchez
|
8acb658266
|
WIP: H&D
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
|
2019-02-14 13:27:49 +01:00 |
|
fbsanchez
|
6ff357595d
|
Merge remote-tracking branch 'refs/remotes/origin/ent-3431-discovery-host-devices' into ent-3431-discovery-host-devices
Former-commit-id: 8210f6bb9abb2c666b6cf4e914d87bb92e8b0690
|
2019-02-14 10:58:26 +01:00 |
|
fermin831
|
57991495e4
|
Use the CSV extension to import CSV on host and devices
Former-commit-id: ed95b09992ee681e35e7f934b8a8ac70c83bc8be
|
2019-02-14 10:30:01 +01:00 |
|
fbsanchez
|
ed63ef47fa
|
Moved ReconServer to DiscoveryServer
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
|
2019-02-13 14:56:10 +01:00 |
|
manuel
|
27da41c7da
|
WIP Host&devices
Former-commit-id: cc18e55a30f72c606bb5b5736a5fa771987e0a45
|
2019-02-12 14:39:01 +01:00 |