gerard
|
abaab3e34a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-24 12:13:11 +02:00 |
|
gerard
|
04a452bd82
|
action test updated
|
2018-09-24 12:12:36 +02:00 |
 Joan Sanchez
|
0b5a0754fd
|
searchbar with icons #371
|
2018-09-24 11:10:03 +02:00 |
|
Joan Sanchez
|
564370180c
|
zone basic data
|
2018-09-24 10:43:54 +02:00 |
|
Joan Sanchez
|
fec2134b8f
|
added zone descriptor #669
|
2018-09-21 12:35:54 +02:00 |
|
Joan Sanchez
|
d5ca385ccd
|
added zone index & zone create
|
2018-09-19 15:05:07 +02:00 |
 Javi Gallego
|
87447661b2
|
merge
|
2018-09-19 07:42:53 +02:00 |
|
Javi Gallego
|
68e075c496
|
#654 Permisos en claim.basicData
|
2018-09-19 07:41:07 +02:00 |
|
gerard
|
834d779154
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-18 14:37:15 +02:00 |
|
gerard
|
fa9c3f4759
|
Tarea #602 Investigar hook
|
2018-09-18 14:36:41 +02:00 |
|
Joan Sanchez
|
469e6f8076
|
fixed itemDiary warehouseFk select #671
|
2018-09-18 13:34:11 +02:00 |
|
Joan Sanchez
|
9aff95904d
|
Added model rewriteDbError() method & fixed tag bug #597 & #662
|
2018-09-18 10:11:51 +02:00 |
|
gerard
|
5c6ab8efc3
|
skipped tests fixed
|
2018-09-18 09:52:50 +02:00 |
|
gerard
|
babadbb4f3
|
Bug #660 el catalogo deberia de estar deshabilitado
|
2018-09-18 09:37:54 +02:00 |
|
gerard
|
6b155c6485
|
reverted "Bur restoring old value"
|
2018-09-17 14:55:13 +02:00 |
|
gerard
|
97f45e7475
|
focus added to all vn-searcbar in modules index
|
2018-09-17 14:54:38 +02:00 |
|
gerard
|
c3e9d0af95
|
bug restoring old value solved
|
2018-09-17 14:31:43 +02:00 |
|
gerard
|
4fb31f9522
|
Tarea #658 dialogo de añadir cantidad
|
2018-09-17 14:30:39 +02:00 |
|
Joan Sanchez
|
f8c014b330
|
Merge branches 'dev' and 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-14 14:25:32 +02:00 |
|
gerard
|
569cd60d7b
|
Tarea #601 dialogo de añadir cantidad
|
2018-09-14 14:20:58 +02:00 |
|
Joan Sanchez
|
e0628786b4
|
added catalog front & back unit test #598
|
2018-09-14 14:18:39 +02:00 |
|
gerard
|
899f9b3fe5
|
Tarea #653 Crear shortcuts
|
2018-09-14 13:51:28 +02:00 |
Carlos Jimenez
|
e90af6b851
|
#593 Refactor card/descriptor/descriptor-popover
|
2018-09-14 13:43:51 +02:00 |
|
Joan Sanchez
|
d66383dced
|
fixed front-end unit test textfield
|
2018-09-14 11:01:56 +02:00 |
|
Joan Sanchez
|
8feba9f5eb
|
catalogFilter back test
|
2018-09-14 09:37:54 +02:00 |
|
Joan Sanchez
|
fa31010069
|
catalog filters #598
|
2018-09-14 09:10:30 +02:00 |
|
gerard
|
8d1aa30287
|
Bug #437 Boton cancelar
|
2018-09-14 08:14:52 +02:00 |
|
gerard
|
0f14bf9d27
|
added translations
|
2018-09-13 17:00:01 +02:00 |
|
gerard
|
a6b63d4113
|
Bug #652 El componente textarea muestra mal el label
|
2018-09-13 14:01:26 +02:00 |
|
gerard
|
1e3b3b0ffa
|
Tarea #644 Crear componente Input Number
|
2018-09-13 12:46:32 +02:00 |
|
gerard
|
094a6eda68
|
Bug #644 Crear componente Input Number
|
2018-09-13 11:27:38 +02:00 |
|
gerard
|
8234780252
|
updated fonts
|
2018-09-13 11:06:48 +02:00 |
|
gerard
|
7e309e5f62
|
Bug #650 En la seccion claim detail no aparecen las sales reclamables
|
2018-09-13 10:05:39 +02:00 |
|
Carlos Jimenez
|
88a4ed7fb3
|
#604 acl for claims
|
2018-09-12 15:21:20 +02:00 |
|
gerard
|
49b96c5cc3
|
test fixed
|
2018-09-12 11:08:48 +02:00 |
|
gerard
|
bc4b6826fe
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-12 11:06:47 +02:00 |
|
gerard
|
e03241fcc6
|
Tarea #480 /icon-menu/icon-menu.js Front unit test
|
2018-09-12 11:06:28 +02:00 |
|
Carlos Jimenez
|
c2f8f236fb
|
#647 Si se hace control click en ticket.index abrir una nueva pestaña
|
2018-09-12 10:08:19 +02:00 |
|
Carlos Jimenez
|
ed3c775c04
|
#608 order-create now redirects correctly yo the catalog
|
2018-09-12 08:24:19 +02:00 |
|
Javi Gallego
|
2e94ab28de
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-11 13:56:45 +02:00 |
|
gerard
|
f105ffa2d6
|
watchers reduced
|
2018-09-11 13:48:05 +02:00 |
|
Javi Gallego
|
b6cc8c2fe0
|
merge
|
2018-09-11 13:44:49 +02:00 |
|
Javi Gallego
|
c9ec4aee7e
|
#612 añadir reclamacion
|
2018-09-11 12:49:31 +02:00 |
|
Carlos Jimenez
|
a3d63825d9
|
indentation fix
|
2018-09-10 13:00:01 +02:00 |
|
Joan Sanchez
|
366b00a8de
|
added chip component #624
|
2018-09-07 12:20:57 +02:00 |
|
Joan Sanchez
|
a4c730cf65
|
enabled routes module #616
|
2018-09-07 09:40:45 +02:00 |
|
gerard
|
a86120c055
|
Tarea #615 test multicheck
|
2018-09-06 16:38:49 +02:00 |
|
Joan Sanchez
|
ca97d76adf
|
itemDiary warehouseFk url param #622
|
2018-09-06 15:08:02 +02:00 |
|
Joan Sanchez
|
dff0c561bc
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-06 12:47:27 +02:00 |
|
Joan Sanchez
|
cee940f4fa
|
order client descriptor #609
|
2018-09-06 12:47:25 +02:00 |
|
gerard
|
c33e741c14
|
fixed typo
|
2018-09-06 12:33:37 +02:00 |
|
Joan Sanchez
|
660310693f
|
ticket sale translation fix
|
2018-09-06 12:22:12 +02:00 |
|
Javi Gallego
|
588308cf1e
|
merge
|
2018-09-06 11:15:53 +02:00 |
|
Joan Sanchez
|
f330c77cc6
|
added span to descriptor-popover links #637
|
2018-09-06 08:04:43 +02:00 |
|
gerard
|
6f3140059f
|
claim icons added
|
2018-09-05 16:15:12 +02:00 |
|
gerard
|
b2d0832daa
|
Added missing success mesage
|
2018-09-05 16:14:13 +02:00 |
|
gerard
|
5d7c6ef250
|
fixed typo
|
2018-09-05 16:13:30 +02:00 |
|
gerard
|
d3ce915b5d
|
refactor to add disable
|
2018-09-05 13:56:07 +02:00 |
|
gerard
|
f23ea2d821
|
fixed typo
|
2018-09-05 13:48:18 +02:00 |
|
gerard
|
1bfd6a8ec0
|
updated acl
|
2018-09-05 13:47:53 +02:00 |
|
gerard
|
c04616d6dc
|
updated acl
|
2018-09-05 13:47:35 +02:00 |
|
gerard
|
c424e845d1
|
Tarea #606 claim.summary
|
2018-09-05 13:47:15 +02:00 |
Juan
|
bf0e1eeaf3
|
CrudModel: improved, docs, bugs fixed
|
2018-09-05 13:01:21 +02:00 |
|
gerard
|
b5448aaa5a
|
Tarea #446 claim.development
|
2018-09-05 11:48:38 +02:00 |
|
gerard
|
0333ba96b0
|
Tarea #445 claim.detail
|
2018-09-05 11:45:33 +02:00 |
|
gerard
|
732c100096
|
Tarea #447 claim.action
|
2018-09-05 11:34:23 +02:00 |
|
Joan Sanchez
|
6e9bc4645c
|
translation fix
|
2018-09-05 07:54:45 +02:00 |
|
gerard
|
d991731f98
|
bug with clear function solved
|
2018-09-04 16:51:29 +02:00 |
|
Joan Sanchez
|
d3406fecde
|
claim search-panel & connector-mysql fix date
|
2018-09-04 15:08:36 +02:00 |
|
Joan Sanchez
|
fa631e5ac2
|
descriptor quicklings fixed #593
|
2018-09-04 13:01:53 +02:00 |
|
gerard
|
98aae36087
|
claim hidden again
|
2018-09-04 13:01:53 +02:00 |
|
Javi Gallego
|
955a7f0aae
|
merge
|
2018-09-04 12:01:44 +02:00 |
|
Javi Gallego
|
dda12c4b62
|
#460 expedition
|
2018-09-04 11:57:41 +02:00 |
|
Joan Sanchez
|
9da95f637e
|
descriptor quicklings fixed #593
|
2018-09-04 11:49:00 +02:00 |
|
gerard
|
e8d7fbbf96
|
Tarea #489 /components/textarea/textarea.js Front unit test
|
2018-09-04 10:11:01 +02:00 |
|
gerard
|
6967480398
|
Tarea #627 Refactorizar la directiva Textarea
|
2018-09-04 10:10:29 +02:00 |
|
gerard
|
570bf3133d
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-04 08:09:23 +02:00 |
|
Joan Sanchez
|
6c682875a0
|
mailer css removed justify text. Fixed chrome image content-type.
|
2018-09-03 13:54:18 +02:00 |
|
gerard
|
b46bc7d296
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-03 11:03:10 +02:00 |
|
Joan Sanchez
|
d5e0d3beef
|
updated itemDiary front unit test
|
2018-09-03 10:55:04 +02:00 |
|
Joan Sanchez
|
14b85b874b
|
th component front unit test #491
|
2018-09-03 09:54:31 +02:00 |
|
Joan Sanchez
|
c39db598ac
|
Item diary select correct position #619
|
2018-09-03 08:09:56 +02:00 |
|
gerard
|
065d236abb
|
claim module teporally shown
|
2018-08-31 14:49:16 +02:00 |
|
gerard
|
f81c97dee9
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-31 14:35:30 +02:00 |
|
gerard
|
2d21f84f8b
|
Tarea #443 claim list
|
2018-08-31 14:35:20 +02:00 |
|
Carlos Jimenez
|
f412d3c486
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-31 13:07:05 +02:00 |
|
Carlos Jimenez
|
25ac0db1cb
|
#497 module-loader.js Front unit test
|
2018-08-31 13:06:39 +02:00 |
|
Joan Sanchez
|
8879005854
|
fixed ticket list pagination
|
2018-08-31 12:39:57 +02:00 |
|
Carlos Jimenez
|
bc2554e6f9
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-31 11:25:30 +02:00 |
|
Joan Sanchez
|
f3fc211dfa
|
removed unused routes, filter and crud routes #409
|
2018-08-31 07:53:38 +02:00 |
|
Carlos Jimenez
|
58042027cf
|
small refactors
|
2018-08-30 16:15:30 +02:00 |
|
Carlos Jimenez
|
c0c4961717
|
#487 step-control.js front unit test
|
2018-08-30 16:15:10 +02:00 |
|
Javi Gallego
|
c4e0fc74a3
|
Bug #452 quitamos servicio production
|
2018-08-30 11:02:50 +02:00 |
|
gerard
|
61b9b0c7bc
|
Tarea #445 claim.detail
|
2018-08-30 09:19:09 +02:00 |
|
Joan Sanchez
|
e698d84a4f
|
crud-model refactor. crud-model fixes #409
|
2018-08-30 08:50:03 +02:00 |
|
Carlos Jimenez
|
a1b87e473e
|
removed unused code
|
2018-08-30 08:17:05 +02:00 |
|
Carlos Jimenez
|
8d79298d92
|
#478 dialog Front unit test
|
2018-08-30 08:16:50 +02:00 |
|
Joan Sanchez
|
bd38d07af4
|
front-end unit test fixed
|
2018-08-30 07:15:04 +02:00 |
|
Joan Sanchez
|
3c954f13f3
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-30 07:09:09 +02:00 |
|
Joan Sanchez
|
3594d5df4c
|
back-end test fix
|
2018-08-30 07:09:06 +02:00 |