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
021fc1dbfd
Fixed bug in unlinked modules
...
Former-commit-id: 08279c7f8605b54ae7ecaba32cc7d3c501b3ad5f
2019-04-09 10:46:37 +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
48e9c1466b
Visual Console Refactor: fixed some linter errors
...
Former-commit-id: 728223630dc81243e37057657428646b7f03dc78
2019-04-08 17:16:05 +02:00
86c5ead4e9
Visual Console Refactor: refactored the donut graph model
...
Former-commit-id: a0dd9abb1473c2f74956509b21e879aea44ce1e2
2019-04-08 17:02:51 +02:00
0f2b840a8f
Visual Console Refactor: added the lines between items
...
Former-commit-id: e413457a24e66566b8c649ab2ae8074c6828fd6d
2019-04-08 16:38:02 +02:00
db7eda7d3e
Visual Console Refactor: error fixes
...
Former-commit-id: 6b2d7cfb554e72223b101e2d3530c7dbe4acd69a
2019-04-08 16:37:29 +02:00
f79af1c70e
Visual Console Refactor: added a remove event and fixed the zindex
...
Former-commit-id: 60f74e2b509879ac3e31f3254328d2c2de145a31
2019-04-08 16:36:58 +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
54bd3bf089
Discovery F3
...
Former-commit-id: 1990149c5f5795f825bc337fd7ae29d360348d45
2019-04-08 16:23:32 +02:00
cb2be4cd6f
Added DonutGraph
...
Former-commit-id: 09b54770531c96a6f5c504f06caaefc10463bba9
2019-04-08 16:21:26 +02:00
b3bcc888df
Visual Console Refactor: now the item size can be omitted
...
Former-commit-id: 952e2f44613528fc91e85c8e76e505a69f73dbbc
2019-04-08 12:54:29 +02:00
a9c2bb9a31
Visual Console Refactor: added the service model
...
Former-commit-id: 10b5b99b280a997bdc194a9130b4d53cbf4572dc
2019-04-08 12:37:25 +02:00
986db7e7c2
Visual Console Refactor: added autoload for enterprise models
...
Former-commit-id: e9f54ebef239348dcb4f96939cd3f1d8269b172c
2019-04-08 12:35:37 +02:00
db13ecbb39
Added token save profile user
...
Former-commit-id: 442a51cfbe7ac9730e9fd9c2c1ee16b6609e5f6a
2019-04-08 11:55:58 +02:00
41ea1a4c66
Fixed minor visual bug - #3707
...
Former-commit-id: 963b3e5385bddb1726d87c57d6ee24c5ad437d1b
2019-04-08 11:31:27 +02:00
f3a848a9b3
Visual Console Refactor: WIP precentile tests
...
Former-commit-id: 9b2f6a35516084228a2b5d535147bb8157fd6177
2019-04-08 10:31:21 +02:00
4c8736c3a1
Visual Console Refactor: refactored the visual console view
...
Former-commit-id: dbbed082521ea878edd4765971f058733f691c51
2019-04-08 10:31:04 +02:00
6e9aad0634
Visual Console Refactor: refactored the code which fetch the items
...
Former-commit-id: 509310021f5a2e9f660e06f98aeba426f7e81b56
2019-04-08 10:30:45 +02:00
c91a4f8e4e
Visual Console Refactor: changed the build dir
...
Former-commit-id: aef2861fd405b92a4fd7c1d76f0c675a81d14bfd
2019-04-08 10:29:51 +02:00
112f7ab7ed
Visual Console Refactor: the group item now passes the tests
...
Former-commit-id: 2a967ef0a23c02fdb89352df65e8d5380cdd31f7
2019-04-08 10:29:30 +02:00
9e74d6f0d1
Visual Console Refactor: changed the name to the visual console client directory
...
Former-commit-id: 1d4e175ecdd7a52f8f070a276412c0944ab597ee
2019-04-08 08:59:26 +02:00
9fd5d3bf5a
Auto-updated build strings.
...
Former-commit-id: 0ec578931463f0c72468bd36a22842e1c3ada363
2019-04-08 00:01:23 +02:00
d35e9dbaae
Auto-updated build strings.
...
Former-commit-id: 007ce79a077f515323355d6656c9e14dd9c99c73
2019-04-07 00:01:25 +02:00
1ddb5ebff4
Auto-updated build strings.
...
Former-commit-id: 4b2eb28f3aa59b694fe9347111e626dc25d5b207
2019-04-06 00:01:32 +02:00
8e00fdebb4
Merge branch 'ent-3674-discovery-fase-3' of brutus.artica.lan:artica/pandorafms into ent-3674-discovery-fase-3
...
Former-commit-id: 755d2013c4f25475eb4f38dec9a8974c74f08715
2019-04-05 17:20:50 +02:00
b9db5fdb6f
wip discovery f3
...
Former-commit-id: 6b9f5bc3995a16414e1c1a9201983f33eb6908ad
2019-04-05 17:20:45 +02:00
49d925d96a
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Conflicts:
pandora_console/extras/mr/27.sql
Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
2019-04-05 16:48:58 +02:00
4808e4ae97
fixed errors map ipam
...
Former-commit-id: 9a1e5460ab40d22135edc75f2adf186f8d56f3d4
2019-04-05 16:43:36 +02:00
61343313d3
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: de65f005e7afad749058961558702fb98e41bbd6
2019-04-05 14:51:47 +02:00
633ccc5f10
Update visual console view
...
Former-commit-id: f9d78c01055c88b2e2de62e5b14f3c17e116b155
2019-04-05 14:51:28 +02:00
992209f5bb
Visual Console Refactor: added the module and custom graph model
...
Former-commit-id: 6756f9f4b9fb9803b7a91acb8e388d19d39a0b6f
2019-04-05 14:16:50 +02:00
55b9c07d63
Visual Console Refactor: error fixes
...
Former-commit-id: 758cd06bfd322a0c409ddf512230fdc1473d54c9
2019-04-05 14:16:18 +02:00
3da2f267a2
New design for the tables - #3707
...
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
2019-04-05 13:51:35 +02:00
aa640efc44
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
2019-04-05 13:19:42 +02:00
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
a480e4c73f
Merge branch 'ent-3740-Buguillo-en-configuracion-de-ACLs' into 'develop'
...
ent 3740 buguillo en configuracion de ac ls
See merge request artica/pandorafms!2281
Former-commit-id: 92349a3f4e6b9820606395d06964e64cdecbba9f
2019-04-05 13:17:30 +02:00
ae3c461da6
Fixed problems with inverse cron intervals in Windows agent
...
Former-commit-id: 0573c83dd346ef9076504688071d4678e554a6d5
2019-04-05 13:09:12 +02:00
781a6702ad
Merge branch 'ent-2232-Checkbox-Opciones-para-los-informes' into 'develop'
...
Custom fields in availability report type
See merge request artica/pandorafms!2324
Former-commit-id: 66fca18bc387db638fb9ee39c5f21bc5ec1b2069
2019-04-05 13:01:09 +02:00
873525726e
Avoid infinite loops when the day of the week in cron is out of limits
...
Former-commit-id: 6c0a87a29818219364fb9c08c44b48cb79dd74a8
2019-04-05 12:32:43 +02:00
e50fb4c585
Fixed cron day of the week on linux agents
...
Former-commit-id: 2e920e1a3387d0a42dcd67eec1fbd0e0a08d998d
2019-04-05 12:00:43 +02:00
970a10ba50
fixes in non agent per database
...
Former-commit-id: 7b34ea990bf52c96d4d6f65f11cf2949c199f2db
2019-04-05 10:41:37 +02:00
db9068e25a
fixes in non agent per database
...
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
2019-04-05 10:41:09 +02:00
447655409d
fixed minor error keep counters local and network components
...
Former-commit-id: 8d57bede6ea7c6f44d51a696a3257600410734fe
2019-04-05 09:27:46 +02:00
6bd38c6d4c
Merge branch 'develop' into 'ent-3740-Buguillo-en-configuracion-de-ACLs'
...
Conflicts:
pandora_console/include/functions_menu.php
Former-commit-id: 96e46da859b6d05409a8b2166bb2822493fe6558
2019-04-05 08:15:48 +02:00
8d0e53924d
Auto-updated build strings.
...
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
2019-04-05 00:01:32 +02:00
Alejandro Fraguas
manuel
Daniel Barbero Martin
artica
Alejandro Gallardo Escobar
fbsanchez
Daniel Maya
Tatiana Llorente
Alejandro Gallardo Escobar
Daniel Rodriguez
fermin831