marcos.alconada
|
8ce3aa0b93
|
Se añade el valor a assigned by con el usuario de configuracion global
Former-commit-id: f7dd22b99d8518210abc6455888c2c98270ad6e4
|
2019-04-24 13:31:43 +02:00 |
|
marcos.alconada
|
e7995b988e
|
Se arregla nombre de la funcion insert
Former-commit-id: 24e49bd248b3037a993b7ba04352f0334133200b
|
2019-04-24 12:37:21 +02:00 |
|
marcos.alconada
|
062a68fdaf
|
Ultimas modificaciones
Former-commit-id: fb7686f1f75c0d033c40d866d777d10f993a9e36
|
2019-04-24 12:01:04 +02:00 |
|
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 |
|
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 |
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 |
|
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 |
|
marcos.alconada
|
28eae48a9e
|
Changed sintaxis
Former-commit-id: 4011dbcba98ad59e7a152e2e3e87c6ae8d646a85
|
2019-04-15 15:51:01 +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 |
|
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 |
|
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 |
Daniel Barbero Martin
|
26d5060232
|
fixed errors css
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
|
2019-04-12 10:10:04 +02:00 |
manuel
|
61552bc201
|
Fixed ldap login
Former-commit-id: bd94a6112a88b3143973ab7f915de40995149ca8
|
2019-04-12 10:03:18 +02:00 |
|
Tatiana Llorente
|
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 |
|
artica
|
f5088299f3
|
Auto-updated build strings.
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
|
2019-04-12 00:01:24 +02:00 |
|
marcos.alconada
|
0afc699b2b
|
Add concatenation to user variable in filter user group function
Former-commit-id: 3e1cef1d560309cbfad9670e8e020ca352ac3619
|
2019-04-11 10:15:00 +02:00 |
|
Tatiana Llorente
|
187bdb1701
|
New design for the tables - #3707
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
|
2019-04-11 09:57:07 +02:00 |
|
artica
|
29e1fc828c
|
Auto-updated build strings.
Former-commit-id: 180188c01ab9644d5672f1b984a1454402acc1cd
|
2019-04-11 00:01:30 +02:00 |
|
manuel
|
0f78d87504
|
Fixed bug in save profile users
Former-commit-id: 8f79e2c3de0e7cedb581d90e53f39ef176afe040
|
2019-04-10 16:12:22 +02:00 |
|
Daniel Rodriguez
|
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 |
|
Tatiana Llorente
|
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 |
|
Tatiana Llorente
|
2a37224653
|
New design for the tables - #3707
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
|
2019-04-10 10:06:27 +02:00 |
|
artica
|
765ca945a0
|
Auto-updated build strings.
Former-commit-id: d69449b4f4ca214bdd3e37e660e0c8d7f0dc9817
|
2019-04-10 00:01:25 +02:00 |
|
Daniel Barbero Martin
|
0769c61b19
|
add map user edit
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
|
2019-04-09 18:18:10 +02:00 |
|
manuel
|
1efedd26ce
|
Fixed bug in LDAP authentication
Former-commit-id: 4e0b2d46d5bcd71ea63e9d09e7c0d8865735227f
|
2019-04-09 13:39:30 +02:00 |
|
Daniel Rodriguez
|
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 |