marcos.alconada
014aaffc0d
Se normaliza codigo
...
Former-commit-id: cefce03d5d7b48f8df8cb1dd0cf9662441f2352f
2019-04-22 10:07:28 +02:00
marcos.alconada
732b3e83d4
Se añaden las modificaciones
...
Former-commit-id: 91b242e0290bd030ac920032f5ca2b23468ba16a
2019-04-17 18:59:08 +02:00
marcos.alconada
6f709cbae3
Retoque en api php
...
Former-commit-id: 46f5c90f6715083afb22c757e1e45a00c0f4381a
2019-04-17 17:28:48 +02:00
marcos.alconada
ad4dfc7624
Codigo normalizado, se cambian las llamadas y los datos de entrada a los metodos mediante other
...
Former-commit-id: 13478c483108b878a4cdc25bf19663bf8ed7d0af
2019-04-17 17:25:25 +02:00
marcos.alconada
fb87b97cd4
Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
...
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
2019-04-17 15:12:56 +02:00
marcos.alconada
51541c8d2c
Atucalizacion de rama
...
Former-commit-id: 0b31052bc4b69d12840b0bac70e06ff222142c07
2019-04-17 15:06:25 +02:00
Alejandro Fraguas
eacef25778
Merge branch 'ent-3379-7306-problema-con-agente-secondary-mode-xml_buffer' into 'develop'
...
Do not get stuck trying to send buffered XML files to a secondary server.
See merge request artica/pandorafms!2359
Former-commit-id: b090e4f86b2bbb0d7e2728b80ceea1dfc149b262
2019-04-17 12:58:46 +02:00
marcos.alconada
5de38e204f
Se añade la funcionalidad de sobreescribir perfiles existentes. Se cambia el campo id_grupo por id del perfil
...
Former-commit-id: 0bdec9661a9673a7695754bb7b8ab293650cca66
2019-04-17 12:45:38 +02:00
marcos.alconada
985726d5a2
modificaciones en api.php
...
Former-commit-id: f46abc58c079fbe584d2bda12f44e3b09c1a4693
2019-04-17 12:44:23 +02:00
Alejandro Fraguas
6594095de7
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop'
...
Ent 3707 nuevo diseño para las tablas
See merge request artica/pandorafms!2352
Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
2019-04-17 10:19:42 +02:00
vgilc
5e8452b12c
Merge branch 'ent-3792_spec_console_enterprise_for_rhel7' into 'develop'
...
add line in update version script to include pandora_console_enterprise_rhel7.spec
See merge request artica/pandorafms!2363
Former-commit-id: e6678b6dd238e211d4edd57732789fd45242ffa4
2019-04-17 09:54:33 +02:00
Rafael Ameijeiras
abcbd92f1f
add line in update version script to include pandora_console_enterprise_rhel7.spec
...
Former-commit-id: d071f1242b3c29b46458690b2f6709ef3546b61b
2019-04-17 09:45:08 +02:00
Tatiana Llorente
83cda70e0a
Fixed styles of tables within tables with new class - #3707
...
Former-commit-id: 6775b6f96669d33fb2130bfca2448d40d2de0964
2019-04-17 09:34:24 +02:00
artica
ff5a33ba2c
Auto-updated build strings.
...
Former-commit-id: 20a5c2ce8013b740274a489a7afaa208a23b16e6
2019-04-17 00:01:32 +02:00
marcos.alconada
293b025c7f
Se elimina error de sintaxis
...
Former-commit-id: 0db25e1c670d645c6a3e53829a895024a30a8cd4
2019-04-16 18:35:54 +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
marcos.alconada
31aa5b6d67
Comprobaciones en local
...
Former-commit-id: f7a110f0c5f4119c9cb2da8fa3216ef8d748a616
2019-04-16 16:06: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
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
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
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
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
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
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
Tatiana Llorente
6a9c972ed6
Changed popup no access - #3625
...
Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
2019-04-12 13:54:48 +02:00
marcos.alconada
3dafe2d66d
changed querys and refactor methods
...
Former-commit-id: 8a9ca4a6e70809ff76b922d20980725eb2d879ca
2019-04-12 13:20:59 +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
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
marcos.alconada
ddfd3339ff
add api
...
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
2019-04-12 11:39:34 +02:00
marcos.alconada
1e7fb2f375
concatenation
...
Former-commit-id: 1a025ccb247ada9f36f51309baee13f4a2c03a78
2019-04-12 11:37:12 +02:00
marcos.alconada
2ec72c4d78
Changed query
...
Former-commit-id: f5094c8747677108187e0ba377b80afce2bbd5e0
2019-04-12 11:10:42 +02:00
Tatiana Llorente
b50ed1c810
New arrow and timestamp images - #3707
...
Former-commit-id: 908928e47d7e635eee1e18925b176835f8e9c928
2019-04-12 10:41:55 +02:00
marcos.alconada
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
Daniel Barbero Martin
26d5060232
fixed errors css
...
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
