fbsanchez
|
4c0263206e
|
WIP: Networkmap & recon improvements
Former-commit-id: 25e6fb140f4cf52e919eed941b6659ed377ac26c
|
2019-03-05 16:12:29 +01:00 |
Daniel Maya
|
e26c81aa6c
|
Fixed images and reset map in networkmap
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
|
2019-03-05 15:33:27 +01:00 |
alejandro-campos
|
9d29af2af5
|
add new field for table treport_content
Former-commit-id: f8cc4544e68a1369a1b0a34b82a506430b3503b8
|
2019-03-05 15:15:48 +01:00 |
|
alejandro-campos
|
da0f0b492a
|
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: dbfc5603652eacc4214e6503b5603bd79f834984
|
2019-03-05 15:06:18 +01:00 |
|
alejandro-campos
|
09897591c3
|
Add extended events to event reporting tables
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
|
2019-03-05 15:03:05 +01:00 |
|
fbsanchez
|
054bc070f7
|
WIP review netmaps
Former-commit-id: 167c0fa7aacf7b3e916e9572faf43e32eee116dc
|
2019-03-05 13:19:03 +01:00 |
|
fbsanchez
|
d89e3993e7
|
WIP first tasks
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
|
2019-03-04 20:02:35 +01:00 |
|
fbsanchez
|
ab453fde68
|
WIP: event extended reports
Former-commit-id: ad01e92854f766c1a1f35103807b8974c90720a2
|
2019-03-04 19:06:15 +01:00 |
|
fbsanchez
|
92974c71d9
|
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: d6708f1ea30390850ca133f8bd474e177863b016
|
2019-03-04 16:43:55 +01:00 |
|
fbsanchez
|
756fdd2cd4
|
minor fix in supervisor - server status global counter
Former-commit-id: f34daeb57a442b7f3b299e3d72d40317b0e9e0c0
|
2019-03-04 16:43:48 +01:00 |
|
Daniel Maya
|
1f1c9de887
|
changes in default values in networkmap
Former-commit-id: 650abcc24fc19e565b9737e80e602f7188114148
|
2019-03-04 15:31:07 +01:00 |
|
fbsanchez
|
f557d09529
|
discoveryserver change default value (server) and minor fix in subst_column_macros
Former-commit-id: ff22af353cf794ae0600a23d61fd30256193d463
|
2019-03-04 15:01:50 +01:00 |
|
fbsanchez
|
9fd391a819
|
Make always basic checks while browsing pandora
Former-commit-id: db93bfdaa674cd2d632153825c37a8a41152dc2c
|
2019-03-04 14:57:57 +01:00 |
|
fbsanchez
|
5e496d0d7a
|
Fixed url target in Supervisor
Former-commit-id: 4e69ec7a157d8bceb3cbfc88c52a886a4353dc0e
|
2019-03-04 14:52:57 +01:00 |
|
fbsanchez
|
41138fbfbb
|
discovery tasks assimilate cron
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
|
2019-03-01 15:26:05 +01:00 |
|
fbsanchez
|
adb25e91f8
|
Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
Former-commit-id: 157ed627078c5e6cfedd6ed9d509a339cdb01632
|
2019-03-01 11:09:11 +01:00 |
|
fbsanchez
|
b4170ca285
|
minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references
Former-commit-id: 46be3614b9aeb9837748149a805427d68a07f566
|
2019-03-01 11:08:49 +01:00 |
|
fbsanchez
|
d547024274
|
fixes non-enterprise components
Former-commit-id: c22cec27d981c119531a0049469847b9d1a848eb
|
2019-03-01 09:51:16 +01:00 |
|
fbsanchez
|
ed9b736299
|
Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
Former-commit-id: 9dcad6195eb21f84d90b570828791338ff069ddd
|
2019-03-01 09:50:09 +01:00 |
artica
|
8fc432b934
|
Auto-updated build strings.
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
|
2019-03-01 00:01:32 +01:00 |
Daniel Rodriguez
|
927ad30966
|
Merge branch 'ent-3594-Unificacion-de-tamaños-de-checkbox-switch' into 'develop'
Unified sizes of the checkbox switch
See merge request artica/pandorafms!2198
Former-commit-id: 9305bc60fd8b4815f6bbb2ece58dfcdd72e1ad70
|
2019-02-28 13:58:07 +01:00 |
manuel
|
46089b31a8
|
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/install.php
Former-commit-id: 3dee86da8f6b6b1c2caa5e6e1529acd7f60c1433
|
2019-02-28 13:36:18 +01:00 |
|
alejandro-campos
|
52d6dfe815
|
fix discover task view
Former-commit-id: 5475d6be802cd4e7280d12aed6f8f91f7833ed98
|
2019-02-28 12:00:43 +01:00 |
|
artica
|
a8a9a9d620
|
Auto-updated build strings.
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
|
2019-02-28 00:01:32 +01:00 |
|
fbsanchez
|
715bdbb04d
|
Merge branch 'fix/fraguas' into 'develop'
minor fixes
See merge request artica/pandorafms!2216
Former-commit-id: 856ba09c711fa9199e06518c42a05e4ae942b938
|
2019-02-27 14:04:54 +01:00 |
|
fbsanchez
|
f979af0735
|
minor fixes
Former-commit-id: 51a2308e80a85c5a099410c5883c9b389d3a74ab
|
2019-02-27 13:56:06 +01:00 |
|
fbsanchez
|
f8553b91e8
|
Merge branch 'fix/clippy' into 'develop'
clippy returns
See merge request artica/pandorafms!2215
Former-commit-id: 92fc5c2a79199fbd1b102edb0abad866eae1ab26
|
2019-02-27 13:45:40 +01:00 |
|
fbsanchez
|
ec5c9d7c27
|
clippy returns
Former-commit-id: b9ed010f5af1002593471a0d0298848b3593e41e
|
2019-02-27 13:41:26 +01:00 |
daniel
|
a718539919
|
Merge branch 'ent-change_mr_25' into 'develop'
change mr
See merge request artica/pandorafms!2213
Former-commit-id: 2500d4869601e900ec9f7437a9691cae38b76853
|
2019-02-27 11:41:44 +01:00 |
|
daniel
|
e55e47cbfa
|
change mr
Former-commit-id: 4ec37be9caef34e88b3e5ca65bca2c1aee7f03dd
|
2019-02-27 11:35:00 +01:00 |
artica
|
26560c734c
|
Updated version and build strings.
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
|
2019-02-27 11:25:50 +01:00 |
samucarc
|
9f92f3f010
|
Fixed
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
|
2019-02-27 10:35:40 +01:00 |
|
samucarc
|
8f24c0cb18
|
Fixed conflict in CLI apply_policy
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
|
2019-02-27 10:28:36 +01:00 |
Alejandro Fraguas
|
75b889ff4a
|
Merge branch 'ent-3430-proyecto-discovery' into 'develop'
Ent 3430 proyecto discovery
See merge request artica/pandorafms!2210
Former-commit-id: 104df0b898d6f4bb9eef21005cca6a3f74c3e035
|
2019-02-27 10:02:14 +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 |
|
artica
|
65b89f6688
|
Auto-updated build strings.
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
|
2019-02-27 00:01:47 +01:00 |
|
fbsanchez
|
7ed3252ca5
|
minor fixes
Former-commit-id: 75b33343bed508ff3ff136fa0fedc5d9d8c952be
|
2019-02-26 20:23:52 +01:00 |
|
fbsanchez
|
24a1adfb9f
|
minor fix
Former-commit-id: 6729d11217d0fecb7b64283b6e4d0485b9bdfdc8
|
2019-02-26 20:08:01 +01:00 |
|
fbsanchez
|
a8874f9b1b
|
Minor fixes
Former-commit-id: c3abb9964c61f0535ab59644f6eb1d0a8328212a
|
2019-02-26 20:00:41 +01:00 |
|
Daniel Rodriguez
|
33235b26d3
|
Merge branch '3597-Pequeno_arreglo_config_732' into 'develop'
fix minor error
See merge request artica/pandorafms!2202
Former-commit-id: fded71effc82a3ffde4d3a003f6f090f9e8e4b9f
|
2019-02-26 18:19:58 +01:00 |
|
fbsanchez
|
0e7c498e1a
|
Comment updates
Former-commit-id: a711916af981c065d26def1943fc526d936de5d3
|
2019-02-26 17:53:58 +01:00 |
|
fbsanchez
|
5382f07ae2
|
Comment updates in wizard class
Former-commit-id: 9fbb1d0c6499dd1ad71c472970b3993193b581da
|
2019-02-26 17:42:12 +01:00 |
|
fbsanchez
|
5b3ce09515
|
Comment updates in wizard class
Former-commit-id: 0b820729a631d906fe4816ba74f84f700b500c01
|
2019-02-26 17:41:42 +01:00 |
|
Daniel Maya
|
2c0c050507
|
Disabled cache in server plugin synchronization
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
|
2019-02-26 17:20:23 +01:00 |
|
Alejandro Fraguas
|
d177bda2bd
|
Merge branch 'ent-3520-7484-Autenticación-por-ldap-no-contempla-la-posibilidad-de-ldaps' into 'develop'
Parameter changes deprecated in LDAP
See merge request artica/pandorafms!2168
Former-commit-id: 8cccefd16b2fab4134ddd397b45094936155ceea
|
2019-02-26 16:57:25 +01:00 |
|
Alejandro Fraguas
|
441fb979e1
|
Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
Ent 3210 nueva vista de servicios
See merge request artica/pandorafms!2195
Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
|
2019-02-26 16:32:34 +01:00 |
|
alejandro-campos
|
7791639b35
|
fix bad image routes
Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3
|
2019-02-26 13:31:35 +01:00 |
|
fbsanchez
|
9f60d824c5
|
Merge branch 'ent-3430-last-updates' into 'develop'
Updated breadcrum
See merge request artica/pandorafms!2203
Former-commit-id: f4497ff71f61bcb47c106bd2db13648ecc0f32b2
|
2019-02-26 12:40:16 +01:00 |
|
manuel
|
c886dd1dfa
|
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
|
2019-02-26 12:31:37 +01:00 |
|
Daniel Maya
|
45419fbfb0
|
Fixed href in plugins with centralized node
Former-commit-id: 03fa2c15b7a9fb14cdc12499c3bc2a204bae3cd5
|
2019-02-26 12:23:46 +01:00 |