fbsanchez
|
4400d9303f
|
subscription manager udp
|
2019-05-23 19:22:05 +02:00 |
|
fbsanchez
|
211b05c9d6
|
minor fix in newsletter logic
|
2019-05-23 18:59:38 +02:00 |
|
fbsanchez
|
058c9d3806
|
Newsletter reminder settings ent
|
2019-05-23 18:54:04 +02:00 |
Alejandro Fraguas
|
88234503c0
|
Merge branch 'ent-4078-7999-Error-al-actualizar-los-cambios-en-la-vista-de-usuario' into 'develop'
Fixed url in user_edit
See merge request artica/pandorafms!2436
|
2019-05-22 14:14:15 +02:00 |
|
Alejandro Fraguas
|
5b286b4f67
|
Merge branch 'ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual' into 'develop'
Mejorar la actualizacion de los datos y elementos de la consola visual
See merge request artica/pandorafms!2429
|
2019-05-22 13:06:18 +02:00 |
Daniel Maya
|
edbde3fecb
|
Fixed url in user_edit
|
2019-05-21 17:14:29 +02:00 |
manuel
|
ada49966e0
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
|
2019-05-21 10:05:06 +02:00 |
Alejandro Gallardo Escobar
|
2c8dd3b5e5
|
Merge remote-tracking branch 'origin/develop' into ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual
|
2019-05-17 14:16:23 +02:00 |
|
Alejandro Gallardo Escobar
|
34218fa7eb
|
Improved the management of the async requests of the visual console client
|
2019-05-17 14:09:30 +02:00 |
|
Daniel Maya
|
b508e40a73
|
Changed simple quote in alerts
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
|
2019-05-14 11:11:27 +02:00 |
|
manuel
|
20dace7de8
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
|
2019-05-13 16:20:12 +02:00 |
Daniel Rodriguez
|
3e91207186
|
Merge branch 'ent-3617-Gráfica-de-módulos' into 'develop'
Ent 3617 gráfica de módulos
See merge request artica/pandorafms!2407
Former-commit-id: ac545e4211f9e68e81482657c6e294dcac082a8e
|
2019-05-09 17:03:03 +02:00 |
Tatiana Llorente
|
fd83540ad5
|
New menu module graph for interface modules- #3617
|
2019-05-09 12:39:03 +02:00 |
|
Alejandro Fraguas
|
0aa8bcda30
|
Merge branch 'ent-3758-7777-bug-validacion-eventos-en-consola' into 'develop'
Pending to review
See merge request artica/pandorafms!2295
|
2019-05-09 11:56:29 +02:00 |
|
Tatiana Llorente
|
ef45fc3ca6
|
Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos
|
2019-05-09 10:44:31 +02:00 |
|
Daniel Rodriguez
|
0a7539cc3a
|
Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop'
fixed filemanager
See merge request artica/pandorafms!2408
|
2019-05-08 18:26:23 +02:00 |
marcos.alconada
|
0b118f63ad
|
Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola
|
2019-05-08 15:19:40 +02:00 |
|
Daniel Rodriguez
|
0c8fab6cb3
|
Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop'
Ent 3574 7598 bug botones y casillas vista de eventos
See merge request artica/pandorafms!2222
|
2019-05-08 13:52:45 +02:00 |
Daniel Barbero Martin
|
99f5cab83d
|
fixed filemanager
|
2019-05-08 10:55:20 +02:00 |
|
Tatiana Llorente
|
cb49de4d81
|
New menu module graph - #3617
|
2019-05-08 10:28:00 +02:00 |
|
manuel
|
f5759abcad
|
Merge branch 'develop' into ent-3468-Ayudas_online
|
2019-05-08 09:35:32 +02:00 |
|
Tatiana Llorente
|
5e0b53e3c2
|
New menu module graph - #3617
|
2019-05-08 09:35:28 +02:00 |
Luis Calvo
|
3221bcf55a
|
Merge remote-tracking branch 'origin/develop' into ent-3782-module-visualization-bug
|
2019-05-07 16:08:29 +02:00 |
|
Tatiana Llorente
|
283be8f632
|
New menu module graph - #3617
|
2019-05-07 16:07:07 +02:00 |
Ramon Novoa
|
10fd9c4b57
|
Merge branch 'ent-3755-Vista-de-eventos-se-carga-dos-veces' into develop
|
2019-05-07 15:02:47 +02:00 |
alejandro-campos
|
a622dcc9d4
|
add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
|
2019-05-06 15:06:26 +02:00 |
|
Alejandro Fraguas
|
545afcb684
|
Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop'
Added secondary groups in global search
See merge request artica/pandorafms!2351
Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
|
2019-05-06 10:33:30 +02:00 |
|
alejandro-campos
|
bcbcd763a1
|
fixed double load of events in event list
Former-commit-id: ea1294c680b5dbe3b069110012e2b54db5312fd1
|
2019-04-29 15:04:14 +02:00 |
|
manuel
|
6bd8221bc0
|
changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
|
2019-04-29 14:36:02 +02:00 |
|
Daniel Maya
|
a5379be0d9
|
Added refr in full screen and public visual console
Former-commit-id: 348ec996173e95dce73e5800ece9c6861219c7af
|
2019-04-29 12:09:40 +02:00 |
|
Alejandro Gallardo Escobar
|
7f6ec7a501
|
Visual Console Refactor: bugfix
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
|
2019-04-29 11:03:56 +02:00 |
|
Alejandro Gallardo Escobar
|
c1272035cc
|
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
|
2019-04-24 17:05:20 +02:00 |
|
Daniel Barbero Martin
|
62b30c6e91
|
Merge remote-tracking branch 'origin/develop' into ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado
Former-commit-id: e51d5accb228485a309abae06d2a68352ae18a9b
|
2019-04-24 15:25:06 +02:00 |
|
Daniel Barbero Martin
|
ac41e9255f
|
helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
|
2019-04-24 13:53:18 +02:00 |
|
Alejandro Fraguas
|
759a533180
|
Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into 'develop'
Commit para revisar progreso
See merge request artica/pandorafms!2289
Former-commit-id: b8924b2fc0d151274809ab625fa840b27412d493
|
2019-04-24 13:47:15 +02:00 |
|
Alejandro Fraguas
|
a6df522df7
|
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas_2' into 'develop'
Fixed header missing in table alert status - #3707
See merge request artica/pandorafms!2365
Former-commit-id: e56a9610bc358898b5dc61a7f47d32561c72e36b
|
2019-04-22 17:31:49 +02:00 |
|
Alejandro Gallardo Escobar
|
a03245a277
|
Visual Console Refactor: fixed the visual console background on the meta
Former-commit-id: 2c5ba2451691558502c0aab4f5bb91259afb2ef8
|
2019-04-22 09:40:08 +02:00 |
|
fbsanchez
|
cbdd8e7104
|
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
|
2019-04-22 09:01:24 +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 |
|
Alejandro Gallardo Escobar
|
0911a00fe9
|
Visual Console Refactor: fixes
Former-commit-id: b180de5a6a105aa627f15895dc7890a294110db3
|
2019-04-17 13:50:53 +02:00 |
|
Tatiana Llorente
|
aa34cf17be
|
Fixed header missing in table alert status - #3707
Former-commit-id: 900b4023316d9e4946a8f81871e19f7f897a7a8f
|
2019-04-17 12:57:45 +02:00 |
|
Alejandro Gallardo Escobar
|
cbf921ba25
|
Visual Console Refactor: bugfixes
Former-commit-id: fc04eb9c6e6df024859e2b13034188ddaf1528ed
|
2019-04-17 12:32:08 +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 |
|
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 |
|
fbsanchez
|
6648e0268a
|
removed reconview link from menu
Former-commit-id: 41b80e4eaa41617982c91a218aee3902b76e4fde
|
2019-04-15 12:54:22 +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
|
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 |
|
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 |