fbsanchez
|
c5bd3204ab
|
Minor style, avoided duplicated iface names with spaces
|
2019-05-24 11:42:46 +02:00 |
artica
|
cc09c257bc
|
Auto-updated build strings.
|
2019-05-24 00:01:06 +02:00 |
|
fbsanchez
|
9e1de4cbb3
|
Merge branch 'ent-1668-update-manager' into 'develop'
rb UM GCv
See merge request artica/pandorafms!2447
|
2019-05-23 16:16:26 +02:00 |
|
fbsanchez
|
4ec6aadf7d
|
rb UM GCv
|
2019-05-23 16:12:40 +02:00 |
|
fbsanchez
|
f1c077b753
|
Merge branch 'ent-1668-update-manager' into 'develop'
UM GCv
See merge request artica/pandorafms!2446
|
2019-05-23 16:09:16 +02:00 |
|
fbsanchez
|
4abbbf6680
|
UM GCv
|
2019-05-23 15:55:07 +02:00 |
|
fbsanchez
|
5d4ba6cb01
|
Merge branch 'ent-1668-update-manager' into 'develop'
summarized counts
See merge request artica/pandorafms!2445
|
2019-05-23 15:47:25 +02:00 |
|
fbsanchez
|
08aa824f97
|
summarized counts
|
2019-05-23 15:38:45 +02:00 |
|
fbsanchez
|
1529a04507
|
Merge branch 'ent-1668-update-manager' into 'develop'
fixed: um url relative
See merge request artica/pandorafms!2444
|
2019-05-23 11:33:46 +02:00 |
|
fbsanchez
|
0ee42fbafe
|
fixed: um url relative
|
2019-05-23 11:23:42 +02:00 |
|
fbsanchez
|
dd8af874fa
|
Merge branch 'ent-1668-update-manager' into 'develop'
license forms sync MC-N
See merge request artica/pandorafms!2441
|
2019-05-23 10:36:43 +02:00 |
|
fbsanchez
|
7b5ae40868
|
multiple fixes
|
2019-05-23 10:27:50 +02:00 |
|
artica
|
4c3dea3ba4
|
Auto-updated build strings.
|
2019-05-23 00:01:07 +02:00 |
Daniel Rodriguez
|
8b511c2ca3
|
Merge branch 'ent-3984-7962-ldap-bug-en-token-force-automatically-create-profile-user' into 'develop'
Changed condition for ldap Force automatically create profile user
See merge request artica/pandorafms!2422
|
2019-05-22 16:15:06 +02:00 |
artica
|
892dcc750f
|
Updated version and build strings.
|
2019-05-22 15:29:49 +02:00 |
|
Daniel Rodriguez
|
979f11ca8f
|
Merge branch 'ent-1668-update-manager' into 'develop'
Ent 1668 update manager
See merge request artica/pandorafms!2420
|
2019-05-22 15:25:49 +02:00 |
marcos.alconada
|
07b42f7241
|
Changed for metaconsole
|
2019-05-22 13:57:31 +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 |
|
artica
|
ba9edc0378
|
Auto-updated build strings.
|
2019-05-22 00:01:07 +02:00 |
|
Daniel Rodriguez
|
f6171de522
|
Merge branch 'ent-3468-Ayudas_online' into 'develop'
helpers
See merge request artica/pandorafms!2381
|
2019-05-21 17:28:27 +02:00 |
|
Alejandro Fraguas
|
ce359bfaf6
|
Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop'
Ent 3937 eliminar echos y prints de las subclases de wizard
See merge request artica/pandorafms!2430
|
2019-05-21 12:11:53 +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 |
|
fbsanchez
|
b853582fb9
|
Changed preview by \"click here\" message
|
2019-05-21 08:29:59 +02:00 |
|
artica
|
20e38ead81
|
Auto-updated build strings.
|
2019-05-21 00:01:08 +02:00 |
|
fbsanchez
|
77fc1abe89
|
minor style updates and fixes in safe-output
|
2019-05-20 18:16:21 +02:00 |
|
fbsanchez
|
5e9b2479eb
|
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
|
2019-05-20 13:11:39 +02:00 |
alejandro-campos
|
a898fad2c3
|
lint fixes
|
2019-05-20 10:35:46 +02:00 |
|
artica
|
d82d178a0d
|
Auto-updated build strings.
|
2019-05-20 00:01:08 +02:00 |
|
artica
|
2dc5fce6a6
|
Auto-updated build strings.
|
2019-05-19 00:01:06 +02:00 |
|
artica
|
509c476c33
|
Auto-updated build strings.
|
2019-05-18 00:01:08 +02:00 |
|
alejandro-campos
|
54d3eefa43
|
lint changes
|
2019-05-17 14:27:59 +02:00 |
|
alejandro-campos
|
e746a49158
|
lint changes
|
2019-05-17 14:26:44 +02:00 |
Alejandro Gallardo Escobar
|
bdcea7ec7d
|
Minor fix
|
2019-05-17 14:25:17 +02:00 |
|
alejandro-campos
|
a0b7164d9f
|
lint changes
|
2019-05-17 14:20:01 +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 |
|
marcos.alconada
|
0c9f8892e0
|
Changed evaluates permissions
|
2019-05-17 13:58:34 +02:00 |
|
Alejandro Fraguas
|
ea39766d59
|
Merge branch 'ent-3684-Dashboard-publico-no-muestra-mapa-de-red' into 'develop'
ent-3684-Dashboard-publico-no-muestra-mapa-de-red into develop
See merge request artica/pandorafms!2427
|
2019-05-17 12:11:19 +02:00 |
|
Daniel Rodriguez
|
833c2d91a7
|
Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual-return' into 'develop'
Fixed error window in visual console
See merge request artica/pandorafms!2426
|
2019-05-17 11:27:57 +02:00 |
|
artica
|
bf202496da
|
Auto-updated build strings.
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
|
2019-05-17 00:01:10 +02:00 |
Luis Calvo
|
b3d2eaaf9e
|
Fixed img url on js
Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0
|
2019-05-16 17:25:18 +02:00 |
|
Luis Calvo
|
1bfd91725e
|
Changed <img> to hmtl_print_image
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
|
2019-05-16 17:13:14 +02:00 |
Daniel Maya
|
f1705af9f6
|
Fixed error window in visual console
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
|
2019-05-16 16:04:38 +02:00 |
|
fbsanchez
|
c8c0194183
|
Minor fix in url
Former-commit-id: 087a93624d65109c9c66de329c4365b98d99c8ed
|
2019-05-16 12:33:05 +02:00 |
|
fbsanchez
|
034480bf88
|
minor fixes
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
|
2019-05-16 12:28:46 +02:00 |
|
fbsanchez
|
e7dbb55392
|
Minor fixes
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
|
2019-05-16 12:00:49 +02:00 |
|
alejandro-campos
|
13b32003b3
|
save changes ticket 3937
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
|
2019-05-16 11:37:48 +02:00 |
|
Daniel Rodriguez
|
50ad335794
|
Merge branch 'ent-3720-7750-anadir-filtros-en-custom-graphs-2' into 'develop'
New branch without thras files
See merge request artica/pandorafms!2423
Former-commit-id: 909ad4d321231e4d610b409c3f5b1224a780150b
|
2019-05-16 11:37:25 +02:00 |
|
Alejandro Gallardo Escobar
|
a25a08f48d
|
Added an async task manager to the visual console client
Former-commit-id: 4f5c92a976ae976e77cc11505c7a57bf31121930
|
2019-05-16 11:04:03 +02:00 |
|
artica
|
f5f66fc144
|
Auto-updated build strings.
Former-commit-id: dff1ba74fcb60ee0ba0278c8baf25614ce391c58
|
2019-05-16 00:01:06 +02:00 |