Commit Graph

21136 Commits

Author SHA1 Message Date
marcos.alconada 293b025c7f Se elimina error de sintaxis
Former-commit-id: 0db25e1c670d645c6a3e53829a895024a30a8cd4
2019-04-16 18:35:54 +02:00
Alejandro Gallardo Escobar d5b83b867b Visual Console Refactor: bugfix
Former-commit-id: 8ea3faa88a1fd46d4f992e174e7916b91d9e9160
2019-04-16 17:44:39 +02:00
Alejandro Gallardo Escobar a9b409c21f Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 77a3a34e1803d4a462535af2dc0e174a31e6ff7f
2019-04-16 17:27:22 +02:00
Daniel Maya 761b1cbd0c fixed line
Former-commit-id: de9c35cd42476b0a8d53ca3f19481ad98251073f
2019-04-16 17:27:00 +02:00
Alejandro Gallardo Escobar 648d50ef6a Visual Console Refactor: changed the contrast of the colors of the percentile item
Former-commit-id: f04bdb655cb53ddb63c12ce4c91ab5123cc29a49
2019-04-16 17:26:55 +02:00
Alejandro Gallardo Escobar 23bdde8400 Visual Console Refactor: bugfix
Former-commit-id: 289d60e26486a0ddb2447841fe921fe84ea8871c
2019-04-16 17:20:13 +02:00
Alejandro Gallardo Escobar be5f68de80 Visual Console Refactor: fixed the size calculation of the clock element
Former-commit-id: f9112e1e53cbdd227f1d1ca7243c10f8c950a241
2019-04-16 17:05:46 +02:00
marcos.alconada 985fc952e1 actualizacion
Former-commit-id: 238764c594de2680d5f0c76a9c1b5fc7d8b8579d
2019-04-16 16:10:25 +02:00
marcos.alconada 5c2ebf0976 Camprobaciones en local para functiones
Former-commit-id: caaf9ac04d1c61011a4f2d337e775e72f41c6741
2019-04-16 16:08:06 +02:00
Alejandro Gallardo Escobar 2952af7f6b VIsual Console Refactor: bugfix
Former-commit-id: f0603f3512dbb224f11d628600857a4b9dbb9f9b
2019-04-16 16:06:56 +02:00
marcos.alconada 31aa5b6d67 Comprobaciones en local
Former-commit-id: f7a110f0c5f4119c9cb2da8fa3216ef8d748a616
2019-04-16 16:06:17 +02:00
Alejandro Gallardo Escobar 7acee06a00 Visual Console Refactor: bug fix
Former-commit-id: a2a05a2129873fdb6b2325211c490ad8f9263b16
2019-04-16 15:04:54 +02:00
Alejandro Gallardo Escobar 58b074b006 Visual Console Refactor: added missing returns
Former-commit-id: 48c7115b9d6220aa05e7b98c668337e523a83d29
2019-04-16 14:02:37 +02:00
Daniel Maya b4c27ca12a Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: fb0163097da4b76b020893496d9d7218ecb7a681
2019-04-16 12:42:03 +02:00
Daniel Maya 0e9be86388 Fixed relation line
Former-commit-id: 82543a898b570ac648d5ec4a3d71e830b8ac5597
2019-04-16 12:41:55 +02:00
Alejandro Gallardo Escobar a44d67a733 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 18d39f1b4ffbd3e56a3b1a879abf8bdf4ec6dead
2019-04-16 12:24:56 +02:00
Alejandro Gallardo Escobar 998a66f654 Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client
Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b
2019-04-16 12:23:03 +02:00
Daniel Maya 9be6029e1a Fixed Line class
Former-commit-id: 639649f4d65340ff25ecc1e956298705f5d13a05
2019-04-16 12:18:53 +02:00
Alejandro Gallardo Escobar fa1bf821e2 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 7331c64930125848041ead739feb72c0f67afbb2
2019-04-16 09:49:55 +02:00
Alejandro Gallardo Escobar 8f48deca14 Visual Console Refactor: removed the html entities from the main model data output
Former-commit-id: c8dfcdd77c7138a6644a3e785f652619bd4b852c
2019-04-16 09:49:50 +02:00
Daniel Barbero Martin 5f4bc3a7e4 fixed union line parent with child when type image
Former-commit-id: ae80e3067fe8600c7e65eac0b35c7a3c16d03be5
2019-04-16 09:41:17 +02:00
marcos.alconada 83934100ef change api
Former-commit-id: 064e8e8cdc1fae50424ca6a1796b27490970c084
2019-04-16 09:24:11 +02:00
artica 8bf92720ee Auto-updated build strings.
Former-commit-id: 544097161030608395112a142ed341e26700a678
2019-04-16 00:01:30 +02:00
Daniel Rodriguez 7c8b1fcf27 Merge branch 'ent-3625-Aviso-No-acceso-a-página' into 'develop'
Ent 3625 aviso no acceso a página

See merge request artica/pandorafms!2357

Former-commit-id: 7e4824a223e85f73b02bf6b85c37a83dc137979b
2019-04-15 18:32:54 +02:00
Daniel Maya b0b1db5746 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 1d0a9a172afd06cb0c641b53d02371bd85355721
2019-04-15 18:14:55 +02:00
Daniel Maya 7ee0f1042c Added Service
Former-commit-id: 882f3a40ef0b1ab1d77d4d6252cc14a5f9dddb83
2019-04-15 18:14:18 +02:00
manuel 2aa746694a Fixed bug in monitor detail view
Former-commit-id: f862f5d59966d1ef7e7aa5d2a7bb2ebc5bdf93a9
2019-04-15 17:55:25 +02:00
marcos.alconada e9fee71078 Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
Former-commit-id: e12c3e1ad1b695745a506375ab62033ababc5800
2019-04-15 17:53:31 +02:00
Marcos Alconada bda67d56c4 Update functions_api.php
Former-commit-id: 91efe3435a08085d63e4fc4129b97c290653f237
2019-04-15 17:49:10 +02:00
marcos.alconada 86ff1accbd Sintax problems resolved on Api.php
Former-commit-id: e42cbd99938e57abad1ea4e9c76ddeedb9e0cc01
2019-04-15 17:18:16 +02:00
Alejandro Gallardo Escobar f24368b5a0 Visual Console Refactor: fixed the analogic clock
Former-commit-id: bd85af741c4bcf0fe505e1e6bb0b41d42ab2e090
2019-04-15 17:10:34 +02:00
Alejandro Gallardo Escobar 2bd32a91dc Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: fa8ca4926182324c3d1307ac651c475568c64cf6
2019-04-15 17:01:01 +02:00
Alejandro Gallardo Escobar 2ff5608edf Visual Console Refactor: changed the visibility of a function
Former-commit-id: fec92cc200de0c9fbc51b82af41943ba5e242565
2019-04-15 17:00:06 +02:00
Ramon Novoa c971191477 Do not get stuck trying to send buffered XML files to a secondary server.
Ref pandora_enterprise#3379


Former-commit-id: 7f7a1ca5958cd8959516de5f46737d7b88074dd0
2019-04-15 16:22:14 +02:00
marcos.alconada 28eae48a9e Changed sintaxis
Former-commit-id: 4011dbcba98ad59e7a152e2e3e87c6ae8d646a85
2019-04-15 15:51:01 +02:00
Marcos Alconada 8c27411be6 Delete plugin.php
Former-commit-id: c37a85bcf4082a148e72cdc9b1a166a70ec94537
2019-04-15 15:18:22 +02:00
Daniel Barbero Martin 55def97d66 Add ACL for all item and item groups, fixed minor error show elements type item groups in VC
Former-commit-id: 04e1d5736dbfd0da47df7d3948969621b2c8faf1
2019-04-15 15:10:58 +02:00
marcos.alconada a3787c687c prueba
Former-commit-id: 61d4bc20b7811c44125b806f960561eb40412818
2019-04-15 15:10:43 +02:00
Tatiana Llorente 29c282dc79 Changed popup no access - #3625
Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
2019-04-15 14:42:58 +02:00
Tatiana Llorente a930d15d44 New style for modal window Show More - #3613
Former-commit-id: 3855d8463e3ba6709ec111c867d0534c704db1a7
2019-04-15 13:15:11 +02:00
Tatiana Llorente 0b352860cf New style for modal window Show More - #3613
Former-commit-id: 61cb4c99ef4f586cfdf07df5262c789cdee75915
2019-04-15 13:11:58 +02:00
fbsanchez 072fec3dd1 removed map link from mysql/oracle/RDS discovery tasks
Former-commit-id: c01ca25dbe4ca16265a6377d80f60f6d603b7664
2019-04-15 13:03:11 +02:00
fbsanchez 6648e0268a removed reconview link from menu
Former-commit-id: 41b80e4eaa41617982c91a218aee3902b76e4fde
2019-04-15 12:54:22 +02:00
Marcos Alconada c8af83b112 Update with validations and type return data functions_api.php
Former-commit-id: 0757de69c24df3e547924d8dacd32ba9dd88524c
2019-04-15 12:30:42 +02:00
marcos.alconada 994424fe52 Functions changed
Former-commit-id: 7eb0fb25ec863df6c60ed88bf84a6f5db5c90979
2019-04-15 12:19:35 +02:00
vgilc 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
Daniel Rodriguez 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
Rafael Ameijeiras eca7f6e53a fixed minor bug in the open spec
Former-commit-id: 0d8aacf0d4e7ae6199d103e62b6a6a8891c3a0f2
2019-04-15 11:20:57 +02:00
Marcos Alconada d3d5312f40 Update 27.sql
Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d
2019-04-15 11:14:41 +02:00
artica 68258661b1 Auto-updated build strings.
Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
2019-04-15 00:01:24 +02:00