 Joan Sanchez
|
780f1e4773
|
renamed expence to expense and added field
gitea/salix/1919-ticket_service_type There was a failure building this commit
Details
|
2019-12-13 11:59:25 +01:00 |
|
Joan Sanchez
|
2325127390
|
pull from dev
gitea/salix/1921-claim_detail_discount This commit looks good
Details
|
2019-12-13 08:40:59 +01:00 |
 Juan Ferrer
|
008669b8a1
|
Merge branch '1912' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-13 07:28:39 +00:00 |
|
Joan Sanchez
|
7bbb9fa321
|
Pull from dev
gitea/salix/1921-claim_detail_discount This commit looks good
Details
|
2019-12-13 08:26:27 +01:00 |
 Javi Gallego
|
44304e993a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912
gitea/salix/1912 This commit looks good
Details
|
2019-12-13 08:19:22 +01:00 |
|
Joan Sanchez
|
676b5198a8
|
changed discount popover width + refresh discount
gitea/salix/1921-claim_detail_discount This commit looks good
Details
|
2019-12-13 08:01:13 +01:00 |
 Bernat Exposito
|
6d1bd7575d
|
Merge branch '1925excludeTables' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-13 06:17:03 +00:00 |
 Carlos Jimenez Ruiz
|
e8bf326b53
|
Merge branch 'pull-request-check-test' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-12 15:27:11 +00:00 |
|
Juan Ferrer
|
a47fa7a413
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into pull-request-check-test
gitea/salix/pull-request-check-test This commit looks good
Details
|
2019-12-12 15:15:28 +01:00 |
|
Juan Ferrer
|
7e5f6e6acf
|
Pull request check test
gitea/salix/pull-request-check-test This commit has test failures
Details
|
2019-12-12 15:02:58 +01:00 |
|
Juan Ferrer
|
d61b08ed10
|
Merge branch '1922-mysql8' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-12 13:49:05 +00:00 |
Bernat Exposito Domenech
|
0ef036caf9
|
traduccion
gitea/salix/1925excludeTables This commit looks good
Details
|
2019-12-12 14:31:22 +01:00 |
|
Bernat Exposito Domenech
|
1194f735a6
|
traduccion
|
2019-12-12 14:31:08 +01:00 |
|
Bernat Exposito Domenech
|
e8c216799c
|
update estructure
gitea/salix/1925excludeTables This commit looks good
Details
|
2019-12-12 14:28:58 +01:00 |
|
Javi Gallego
|
ec081e6a3a
|
campo claimDestinationFk ya no esta como required
gitea/salix/1912 This commit looks good
Details
|
2019-12-12 13:53:54 +01:00 |
|
Carlos Jimenez Ruiz
|
8a2eda7c08
|
Merge branch '1923-ticket-summary-discount' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-12 10:06:47 +00:00 |
|
Carlos Jimenez Ruiz
|
34a70fa1db
|
Merge branch '1920-remove-sms-password' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-12 10:04:37 +00:00 |
|
Joan Sanchez
|
62aae9ce14
|
removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good
Details
|
2019-12-12 09:46:29 +01:00 |
|
Carlos Jimenez Ruiz
|
4d493c3572
|
Merge branch 'E2E-fix-for-windows' of verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-12-12 07:25:22 +00:00 |
|
Joan Sanchez
|
af47ab6cac
|
fixed styles & discounts
gitea/salix/1923-ticket-summary-discount There was a failure building this commit
Details
|
2019-12-12 08:22:04 +01:00 |
|
Juan Ferrer
|
34bbf16e14
|
Focus removed from test
gitea/salix/1922-mysql8 This commit looks good
Details
|
2019-12-11 15:01:27 +01:00 |
|
Juan Ferrer
|
3428dfa6e0
|
Migration complete & test
|
2019-12-11 15:01:01 +01:00 |
|
Carlos Jimenez Ruiz
|
304355fb9d
|
Merge branch '1900travelCreate' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-10 11:51:40 +00:00 |
|
Bernat Exposito Domenech
|
17acfc2631
|
update translations
gitea/salix/1900travelCreate This commit looks good
Details
|
2019-12-10 08:18:53 +01:00 |
|
Bernat Exposito Domenech
|
2cc9c5e951
|
create section travel create
gitea/salix/1900travelCreate This commit looks good
Details
|
2019-12-09 12:15:19 +01:00 |
|
Juan Ferrer
|
966c02a0e1
|
JS doc fixes
gitea/salix/dev This commit has test failures
Details
|
2019-12-08 11:45:53 +01:00 |
|
Bernat Exposito
|
a6c5563513
|
Merge branch '1834createTravelModels' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-05 13:29:27 +00:00 |
|
Bernat Exposito Domenech
|
f6eabc81da
|
add models and update structure db
gitea/salix/1834createTravelModels This commit looks good
Details
|
2019-12-05 14:20:11 +01:00 |
|
Javi Gallego
|
9f047dc615
|
Merge branch '1904/upgradeStructureDb' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-04 10:53:14 +00:00 |
|
Bernat
|
da2503d4b8
|
fix test
gitea/salix/1904%2FupgradeStructureDb This commit looks good
Details
|
2019-12-04 11:18:26 +01:00 |
|
Bernat
|
261b9686a0
|
update procedures db
|
2019-12-04 11:10:24 +01:00 |
|
Bernat
|
f38210ddd2
|
udate structure db
|
2019-12-04 11:09:36 +01:00 |
|
Javi Gallego
|
b8a0e69535
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into E2E-fix-for-windows
gitea/salix/E2E-fix-for-windows This commit looks good
Details
|
2019-11-28 12:55:41 +01:00 |
|
Javi Gallego
|
3c36526f12
|
E2E fix for windows plus refactors
|
2019-11-28 12:54:34 +01:00 |
|
Carlos Jimenez Ruiz
|
3163dfa19e
|
Merge branch '1772-campaign_metrics' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-28 07:42:16 +00:00 |
|
Carlos Jimenez Ruiz
|
909fef5e86
|
#1903 informe consumo campaña
gitea/salix/1772-campaign_metrics This commit looks good
Details
|
2019-11-28 08:30:36 +01:00 |
|
Carlos Jimenez Ruiz
|
f4e0d04b64
|
#1903 informe consumo campaña
gitea/salix/1772-campaign_metrics This commit looks good
Details
|
2019-11-27 16:16:22 +01:00 |
|
Carlos Jimenez Ruiz
|
ee92ec42f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics
|
2019-11-27 16:02:14 +01:00 |
|
Carlos Jimenez Ruiz
|
8624a3db68
|
#1903 informe consumo campaña removed comented code
|
2019-11-27 16:02:07 +01:00 |
|
Carlos Jimenez Ruiz
|
0c0ae14263
|
#1903 informe consumo campaña
|
2019-11-27 16:00:42 +01:00 |
|
Carlos Jimenez Ruiz
|
84d32a2a70
|
Merge branch '1904delete_vn2008_references' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-27 12:42:47 +00:00 |
|
Bernat
|
8f4e44aa37
|
update procedures db
gitea/salix/1904delete_vn2008_references This commit looks good
Details
|
2019-11-27 13:37:36 +01:00 |
|
Bernat
|
dcdd4473b1
|
fix structure db
gitea/salix/1904delete_vn2008_references This commit looks good
Details
|
2019-11-27 11:57:09 +01:00 |
|
Bernat
|
89e127f0ea
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1904delete_vn2008_references
gitea/salix/1904delete_vn2008_references This commit looks good
Details
|
2019-11-26 14:26:50 +01:00 |
|
Bernat
|
18b5342609
|
update fixtures and structure db
|
2019-11-26 14:15:43 +01:00 |
|
Carlos Jimenez Ruiz
|
74213ad880
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics
|
2019-11-26 06:55:50 +01:00 |
|
Bernat Exposito
|
a4a48e76a4
|
Merge branch '1762-worker_dms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-25 08:33:04 +00:00 |
|
Joan Sanchez
|
f9dba9489f
|
updated tests
gitea/salix/1762-worker_dms This commit looks good
Details
|
2019-11-25 09:17:24 +01:00 |
|
Carlos Jimenez Ruiz
|
58ee076524
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics
|
2019-11-25 09:14:39 +01:00 |
|
Joan Sanchez
|
8fc76b49c9
|
summary unit tests #1905
gitea/salix/dev This commit looks good
Details
|
2019-11-25 08:35:34 +01:00 |