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 |
|
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 |
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 |
|
artica
|
d0f6726d00
|
Auto-updated build strings.
Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
|
2019-04-14 00:01:23 +02:00 |
|
artica
|
ef0f7cded8
|
Auto-updated build strings.
Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
|
2019-04-13 00:01:31 +02:00 |
|
fbsanchez
|
8bdc980ab0
|
minor fix
Former-commit-id: 4222b217953e88da43d0f50d3217a065dbb13332
|
2019-04-12 23:47:21 +02:00 |
|
fbsanchez
|
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 |
|
fbsanchez
|
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 |
|
fbsanchez
|
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 |
|
Alejandro Gallardo Escobar
|
2bd88e858d
|
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 87f11087d0ce33be0be009d8e4e88ca525204350
|
2019-04-12 14:28:20 +02:00 |
|
Alejandro Gallardo Escobar
|
2bf49e43cc
|
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: c409495771d58549575f68c52da38d2510f4f653
|
2019-04-12 14:24:49 +02:00 |
|
Alejandro Gallardo Escobar
|
035a819f3f
|
Visual Console Refactor: improved the item removal cleaning
Former-commit-id: af89361c3973f1321a6bfff9d3b19aabf80498db
|
2019-04-12 14:24:34 +02:00 |
|
Alejandro Gallardo Escobar
|
a82143d72b
|
Visual Console Refactor: improved the refresh management
Former-commit-id: d69eccbb2e06dfe70823d1bb1485f349a23089fe
|
2019-04-12 14:23:33 +02:00 |
|
Daniel Barbero Martin
|
3ae6423fc9
|
Add ACL for item vc
Former-commit-id: 7356f08a79378ada1df07ead930fcc01b84ba79c
|
2019-04-12 13:59:19 +02:00 |
|
Tatiana Llorente
|
6a9c972ed6
|
Changed popup no access - #3625
Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
|
2019-04-12 13:54:48 +02:00 |
|
fbsanchez
|
15cd02a49b
|
fix v1
Former-commit-id: f217f78e8085a81df68b9899513e547e148fca0d
|
2019-04-12 13:45:13 +02:00 |
|
Alejandro Gallardo Escobar
|
e6741067ff
|
Visual Console Refactor: fixed the tab links from the main view
Former-commit-id: e3993cedba972d4c163f2eec7228f8748a137cec
|
2019-04-12 13:23:38 +02:00 |
|
marcos.alconada
|
3dafe2d66d
|
changed querys and refactor methods
Former-commit-id: 8a9ca4a6e70809ff76b922d20980725eb2d879ca
|
2019-04-12 13:20:59 +02:00 |
|
Alejandro Gallardo Escobar
|
0fe9c57e51
|
Visual Console Refactor: now the public view is updated on VC update
Former-commit-id: 9382876893e56f893d92636742905e171766b060
|
2019-04-12 13:17:33 +02:00 |
|
Alejandro Gallardo Escobar
|
dc4396622d
|
Visual Console Refactor: acl improvements
Former-commit-id: f2cd4e7dd12a02eb4cee34f5947566ae37c35e9d
|
2019-04-12 13:12:12 +02:00 |
|
Daniel Rodriguez
|
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 |
|
Alejandro Gallardo Escobar
|
75d0e11dac
|
Visual Console Refactor: fixed some image urls to load them from the public view
Former-commit-id: 833a5529304b343ac22a0d054ced47d48667c306
|
2019-04-12 13:03:10 +02:00 |
|
Daniel Rodriguez
|
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 |
|
Alejandro Gallardo Escobar
|
3cda4523b4
|
Visual Console Refactor: now the rest of the view changes when the VC is udpated
Former-commit-id: c2972fa2b6a9177e6ce46efd36e122033fb109c4
|
2019-04-12 12:44:45 +02:00 |