 Juan Ferrer
|
041a423102
|
Merge branch 'dev' of juan/salix into dev
|
2019-02-17 17:59:48 +00:00 |
|
Juan Ferrer
|
3a56044634
|
Jenkinsfile fixes
|
2019-02-17 18:35:29 +01:00 |
Carlos Jimenez Ruiz
|
4186fbacb3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-16 17:15:03 +01:00 |
|
Juan Ferrer
|
9346c7adc3
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2019-02-15 22:08:44 +01:00 |
 Joan Sanchez
|
42e3fede23
|
fixed ng-repeat transition
|
2019-02-15 17:33:03 +01:00 |
Gerard
|
cb9e2284eb
|
styles, imports of titles and traductions added
|
2019-02-15 17:30:22 +01:00 |
 Javi Gallego
|
2b4f5984cc
|
principio 1146
|
2019-02-15 16:04:24 +01:00 |
|
Carlos Jimenez Ruiz
|
b034a8fab7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 15:33:11 +01:00 |
|
Juan Ferrer
|
4b027f015d
|
Pull request: test 1
|
2019-02-15 15:23:39 +01:00 |
|
Javi Gallego
|
00c7f28baf
|
Merge branch 'jgallego' of https://gitea.verdnatura.es/verdnatura/salix into jgallego
|
2019-02-15 14:36:50 +01:00 |
|
Javi Gallego
|
b81b8e18ed
|
$color-font-link
|
2019-02-15 14:29:47 +01:00 |
|
Gerard
|
8bed065f62
|
My team checkbox now has three states
|
2019-02-15 13:59:44 +01:00 |
|
Gerard
|
a806a26042
|
Merge branch 'jgallego' into dev
|
2019-02-15 13:42:42 +01:00 |
|
Juan Ferrer
|
70e807e965
|
Merge branch 'dev' of juan/salix into dev
|
2019-02-15 12:36:58 +00:00 |
|
Gerard
|
b01f401286
|
Merge branch 'dev' into jgallego
|
2019-02-15 13:33:24 +01:00 |
|
Juan Ferrer
|
588583d63d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 13:33:07 +01:00 |
|
Juan Ferrer
|
9a8f418c7b
|
Jenkinsfile fixes
|
2019-02-15 13:32:07 +01:00 |
|
Joan Sanchez
|
08c252fb9b
|
updated check component
|
2019-02-15 13:31:14 +01:00 |
|
Javi Gallego
|
32cc39ad00
|
order.json regularizados campos addressFk, agencyModeFk
|
2019-02-15 13:26:49 +01:00 |
|
Javi Gallego
|
7f7f47d861
|
bug no results duplicado
|
2019-02-15 13:25:23 +01:00 |
|
Carlos Jimenez Ruiz
|
d6a8cd68d4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 13:19:21 +01:00 |
|
Javi Gallego
|
8bea3afbfb
|
karma reparado
|
2019-02-15 13:13:23 +01:00 |
|
Carlos Jimenez Ruiz
|
3ab0b2eb19
|
merge
|
2019-02-15 12:43:18 +01:00 |
|
Carlos Jimenez Ruiz
|
92a645f395
|
#1122 + worker descriptor popover + small refactors for worker.nickname
|
2019-02-15 12:39:21 +01:00 |
|
Juan Ferrer
|
34ace7f5d4
|
Strict dependency injection enabled
|
2019-02-15 12:34:21 +01:00 |
|
Gerard
|
4f851c9eed
|
#1111 poder buscar pedidos confirmados o sin confirmar
|
2019-02-15 11:05:14 +01:00 |
|
Gerard
|
90a4e5a7d1
|
#1144 fixed bugs with $destroy
|
2019-02-15 11:03:27 +01:00 |
|
Gerard
|
c3903b8d51
|
added tripleState setter
|
2019-02-15 08:49:44 +01:00 |
|
Joan Sanchez
|
fe2c74c8c8
|
fixed event emiter
|
2019-02-15 08:40:18 +01:00 |
|
Joan Sanchez
|
e373e603bf
|
checkbox component noew emits change event
|
2019-02-15 08:02:29 +01:00 |
|
Joan Sanchez
|
cf9831473b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 06:49:31 +01:00 |
|
Gerard
|
db6a5cfc3e
|
changed hide for on-hide binding
|
2019-02-14 20:18:10 +01:00 |
|
Gerard
|
fd0e46516c
|
#1060 añadir al componente check la popiedad intermediate
|
2019-02-14 20:17:22 +01:00 |
|
Joan Sanchez
|
e49512d152
|
updated fonts
|
2019-02-14 14:47:05 +01:00 |
|
Gerard
|
1144a197a5
|
#1112 ticket.sale
|
2019-02-14 12:06:14 +01:00 |
|
Gerard
|
16f92ce646
|
changed Type traduction
|
2019-02-14 12:05:46 +01:00 |
|
Gerard
|
f7968ff15b
|
tests fixed
|
2019-02-14 11:41:06 +01:00 |
|
Gerard
|
9c439e9a92
|
added category to item search panel
|
2019-02-14 11:24:04 +01:00 |
|
Gerard
|
2a48e183e9
|
information added to the table
|
2019-02-14 09:59:54 +01:00 |
|
Juan Ferrer
|
fca040112a
|
Jenkinsfile fixes
|
2019-02-13 16:26:49 +01:00 |
|
Juan Ferrer
|
f3e3c1bbae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 14:01:38 +01:00 |
|
Juan Ferrer
|
1f759b6b8c
|
Style fixes
|
2019-02-13 14:01:37 +01:00 |
Bernat
|
df452ff345
|
merge
|
2019-02-13 13:28:02 +01:00 |
|
Bernat
|
bbd4188695
|
#9848 fix test and update fixtures
|
2019-02-13 13:19:15 +01:00 |
|
Carlos Jimenez Ruiz
|
d38ce05f7d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 10:01:04 +01:00 |
|
Carlos Jimenez Ruiz
|
25d8e06c1d
|
updated backend unit test gulp tasks
|
2019-02-13 10:00:56 +01:00 |
|
Gerard
|
b93e2f5359
|
#1114 item.regularize
|
2019-02-13 09:49:41 +01:00 |
|
Gerard
|
bfaf9b1ed4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 09:27:13 +01:00 |
|
Gerard
|
5063bd8137
|
#1128 item.index
|
2019-02-13 09:27:11 +01:00 |
|
Carlos Jimenez Ruiz
|
3bd137a435
|
minor refactor
|
2019-02-13 08:53:57 +01:00 |