 Joan Sanchez
|
c192a0e125
|
Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #490
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-24 08:59:33 +00:00 |
Jorge Padawan
|
3517bdea41
|
Añadido a las foreignKeys el valor UNIQUE
|
2020-12-23 13:31:55 +01:00 |
 Bernat Exposito
|
a21476e3df
|
fix searchbar index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:42:41 +01:00 |
|
Jorge Padawan
|
a19064cb1b
|
Nueva tabla entryObservation y he juntado la consulta de 1260-navidad con 1260-holydays
|
2020-12-23 12:23:37 +01:00 |
|
Joan Sanchez
|
d8a2184695
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-18 17:24:30 +01:00 |
|
Joan Sanchez
|
42cd2356a2
|
Refactor v2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-18 17:23:04 +01:00 |
|
Bernat Exposito
|
d1793351fb
|
Merge pull request 'fixtures amended for calendar testing' (#484) from 2622-route_tickets_refactor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #484
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-12-18 12:33:18 +00:00 |
 Carlos Jimenez Ruiz
|
177d3cd35b
|
fixtures amended for calendar testing
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 13:16:44 +01:00 |
|
Jorge Benedito
|
29ec268113
|
Merge pull request '2682-supplier_billingData_e2e + fixes' (#482) from 2682-supplier_billingData_e2e into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #482
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
|
2020-12-18 08:34:00 +00:00 |
|
Bernat Exposito
|
0b5a98c2fe
|
export production
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 15:17:03 +01:00 |
|
Jorge Padawan
|
33237dad86
|
Add acl to supplier billing data
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 12:29:37 +01:00 |
|
Joan Sanchez
|
5ecd589106
|
Updated delivery note
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-16 09:24:11 +01:00 |
|
Joan Sanchez
|
0a4016be41
|
Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-11 15:04:55 +01:00 |
|
Joan Sanchez
|
59c622481f
|
Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-10 13:21:11 +01:00 |
|
Joan Sanchez
|
260b502cd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-10 07:30:31 +01:00 |
|
Joan Sanchez
|
1ba1d27ba0
|
2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-27 13:10:39 +01:00 |
|
Bernat Exposito
|
06e7583f2b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-25 12:47:17 +01:00 |
|
Bernat Exposito
|
78f25e0b46
|
export production
|
2020-11-25 12:37:44 +01:00 |
|
Joan Sanchez
|
d40ea52560
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-20 15:06:34 +01:00 |
|
Joan Sanchez
|
7693a1c449
|
2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-20 15:05:57 +01:00 |
|
Joan Sanchez
|
8a3f5345f4
|
Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-16 13:54:47 +00:00 |
|
Joan Sanchez
|
359dcc904d
|
Version merge
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-16 09:08:39 +01:00 |
|
Joan Sanchez
|
8194801308
|
Supplier cargo migration to vn
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-16 08:48:42 +01:00 |
 Juan Ferrer
|
80cbb53dfe
|
Merge branch 'test' into dev
|
2020-11-13 10:49:59 +01:00 |
|
Juan Ferrer
|
cdf6cb661f
|
Login sync fixes
|
2020-11-13 10:33:34 +01:00 |
|
Bernat Exposito
|
6fc14d569c
|
Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 08:32:39 +00:00 |
|
Joan Sanchez
|
cb8e9655af
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 07:22:12 +01:00 |
|
Juan Ferrer
|
4b46b0787b
|
User syncronization fixes, improvements, refactor
|
2020-11-12 23:20:25 +01:00 |
|
Bernat Exposito
|
5be616ad91
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-12 08:04:38 +01:00 |
|
Bernat Exposito
|
eb8931bca5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 13:57:37 +01:00 |
|
Joan Sanchez
|
db4f226f6f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 12:39:15 +01:00 |
|
Bernat Exposito
|
1e95f0105a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
|
2020-11-11 10:52:46 +01:00 |
|
Bernat Exposito
|
75ffa108fb
|
refactor back download
|
2020-11-11 10:52:35 +01:00 |
|
Joan Sanchez
|
08af948eb0
|
Merge branch 'dev' into 2574-itemTag_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 12:39:17 +00:00 |
|
Bernat Exposito
|
e4e4f37609
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-10 08:46:37 +01:00 |
|
Bernat Exposito
|
4ea5993dcc
|
user image
|
2020-11-10 08:39:34 +01:00 |
|
Juan Ferrer
|
2628faa9d0
|
Sync hotfixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-06 22:55:47 +01:00 |
|
Carlos Jimenez Ruiz
|
ead0994032
|
timeControlCalculate procedure updated
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-05 10:33:02 +01:00 |
|
Joan Sanchez
|
4c88a46b63
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor
|
2020-11-05 09:12:25 +01:00 |
|
Joan Sanchez
|
a325ef2a78
|
2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-04 11:29:10 +01:00 |
|
Bernat Exposito
|
2dc51e6125
|
update acl
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-03 09:34:50 +01:00 |
|
Bernat Exposito
|
61c3d2233b
|
delete old sqls
|
2020-11-03 09:34:35 +01:00 |
|
Carlos Jimenez Ruiz
|
d533e9da2e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-03 09:22:07 +01:00 |
|
Bernat Exposito
|
8976034bb0
|
fix fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-03 08:15:49 +01:00 |
|
Bernat Exposito
|
f2ee122778
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
|
2020-11-03 07:51:25 +01:00 |
|
Juan Ferrer
|
fc957eda6c
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 19:58:45 +01:00 |
|
Juan Ferrer
|
b3ab1fe059
|
Sync fixes & improvements
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 19:58:07 +01:00 |
|
Joan Sanchez
|
413283288f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 15:38:23 +01:00 |
|
Bernat Exposito
|
b2d69127cb
|
Merge branch 'dev' into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 14:31:36 +00:00 |
|
Joan Sanchez
|
15b7280222
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-02 14:31:39 +01:00 |