fbsanchez
|
bdd7cc1317
|
Flex agent view
|
2019-05-28 09:48:09 +02:00 |
|
fbsanchez
|
8bfb1e6773
|
Merge remote-tracking branch 'origin/develop' into fix/styles
|
2019-05-28 08:32:53 +02:00 |
artica
|
11e5a4ce18
|
Auto-updated build strings.
|
2019-05-28 00:01:07 +02:00 |
|
fbsanchez
|
e338d5ba95
|
Merge remote-tracking branch 'origin/develop' into fix/styles
|
2019-05-27 22:40:11 +02:00 |
|
fbsanchez
|
f57915285f
|
review styles agent view
|
2019-05-27 22:36:55 +02:00 |
|
fbsanchez
|
f1499082fa
|
agent view rebuilt
|
2019-05-27 21:30:46 +02:00 |
|
fbsanchez
|
954dd0b43a
|
UI_toggle updated
|
2019-05-27 19:08:41 +02:00 |
|
fbsanchez
|
5be124f315
|
Styles review
|
2019-05-27 19:00:48 +02:00 |
|
fbsanchez
|
f0fb6d7fd9
|
wip styles
|
2019-05-27 18:03:56 +02:00 |
|
fbsanchez
|
556c07ad99
|
Minor changes in configurar_agente
|
2019-05-27 17:12:35 +02:00 |
|
fbsanchez
|
0280547465
|
some changes
|
2019-05-27 15:41:23 +02:00 |
|
fbsanchez
|
9eecc414dd
|
cps changes - switch core touched - test this commit carefully
|
2019-05-27 14:12:53 +02:00 |
|
fbsanchez
|
7347324601
|
Minor fixes - discovery styles
|
2019-05-27 13:19:08 +02:00 |
|
fbsanchez
|
83602e07b9
|
Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4
|
2019-05-27 11:06:29 +02:00 |
|
artica
|
de3464bd02
|
Auto-updated build strings.
|
2019-05-27 00:01:05 +02:00 |
|
artica
|
ba97da46c6
|
Auto-updated build strings.
|
2019-05-26 00:01:04 +02:00 |
|
artica
|
a13701ed82
|
Auto-updated build strings.
|
2019-05-25 00:01:06 +02:00 |
|
fbsanchez
|
c5bd3204ab
|
Minor style, avoided duplicated iface names with spaces
|
2019-05-24 11:42:46 +02:00 |
Alejandro Fraguas
|
f5586d7b70
|
Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop'
fixed label reports and more fixed
See merge request artica/pandorafms!2413
|
2019-05-24 10:47:15 +02:00 |
|
artica
|
cc09c257bc
|
Auto-updated build strings.
|
2019-05-24 00:01:06 +02:00 |
Daniel Barbero Martin
|
1386a44e07
|
fixed errors label report
|
2019-05-23 17:52:28 +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 |