072fec3dd1
removed map link from mysql/oracle/RDS discovery tasks
...
Former-commit-id: c01ca25dbe4ca16265a6377d80f60f6d603b7664
2019-04-15 13:03:11 +02:00
6648e0268a
removed reconview link from menu
...
Former-commit-id: 41b80e4eaa41617982c91a218aee3902b76e4fde
2019-04-15 12:54:22 +02:00
f3590e1d54
Merge branch 'ent-3792_spec_console_enterprise_for_rhel7' into 'develop'
...
fixed minor bug in the open spec
See merge request artica/pandorafms!2356
Former-commit-id: e5a73f169ba8044a94b25b27d99cf384785221e5
2019-04-15 11:33:42 +02:00
3e15b77095
Merge branch 'ent-3790-sobra-una-columna-de-tnetflow_filter' into 'develop'
...
Ent 3790 sobra una columna de tnetflow filter
See merge request artica/pandorafms!2313
Former-commit-id: 31e8399658450e3f0ac4bd591f7eee631b3ba937
2019-04-15 11:22:28 +02:00
eca7f6e53a
fixed minor bug in the open spec
...
Former-commit-id: 0d8aacf0d4e7ae6199d103e62b6a6a8891c3a0f2
2019-04-15 11:20:57 +02:00
d3d5312f40
Update 27.sql
...
Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d
2019-04-15 11:14:41 +02:00
68258661b1
Auto-updated build strings.
...
Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
2019-04-15 00:01:24 +02:00
d0f6726d00
Auto-updated build strings.
...
Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
2019-04-14 00:01:23 +02:00
ef0f7cded8
Auto-updated build strings.
...
Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
2019-04-13 00:01:31 +02:00
8bdc980ab0
minor fix
...
Former-commit-id: 4222b217953e88da43d0f50d3217a065dbb13332
2019-04-12 23:47:21 +02:00
5d176bb61f
Merge branch 'ent-3792-spec_console_enterprise_for_rhel7' into 'develop'
...
spec console open and build_rpm for rhel7
See merge request artica/pandorafms!2355
Former-commit-id: d40cbedb10b628adc8c710c2b37d0eaf64657af6
2019-04-12 19:24:54 +02:00
45c9f6d51c
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 4c13aa9288330584db108ab04fd9ac096b2714ce
2019-04-12 19:24:27 +02:00
fa6529b652
Merge remote-tracking branch 'origin/develop' into ent-3792-spec_console_enterprise_for_rhel7
...
Former-commit-id: 8c7e1f5f4aad250e01931a420f8da8819817152f
2019-04-12 19:18:15 +02:00
6a9c972ed6
Changed popup no access - #3625
...
Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
2019-04-12 13:54:48 +02:00
15cd02a49b
fix v1
...
Former-commit-id: f217f78e8085a81df68b9899513e547e148fca0d
2019-04-12 13:45:13 +02:00
9da83faade
Merge branch 'ent-3806-Nuevo_mapa_Edicion_usuario' into 'develop'
...
add map user edit
See merge request artica/pandorafms!2349
Former-commit-id: 921eb0faff704e17f26024ab2add32f53e151df7
2019-04-12 13:11:27 +02:00
a792128906
Merge branch 'ent-3522-Conservar-perfiles-de-usuarios-standard-en-caso-de-cambio-LDAP/AD' into 'develop'
...
Added token save profile user
See merge request artica/pandorafms!2343
Former-commit-id: f6558be197626904837589df0a7559df60b2ef3e
2019-04-12 12:53:20 +02:00
b50ed1c810
New arrow and timestamp images - #3707
...
Former-commit-id: 908928e47d7e635eee1e18925b176835f8e9c928
2019-04-12 10:41:55 +02:00
1b5786aedb
Merge remote-tracking branch 'origin/develop' into ent-3790-sobra-una-columna-de-tnetflow_filter
...
Former-commit-id: 652770c2bad08caef82584fc440736ee36abd03d
2019-04-12 10:32:07 +02:00
26d5060232
fixed errors css
...
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
61552bc201
Fixed ldap login
...
Former-commit-id: bd94a6112a88b3143973ab7f915de40995149ca8
2019-04-12 10:03:18 +02:00
59c2734b5a
Deleted old files. Centered the map. Fixed broken image in meta. - #3806
...
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
2019-04-12 09:20:55 +02:00
f5088299f3
Auto-updated build strings.
...
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
2019-04-12 00:01:24 +02:00
e80649073f
Minor fixes
...
Former-commit-id: 71698d61db59e7f94fb8c770715decb0fe6e5f0f
2019-04-11 15:36:55 +02:00
342e4b78c9
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
2019-04-11 15:12:46 +02:00
e998c8dd70
Discovery RDS
...
Former-commit-id: e03d600b06fec25fb5808b9425cc94832d9d1268
2019-04-11 15:05:03 +02:00
c91893c948
spec console open and build_rpm for rhel7
...
Former-commit-id: 324d90d95ea5757285e64ba3e28346ef007a815f
2019-04-11 13:45:57 +02:00
c33a2cfaf6
Change arrow images to sort the table in custom reports - #3707
...
Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
2019-04-11 10:26:26 +02:00
187bdb1701
New design for the tables - #3707
...
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
2019-04-11 09:57:07 +02:00
29e1fc828c
Auto-updated build strings.
...
Former-commit-id: 180188c01ab9644d5672f1b984a1454402acc1cd
2019-04-11 00:01:30 +02:00
2af9cbb711
Discovery RDS Bypass perl thread ENV limitation
...
Former-commit-id: 34ca5374e66c174887683077ba5efcae5412b9bb
2019-04-10 23:16:18 +02:00
834d5d6c50
WIP:Discovery RDS
...
Former-commit-id: d53eb29ec8e7c70c1c76918c1770f65ad81f8ba0
2019-04-10 20:40:03 +02:00
0f78d87504
Fixed bug in save profile users
...
Former-commit-id: 8f79e2c3de0e7cedb581d90e53f39ef176afe040
2019-04-10 16:12:22 +02:00
4ab7f2c56f
Merge branch 'ent-3791-7780-cron-en-modulos-no-funcionan-bien' into 'develop'
...
Ent 3791 7780 cron en modulos no funcionan bien
See merge request artica/pandorafms!2337
Former-commit-id: 2d7e13817fee6c23d271405d48198ab069357e2b
2019-04-10 10:20:35 +02:00
fd7cbf14cd
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 91bbd1dac954b151482546b3a75065ab80f19687
2019-04-10 10:15:15 +02:00
30c5f2b243
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' of brutus.artica.lan:artica/pandorafms into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 77343765f8b254939406fc320fc64dce86672b6f
2019-04-10 10:09:21 +02:00
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
765ca945a0
Auto-updated build strings.
...
Former-commit-id: d69449b4f4ca214bdd3e37e660e0c8d7f0dc9817
2019-04-10 00:01:25 +02:00
e59ce5412c
WIP Discovery RDS
...
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
2019-04-09 18:33:02 +02:00
0769c61b19
add map user edit
...
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
2019-04-09 18:18:10 +02:00
1efedd26ce
Fixed bug in LDAP authentication
...
Former-commit-id: 4e0b2d46d5bcd71ea63e9d09e7c0d8865735227f
2019-04-09 13:39:30 +02:00
5494a6129f
Merge branch 'ent-3855-Problemas_grupos_secundarios_en_input_auto_completado_de_modulos' into 'develop'
...
fixed error autocomplete input module
See merge request artica/pandorafms!2345
Former-commit-id: 76a7c4aa1d611a21b307d0d6367a1f15dc40b323
2019-04-09 13:14:38 +02:00
c313629080
Merge branch 'ent-3445-Solucionar_problematica_flip_flop' into 'develop'
...
flip flop keep counters
See merge request artica/pandorafms!2308
Former-commit-id: b3da4d57bb1c122e1a6040c9b4d35bc7c171043e
2019-04-09 12:04:54 +02:00
351b7218ee
Merge branch 'ent-3683-entities-appear-on-event-comment-api-call' into 'develop'
...
Removed unnecesary io_safe_inpunt on from functions_api.php
See merge request artica/pandorafms!2256
Former-commit-id: 870cdc2ea85241945628ac4a41864a0d54a57bea
2019-04-09 11:19:10 +02:00
6585a4736b
fixed minor error local companent with keep counters
...
Former-commit-id: f9864be72f448885b2da118585f1bbb92319bd18
2019-04-09 10:19:51 +02:00
8404450458
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Former-commit-id: 2809d31ae616b11dc1a210415ecb1c54e201fada
2019-04-09 09:53:31 +02:00
3e4a7bfdbf
fixed error autocomplete input module
...
Former-commit-id: c9fca2ba51b3b0872d39e658f18c5d3c5e917dbd
2019-04-09 09:51:03 +02:00
0d05d5c842
Auto-updated build strings.
...
Former-commit-id: dc883b86ccb845e022637413e334d4886805bc6b
2019-04-09 00:01:31 +02:00
d5b1ac5565
fixed map IPAM
...
Former-commit-id: a1334a1691a3e861f2510ac7d440f5730928ad9a
2019-04-08 18:28:27 +02:00
79bd37ee5b
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7
2019-04-08 16:28:26 +02:00
fbsanchez
vgilc
Daniel Rodriguez
Rafael Ameijeiras
Marcos Alconada
artica
Tatiana Llorente
Daniel Barbero Martin
manuel
Alejandro Fraguas