Gerard
|
759cca3989
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-08 08:04:20 +01:00 |
|
Gerard
|
7d8879a979
|
deleted default query on item index
|
2019-03-08 07:52:43 +01:00 |
Carlos Jimenez Ruiz
|
6bb4f04bd1
|
#1211 client.billingData
gitea/salix/dev This commit looks good
Details
|
2019-03-07 12:11:06 +01:00 |
|
Carlos Jimenez Ruiz
|
75fba75688
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-07 11:00:48 +01:00 |
|
Carlos Jimenez Ruiz
|
8e28bb4312
|
#1211 client.billingData
|
2019-03-07 09:55:22 +01:00 |
Bernat
|
b709930db5
|
cau 10041 update fixtures for workers and fix test
gitea/salix/dev This commit looks good
Details
|
2019-03-07 07:51:29 +01:00 |
|
Gerard
|
b04dc02c61
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-06 16:29:15 +01:00 |
|
Gerard
|
af960e5f5f
|
fonts updated to 1.26 version
gitea/salix/test This commit looks good
Details
|
2019-03-06 16:28:09 +01:00 |
|
Gerard
|
1cc196983e
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-06 14:13:58 +01:00 |
|
Gerard
|
f8d6d2fe98
|
Merge branch 'master' into test
gitea/salix/test This commit looks good
Details
|
2019-03-06 14:10:36 +01:00 |
|
Gerard
|
0e3d568743
|
#1218 ticket.new quitar restricciones al crear un ticket abono
gitea/salix/master This commit looks good
Details
|
2019-03-06 14:06:36 +01:00 |
|
Carlos Jimenez Ruiz
|
fdfddd260a
|
#1208 Cambiar componente de icono papelera vn-icon por vn-icon-button
|
2019-03-06 12:27:56 +01:00 |
|
Gerard
|
b2adde4ba3
|
#1176 ticket.sale actualizar descuento
gitea/salix/dev This commit looks good
Details
|
2019-03-06 08:54:56 +01:00 |
|
Gerard
|
8923970e75
|
e2e fixed
gitea/salix/dev This commit looks good
Details
|
2019-03-06 08:54:04 +01:00 |
|
Gerard
|
1c7d50fc25
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-05 15:00:38 +01:00 |
|
Gerard
|
dd7ded018b
|
test fixed
|
2019-03-05 15:00:17 +01:00 |
 Joan Sanchez
|
11603f8d90
|
Add services to deliver-note #1201. Renamed receipt
gitea/salix/dev This commit has test failures
Details
|
2019-03-05 14:59:18 +01:00 |
|
Gerard
|
fbc84f48a1
|
Merge branch 'test' into dev
gitea/salix/dev This commit has test failures
Details
|
2019-03-05 14:44:38 +01:00 |
|
Gerard
|
52c64e9c1d
|
tricks with hours deleted and changed order
gitea/salix/test This commit looks good
Details
|
2019-03-05 14:43:59 +01:00 |
|
Carlos Jimenez Ruiz
|
17654ef71e
|
#1183 Crear enlace a client summary en /order/descriptor
gitea/salix/dev This commit looks good
Details
|
2019-03-05 12:37:43 +01:00 |
|
Carlos Jimenez Ruiz
|
d37d314304
|
#1202 refactor del cambio de estado de un ticket
gitea/salix/dev This commit looks good
Details
|
2019-03-05 12:01:53 +01:00 |
|
Joan Sanchez
|
e7ca55fea3
|
Merge branch 'dev' into test
gitea/salix/test This commit looks good
Details
|
2019-03-05 11:12:44 +01:00 |
|
Joan Sanchez
|
8e45858cd0
|
Disable & create new mandate when sending a new core sample #1207
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-03-05 10:10:43 +01:00 |
|
Carlos Jimenez Ruiz
|
f8a4ad0f28
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-04 16:49:41 +01:00 |
|
Carlos Jimenez Ruiz
|
d1d11233ad
|
#1039 ticket.summary
|
2019-03-04 16:34:41 +01:00 |
|
Gerard
|
d6683918bb
|
#1165 Añadir al buscador avanzado de order la búsqueda por ticket
gitea/salix/dev This commit looks good
Details
|
2019-03-04 16:06:41 +01:00 |
|
Gerard
|
96704cc4df
|
Merge branch 'test' into dev
|
2019-03-04 14:29:18 +01:00 |
|
Gerard
|
2f7c544c52
|
changed showfield of salesperson autocomplete
gitea/salix/dev This commit looks good
Details
|
2019-03-05 12:25:37 +01:00 |
|
Gerard
|
025c0810be
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-05 12:13:59 +01:00 |
|
Gerard
|
32893b49c1
|
#1174 item.index buscador avanzado mostrar comprador
|
2019-03-05 12:13:46 +01:00 |
|
Gerard
|
00f9754c1e
|
#1171 item.index mostrar campos medida y nicho
gitea/salix/dev This commit looks good
Details
|
2019-03-05 12:03:34 +01:00 |
|
Gerard
|
7f10a509e0
|
#1188 item.index filtering doesnt work for some params
gitea/salix/dev This commit looks good
Details
|
2019-03-05 11:34:05 +01:00 |
|
Gerard
|
9be6f1351a
|
updated steps
gitea/salix/master This commit looks good
Details
|
2019-03-05 08:42:05 +01:00 |
|
Joan Sanchez
|
3c6d27a285
|
order sales by concept #1166
gitea/salix/dev This commit looks good
Details
|
2019-03-04 12:04:23 +01:00 |
|
Gerard
|
1b2f851525
|
#1191 item not available icon added
gitea/salix/dev This commit has test failures
Details
|
2019-03-04 20:00:12 +01:00 |
|
Bernat
|
11c6fd2da7
|
Cau 8402 fix test and update structure
gitea/salix/dev This commit looks good
Details
|
2019-03-01 12:19:12 +01:00 |
|
Carlos Jimenez Ruiz
|
acbe9b8488
|
#1184 Propagar done en afterAll() de los test back
gitea/salix/dev This commit looks good
Details
|
2019-03-01 11:50:26 +01:00 |
|
Carlos Jimenez Ruiz
|
daa65e967f
|
typo corrected
gitea/salix/dev This commit looks good
Details
|
2019-03-01 11:09:20 +01:00 |
|
Carlos Jimenez Ruiz
|
443da0c44c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-01 10:51:12 +01:00 |
 Javi Gallego
|
a5b60a9016
|
instalacion impresora revisado
gitea/salix/dev This commit has test failures
Details
|
2019-03-01 09:07:44 +01:00 |
|
Carlos Jimenez Ruiz
|
0762b734fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-01 07:33:31 +01:00 |
|
Joan Sanchez
|
dbc582a410
|
Merge branch 'test' into dev
|
2019-03-01 07:30:30 +01:00 |
|
Joan Sanchez
|
4fe4c7886b
|
fixed samples visible scope
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-03-01 07:27:29 +01:00 |
|
Carlos Jimenez Ruiz
|
4026004ecf
|
#987 client.billing-data ALPHA
|
2019-02-28 14:30:29 +01:00 |
|
Gerard
|
9ef3eac480
|
#1136 item.buscador Avanzado añadir campo visible y isActive
gitea/salix/dev This commit looks good
Details
|
2019-02-28 13:50:39 +01:00 |
|
Gerard
|
08650a177e
|
client index not being able to open summary popover fixed
gitea/salix/test This commit looks good
Details
|
2019-02-28 11:29:24 +01:00 |
|
Gerard
|
7dd08dc6e5
|
merge test
gitea/salix/dev This commit looks good
Details
|
2019-02-28 10:19:31 +01:00 |
|
Joan Sanchez
|
d19d360ca6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-28 10:17:28 +01:00 |
|
Joan Sanchez
|
d336fd0eb1
|
fixed address
|
2019-02-28 10:17:09 +01:00 |
|
Gerard
|
624733dcfb
|
changed order of ticket index
gitea/salix/dev This commit has test failures
Details
|
2019-02-28 10:01:54 +01:00 |
|
Carlos Jimenez Ruiz
|
c2b95b093a
|
removed focus describe
gitea/salix/dev This commit has test failures
Details
|
2019-02-28 09:37:42 +01:00 |
|
Joan Sanchez
|
4729dda5f6
|
isDefaultAddress to defaultAddressFk migration #1108
gitea/salix/dev This commit looks good
Details
|
2019-02-28 08:55:34 +01:00 |
|
Gerard
|
9a7bd834df
|
date offset fixed
gitea/salix/test This commit looks good
Details
|
2019-02-27 17:04:32 +01:00 |
|
Gerard
|
87e8be0ede
|
time filter changed by dateTime
|
2019-02-27 17:04:00 +01:00 |
|
Carlos Jimenez Ruiz
|
ac6851bf4a
|
eslint rules passed
gitea/salix/dev This commit looks good
Details
|
2019-02-27 16:50:14 +01:00 |
|
Carlos Jimenez Ruiz
|
1e89b6977a
|
#1070 Renombrar columnas de la vista vn.worker
gitea/salix/dev This commit looks good
Details
|
2019-02-27 13:10:26 +01:00 |
|
Carlos Jimenez Ruiz
|
048c5c2ad8
|
#1104 order.index mostar mas campos
gitea/salix/dev This commit looks good
Details
|
2019-02-27 12:03:54 +01:00 |
|
Carlos Jimenez Ruiz
|
c227784877
|
typoe fixed
|
2019-02-27 10:05:49 +01:00 |
|
Gerard
|
a37fdd1e33
|
EQTAX restriction deleted CR Javi
|
2019-02-26 17:32:58 +01:00 |
|
Gerard
|
4de73fb2a8
|
#1152 refactor ticket.sale
|
2019-02-26 17:32:32 +01:00 |
|
Joan Sanchez
|
4d53564602
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-26 14:26:47 +01:00 |
|
Joan Sanchez
|
4853c8fd60
|
zone calendar date picker
gitea/salix/test This commit looks good
Details
|
2019-02-26 14:11:30 +01:00 |
|
Gerard
|
d404fc92c8
|
dates fixed, deleted tricks to change the hours
gitea/salix/test This commit looks good
Details
|
2019-02-26 12:51:01 +01:00 |
|
Gerard
|
43f26d1bc9
|
input number now has a option to hide the controls
gitea/salix/test This commit looks good
Details
|
2019-02-25 15:56:42 +01:00 |
|
Joan Sanchez
|
2862501475
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-25 15:08:42 +01:00 |
|
Carlos Jimenez Ruiz
|
4b37b0fc1e
|
#1155 item.index añadir grouping y packing
gitea/salix/dev This commit looks good
Details
|
2019-02-25 14:55:06 +01:00 |
|
Gerard
|
8a137e7713
|
grouping and packing added
gitea/salix/dev This commit looks good
Details
|
2019-02-25 13:40:53 +01:00 |
|
Joan Sanchez
|
23ed5e4ddf
|
added offset calendar remove selection
gitea/salix/test This commit looks good
Details
|
2019-02-25 12:22:04 +01:00 |
|
Joan Sanchez
|
ac1e619b06
|
fixed zone bugs
|
2019-02-25 10:03:50 +01:00 |
 Juan Ferrer
|
c3f20dba3c
|
Small fix
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-02-22 17:23:03 +01:00 |
|
Juan Ferrer
|
26419e75c9
|
Style fixes
gitea/salix/test This commit looks good
Details
|
2019-02-22 16:15:54 +01:00 |
|
Juan Ferrer
|
961eb6edaf
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-02-22 14:38:45 +01:00 |
|
Juan Ferrer
|
9fc6a2c4c2
|
Style fixes
|
2019-02-22 14:34:11 +01:00 |
|
Gerard
|
ea9d194368
|
traduction added
gitea/salix/test This commit looks good
Details
|
2019-02-22 13:18:53 +01:00 |
|
Gerard
|
9370142731
|
styles fixed
gitea/salix/test This commit looks good
Details
|
2019-02-22 12:43:08 +01:00 |
|
Gerard
|
86b3407e35
|
item barcode to item created
gitea/salix/test This commit looks good
Details
|
2019-02-22 08:32:18 +01:00 |
|
Gerard
|
c590dc6270
|
traduction added
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-21 14:08:32 +01:00 |
|
Gerard
|
1324d53e1b
|
claim action now shows ticket
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-02-21 13:48:34 +01:00 |
|
Gerard
|
1e199e9d5a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
gitea/salix/test This commit looks good
Details
|
2019-02-21 12:58:05 +01:00 |
|
Gerard
|
6fb936a08a
|
ticket log disabled temporally
|
2019-02-21 12:57:19 +01:00 |
|
Carlos Jimenez Ruiz
|
413d2f2855
|
merge
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 11:53:19 +01:00 |
|
Carlos Jimenez Ruiz
|
050c5c1126
|
#1131 Refactor vn-icon a vn-icon-button en las templates.
|
2019-02-21 11:40:27 +01:00 |
|
Gerard
|
506c857b70
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-21 10:17:54 +01:00 |
|
Gerard
|
03e168739b
|
updated icons
gitea/salix/test This commit looks good
Details
|
2019-02-21 10:17:13 +01:00 |
|
Juan Ferrer
|
02569aeea4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 10:10:48 +01:00 |
|
Juan Ferrer
|
e42da544cd
|
Styles fixed
|
2019-02-21 10:10:38 +01:00 |
|
Gerard
|
ab6606a624
|
Merge branch 'test' into dev
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 10:07:27 +01:00 |
|
Gerard
|
8d6fdc4b2f
|
added envialia and solved problems with worker popover
gitea/salix/test This commit looks good
Details
|
2019-02-21 10:06:38 +01:00 |
|
Joan Sanchez
|
c9746521dc
|
removed unused getSubTotal() method
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 08:44:03 +01:00 |
|
Joan Sanchez
|
06be535115
|
ticket subtotal should check service prices #1151
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 08:43:04 +01:00 |
|
Gerard
|
42cc2bde0d
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-21 07:48:31 +01:00 |
|
Gerard
|
444d531162
|
summary action now shows ticket id
gitea/salix/test This commit looks good
Details
|
2019-02-21 07:46:27 +01:00 |
|
Gerard
|
a651142fff
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-20 18:50:08 +01:00 |
|
Gerard
|
4b54b82a9d
|
#1150 descriptor popover intentar abrir con id movimiento
gitea/salix/test This commit looks good
Details
|
2019-02-20 18:46:30 +01:00 |
|
Gerard
|
a3dab9013c
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-20 17:53:10 +01:00 |
|
Gerard
|
0cca3bb9ce
|
#1137 ticket.summary, ticket.sale
gitea/salix/test This commit looks good
Details
|
2019-02-20 17:52:36 +01:00 |
|
Gerard
|
902b654f80
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-20 16:43:52 +01:00 |
|
Gerard
|
c95b2d71d4
|
tag not closed correctly fixed
gitea/salix/test This commit looks good
Details
|
2019-02-20 16:43:01 +01:00 |
|
Gerard
|
79cf4afb3e
|
#1116 loggable now works with transaction and log enabled on ticket module
gitea/salix/dev This commit has test failures
Details
|
2019-02-20 16:30:46 +01:00 |
|
Juan Ferrer
|
8c401b6921
|
Style fixes
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-20 14:38:41 +01:00 |
|
Juan Ferrer
|
752a703cdb
|
Merge
gitea/salix/dev This commit looks good
Details
|
2019-02-20 14:34:56 +01:00 |
|
Juan Ferrer
|
8f1e41e744
|
Style fixes
|
2019-02-20 14:34:16 +01:00 |
|
Joan Sanchez
|
646e6c7b46
|
Disabled delivery-note preview
gitea/salix/dev This commit looks good
Details
|
2019-02-20 13:26:31 +01:00 |
|
Joan Sanchez
|
90092a4f48
|
fixed treeview order
gitea/salix/dev This commit looks good
Details
|
2019-02-20 12:31:08 +01:00 |
|
Gerard
|
23e08331fc
|
fetched tags not sowing title and displaying wrong fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-20 12:12:16 +01:00 |
|
Gerard
|
b97cb52abe
|
changed traduction of email
gitea/salix/dev This commit looks good
Details
|
2019-02-20 11:52:36 +01:00 |
|
Gerard
|
5d6951a610
|
deleted deprecated component
gitea/salix/dev There was a failure building this commit
Details
|
2019-02-20 11:41:06 +01:00 |
|
Gerard
|
efff9d2184
|
deleted duplicated data
gitea/salix/dev This commit looks good
Details
|
2019-02-20 11:36:55 +01:00 |
|
Gerard
|
0f5d1e55c0
|
item descriptor not sending the correct warehouse fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-20 11:30:55 +01:00 |
|
Joan Sanchez
|
20843a9068
|
updated module worker acl, removed fi from summary
gitea/salix/dev This commit looks good
Details
|
2019-02-20 09:59:39 +01:00 |
|
Joan Sanchez
|
40d765adc1
|
removed fi from worker module
gitea/salix/dev This commit looks good
Details
|
2019-02-20 09:16:19 +01:00 |
|
Carlos Jimenez Ruiz
|
250bb359e1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-19 18:00:07 +01:00 |
|
Carlos Jimenez Ruiz
|
7d2bc25c95
|
#1142 order.line total
|
2019-02-19 17:55:19 +01:00 |
|
Gerard
|
927957aed8
|
Merge remote-tracking branch 'upstream/dev' into jgallego
|
2019-02-19 16:12:01 +01:00 |
|
Gerard
|
e041cef586
|
vn-empty-rows deleted as its not longer needed
|
2019-02-19 16:11:57 +01:00 |
|
Gerard
|
a8a17b72bd
|
Merge remote-tracking branch 'origin/dev' into jgallego
|
2019-02-19 16:10:16 +01:00 |
|
Joan Sanchez
|
d11a51b3f1
|
added color filter #1041
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:13:27 +01:00 |
|
Gerard
|
b7db5f969b
|
fixed worker descriptor not showing the correct worker
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:09:50 +01:00 |
|
Gerard
|
5ef524559e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-19 12:59:58 +01:00 |
|
Gerard
|
abfbf791f3
|
added one time bindings
|
2019-02-19 12:50:24 +01:00 |
|
Carlos Jimenez Ruiz
|
ff415dc654
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-19 12:14:27 +01:00 |
|
Gerard Miguel
|
12337d6bcf
|
Merge branch 'test' of gerard/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-19 10:42:40 +00:00 |
|
Gerard
|
280803f2ad
|
tests updated
gitea/salix/PR-11 This commit looks good
Details
gitea/salix/PR-12 This commit looks good
Details
|
2019-02-19 11:17:08 +01:00 |
|
Gerard
|
054cf21c1f
|
item index fixes
gitea/salix/PR-10 This commit has test failures
Details
|
2019-02-19 10:15:39 +01:00 |
|
Javi Gallego
|
a0cf617cca
|
#498 e2e arreglado
gitea/salix/jgallego This commit looks good
Details
|
2019-02-19 08:42:36 +01:00 |
|
Carlos Jimenez Ruiz
|
2d2ce304b5
|
merge
|
2019-02-19 08:16:36 +01:00 |
|
Joan Sanchez
|
75053618a2
|
zoneLocation order
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:39:48 +01:00 |
|
Joan Sanchez
|
813d7368f3
|
fixed zoneLocation order
|
2019-02-18 13:37:36 +01:00 |
|
Javi Gallego
|
da4d961c8b
|
Merge branch 'dev' into jgallego
gitea/salix/jgallego This commit has test failures
Details
|
2019-02-18 13:35:33 +01:00 |
|
Javi Gallego
|
a3e69d604a
|
getAvailable aislado
|
2019-02-18 13:31:57 +01:00 |
|
Joan Sanchez
|
0ea161ff19
|
fixed zoneLocation search
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:23:24 +01:00 |
|
Gerard
|
3adc035cab
|
#1121 worker.descriptor
|
2019-02-18 12:54:33 +01:00 |
|
Gerard
|
f5759f131b
|
#1145 item diary no va a la linea actual
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-18 09:50:46 +01:00 |
|
Gerard
|
13473e7bec
|
#1145 item diary no va a la linea actual
|
2019-02-18 09:50:09 +01:00 |
|
Joan Sanchez
|
5eb4eb2e79
|
Merge branch 'dev' into test
gitea/salix/dev There was a failure building this commit
Details
gitea/salix/test Something is wrong with the build of this commit
Details
|
2019-02-18 08:38:14 +01:00 |
|
Joan Sanchez
|
3b0d003322
|
treeview refactor & zone #1140
gitea/salix/dev This commit looks good
Details
|
2019-02-18 08:37:26 +01:00 |
|
Javi Gallego
|
58706b8694
|
backPreparado
gitea/salix/jgallego There was a failure building this commit
Details
|
2019-02-18 07:57:15 +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 |
|
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 |
|
Gerard
|
8bed065f62
|
My team checkbox now has three states
|
2019-02-15 13:59:44 +01:00 |
|
Gerard
|
b01f401286
|
Merge branch 'dev' into jgallego
|
2019-02-15 13:33:24 +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 |