Commit Graph

559 Commits

Author SHA1 Message Date
Juan Ferrer 0bd09492d1 #2026 Implemented & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 20:44:59 +01:00
Juan Ferrer a52fcb587a drop-down e2e fix
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 14:10:07 +01:00
Juan Ferrer 84bf240e71 All tests passed, but some intermittence in e2e
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 23:57:11 +01:00
Juan Ferrer 6dcee3516d ticket e2e fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-23 10:40:09 +01:00
Juan Ferrer acac77ad76 Test fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 15:59:03 +01:00
Juan Ferrer e5dee21926 Pull request fixes 2020-03-18 13:54:05 +01:00
Juan Ferrer b4a5a88943 E2E fixed
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 14:01:25 +01:00
Juan Ferrer 48980c7d38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult 2020-03-17 13:34:54 +01:00
Juan Ferrer 176e38c144 Merge fixes 2020-03-16 18:54:22 +01:00
Juan Ferrer 56a21edeca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult 2020-03-16 18:33:39 +01:00
Juan Ferrer 8629bc25cd Back & Front tests passed 2020-03-16 18:08:44 +01:00
Joan Sanchez f6993b3800 2199 - Show list when multiple rows are found
gitea/salix/pipeline/head This commit looks good Details
2020-03-16 15:55:12 +01:00
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Joan Sanchez 1f8f2d8ad7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-13 11:06:45 +01:00
Joan Sanchez ba19c9069a Removed event 2020-03-13 11:02:40 +01:00
Joan Sanchez 298e52e055 2193 - Chrome datalist hotfix 2020-03-13 11:02:24 +01:00
Joan Sanchez ac2b04d117 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-11 13:38:28 +01:00
Joan Sanchez aba24292cf Module translations
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 13:36:56 +01:00
Bernat Exposito Domenech 67151f8427 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2165-travel_index_buttonClon
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 13:23:34 +01:00
Bernat Exposito b3cb2f7c25 Merge branch '2165-travel_index_buttonClon' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:22:14 +00:00
Joan Sanchez 057bd2cdd1 Merge branch '2175-ticket_send_sms' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:09:05 +00:00
Joan Sanchez 91c354e394 Removed console.log
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:57:49 +01:00
Joan Sanchez 1086e13b2e 2187 - Sort by translated module name
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:29:22 +01:00
Joan Sanchez 14d471fc32 2187 - Sort by translated module name
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:20:15 +01:00
Bernat Exposito Domenech d0b0c9d060 pull request changes 2020-03-11 12:03:55 +01:00
Joan Sanchez 17c8336b23 Removed popover changes 2020-03-11 09:39:05 +01:00
Bernat Exposito Domenech e92030ec6e test
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 09:17:14 +01:00
Joan Sanchez 668c337fb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2175-ticket_send_sms 2020-03-11 08:46:22 +01:00
Bernat Exposito Domenech d35634551b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2165-travel_index_buttonClon 2020-03-11 08:45:11 +01:00
Joan Sanchez 7496bc923e Updated fonts & changed icons
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-11 08:02:58 +01:00
Joan Sanchez 3736dcf792 Added ticket sms options
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 15:01:33 +01:00
Joan Sanchez 98e82ca91d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 14:46:53 +01:00
Joan Sanchez 509f2233fc Added autocomplete property
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 14:37:54 +01:00
Joan Sanchez 3c88a25c2a Added autocomplete property 2020-03-10 14:36:26 +01:00
Joan Sanchez b214de25ce Removed autocomplete completion for chrome 2020-03-10 14:35:24 +01:00
Joan Sanchez 0cd4e2ad9e Added autocomplete property
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 14:28:50 +01:00
Bernat Exposito Domenech 4a5d97996e travel.index clonar 2020-03-10 14:09:26 +01:00
Joan Sanchez 12c37a0703 Removed autocomplete completion for chrome
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 11:36:49 +01:00
Carlos Jimenez Ruiz ebc0889011 Merge branch '2171-show_payment_button' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 15:51:39 +00:00
Carlos Jimenez Ruiz 7a5201a657 Merge branch '2136-http_directive' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 15:50:15 +00:00
Joan Sanchez 41d25078b8 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 12:23:32 +01:00
Joan Sanchez bbeca87295 2172 - Added unit test
gitea/salix/pipeline/head This commit has test failures Details
2020-03-09 12:22:55 +01:00
Joan Sanchez d173ab6a2b 2171 - Mostrar botón "Pago a cuenta" en índice de tickets
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 11:50:23 +01:00
Joan Sanchez e0f87b4b06 http-click unit test
gitea/salix/pipeline/head This commit has test failures Details
2020-03-08 17:42:49 +01:00
Juan Ferrer c6b2db9a79 Savepoint 2020-03-07 13:52:02 +01:00
Joan Sanchez 1f714718bb 1878 - Implementar autenticación en servicio print
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-05 13:56:45 +01:00
Joan Sanchez f062c802ae Unit test 2020-03-05 10:08:02 +01:00
Joan Sanchez f16553ecba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete 2020-03-03 13:59:33 +01:00
Joan Sanchez 5ccc79df8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 08:07:14 +01:00
Joan Sanchez 12aa5da355 Changed fields order
gitea/salix/pipeline/head This commit looks good Details
2020-02-28 07:17:19 +01:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz aedd551371 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2131_jest_spyOn
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-26 13:24:41 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Joan Sanchez 54bb2c4a0a Updated with bug-task description
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 11:37:58 +01:00
Joan Sanchez 442c3ba87c unit tests
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 11:05:29 +01:00
Joan Sanchez 4add07898f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2138-zone_event_m3 2020-02-26 11:00:40 +01:00
Carlos Jimenez Ruiz 37773982dc Merge branch '2087-snackbar_show_counter' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-26 08:39:57 +00:00
Bernat Exposito Domenech 020fd30243 fix crud model test
gitea/salix/1970-test_crud_model This commit looks good Details
2020-02-26 08:57:51 +01:00
Bernat Exposito Domenech 9cad13f166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1970-test_crud_model
gitea/salix/1970-test_crud_model This commit looks good Details
2020-02-26 08:24:21 +01:00
Bernat Exposito Domenech 98f056eff7 finish crud model test
gitea/salix/1970-test_crud_model This commit looks good Details
2020-02-26 08:24:02 +01:00
Bernat Exposito Domenech 0f19247f17 crud model test 2020-02-26 07:32:28 +01:00
Joan Sanchez 9849c60651 Added popover
gitea/salix/2138-zone_event_m3 There was a failure building this commit Details
2020-02-26 07:02:03 +01:00
Carlos Jimenez Ruiz 54fa5e4990 #2137 e2e_snackbar_changes
gitea/salix/2087-snackbar_show_counter This commit looks good Details
2020-02-25 16:36:29 +01:00
Carlos Jimenez Ruiz 4750195c44 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2087-snackbar_show_counter 2020-02-25 15:13:54 +01:00
Joan Sanchez 3643709a80 Added datalist auto completion
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-24 11:27:36 +01:00
Bernat Exposito Domenech 50a8da2064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-21 12:48:37 +01:00
Joan Sanchez 7b57d79f50 Create client geo auto fill
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-21 12:39:41 +01:00
Carlos Jimenez Ruiz 5c4d7bda18 #2137 e2e adaptados a Snackbar con contador 2020-02-21 10:26:40 +01:00
Bernat Exposito Domenech d018d9d536 fonts 2020-02-21 07:44:20 +01:00
Carlos Jimenez Ruiz f7d1482466 snackbar layer overlaping removed
gitea/salix/2087-snackbar_show_counter This commit looks good Details
2020-02-20 11:23:21 +01:00
Carlos Jimenez Ruiz d9783c80d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2087-snackbar_show_counter 2020-02-20 11:01:41 +01:00
Joan Sanchez 6cc2ccf576 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev Something is wrong with the build of this commit Details
2020-02-20 10:58:27 +01:00
Joan Sanchez 4c1ee5ad4a http-click fix
gitea/salix/master This commit looks good Details
2020-02-20 10:57:06 +01:00
Joan Sanchez 17523a2207 hotfix #2135 - Don't enable inputs disabled by ACL directive
gitea/salix/master This commit looks good Details
2020-02-20 09:44:05 +01:00
Joan Sanchez 5e1f31ebdd hotfix #2135 - Don't enable inputs disabled by ACL directive
gitea/salix/2135-hotfix_acl_disabled_input This commit looks good Details
2020-02-20 09:32:47 +01:00
Bernat Exposito Domenech f900b7ef62 crud model test 2020-02-17 13:50:54 +01:00
Joan Sanchez c5840f322f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 845-order_catalog_datalist
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-13 11:38:18 +01:00
Joan Sanchez df873b4ac0 added datalist to catalog filter
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-13 11:05:00 +01:00
Carlos Jimenez Ruiz e8a178d5f4 #2006 e2e route.summary plus refactors 2020-02-12 14:36:05 +01:00
Joan Sanchez c78c154ab0 Added datalist
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-11 14:41:59 +01:00
Joan Sanchez 294e11f848 changes
gitea/salix/1996-datalist_component This commit looks good Details
2020-02-11 11:53:26 +01:00
Joan Sanchez dbcc641016 1996 - Datalist component 2020-02-11 11:34:54 +01:00
Joan Sanchez d3d781220b show snackbar counter
gitea/salix/snackbar_show_counter Build started... Details
gitea/salix/2087-snackbar_show_counter This commit looks good Details
2020-02-10 07:24:12 +01:00
Joan Sanchez c7c79831d5 added crud-model save() unit test
gitea/salix/2076-item_tags_refactor This commit looks good Details
2020-02-06 13:38:46 +01:00
Joan Sanchez b77f32a733 requested changes
gitea/salix/2076-item_tags_refactor There was a failure building this commit Details
2020-02-06 10:43:46 +01:00
Joan Sanchez e3b1a4b58a 2076 - Item tags refactor
gitea/salix/2076-item_tags_refactor This commit looks good Details
2020-02-06 07:41:51 +01:00
Carlos Jimenez Ruiz 7fef6dc2b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-26 21:59:46 +01:00
Javi Gallego 08fda3ed1b #workedHours
gitea/salix/%232037-worked-hours This commit looks good Details
2020-01-24 12:38:08 +01:00
Carlos Jimenez Ruiz f74792dbe9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-24 10:17:08 +01:00
Joan Sanchez 2b2e6532f6 changes to percentage filter
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech cbda081608 refactor sms component
gitea/salix/2000-client.sms This commit looks good Details
2020-01-14 09:10:54 +01:00
Bernat Exposito Domenech 6c4e25bfe3 create entry.index
gitea/salix/1990-create_entry_section This commit looks good Details
2020-01-10 11:52:35 +01:00
Carlos Jimenez Ruiz cb2f94cdaf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-09 13:10:27 +01:00
Joan Sanchez df7493ff14 Updated styles
gitea/salix/1986-claim_draggable_pictures This commit looks good Details
2020-01-08 17:03:08 +01:00
Juan Ferrer a979a17482 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-08 13:53:10 +01:00
Juan Ferrer 5d69f50ac0 vnZoneDeliveryDays hotfixes 2020-01-08 13:27:43 +01:00
Bernat Exposito Domenech 68f437071f refactor client.balance
gitea/salix/1964-client_balance This commit looks good Details
2020-01-02 14:44:51 +01:00
Carlos Jimenez Ruiz e922a05e50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2019-12-31 11:40:15 +01:00
Joan Sanchez 0799e58558 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-23 08:15:25 +01:00
Joan Sanchez 3d4fc9c18e #1963 Entry & zone style changes
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-23 08:05:58 +01:00
Bernat Exposito Domenech 3d21539fb0 travel index filter
gitea/salix/1897travel.index This commit looks good Details
2019-12-20 07:55:00 +01:00
Carlos Jimenez Ruiz 71d7c3f17d eslint rules applyed 2019-12-18 12:49:20 +01:00
Juan Ferrer 60d7e8844d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-17 13:19:09 +01:00
Juan Ferrer a39a35f1a1 1941-autocomplete 2019-12-17 13:18:58 +01:00
Joan Sanchez 7d47757c64 fixed claim responsibility
gitea/salix/master This commit looks good Details
2019-12-17 13:03:09 +01:00
Carlos Jimenez Ruiz f4a62dfa86 Merge branch '1770-calculate_components' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-21 11:30:00 +00:00
Carlos Jimenez Ruiz ac2bab6942 removed unused code
gitea/salix/1891-worker_time_control_tests This commit looks good Details
2019-11-21 11:28:35 +01:00
Carlos Jimenez Ruiz 6a0783d22f #1891 tests for worker time control function 2019-11-21 11:16:10 +01:00
Joan Sanchez c6d1536500 recalculate ticket components
gitea/salix/1770-calculate_components This commit has test failures Details
2019-11-20 06:53:37 +01:00
Carlos Jimenez Ruiz 04b4f60c48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-18 16:35:21 +01:00
Juan Ferrer 4d4e4f31f4 vnZoneEvents refactor
gitea/salix/dev This commit looks good Details
2019-11-18 16:31:37 +01:00
Carlos Jimenez Ruiz d1b114de59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-15 10:37:42 +01:00
Joan Sanchez 6e5f460fab #1867 show warehouses on summary
gitea/salix/dev This commit looks good Details
2019-11-15 07:35:51 +01:00
Juan Ferrer a47dd521a4 Style fix 2019-11-14 15:05:56 +01:00
Juan Ferrer 64124376f0 Final fixes 2019-11-14 14:37:18 +01:00
Juan Ferrer d8d6937093 Style fixes
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-13 09:35:25 +01:00
Juan Ferrer a4f6c64e59 Merge 2019-11-12 09:24:08 +01:00
Juan Ferrer f6050a6c65 Merge 2019-11-12 09:24:01 +01:00
Carlos Jimenez Ruiz d284e36ee6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 08:52:07 +01:00
Bernat 74a2c58954 Bug #1862 fix e2e and front test
gitea/salix/dev This commit looks good Details
2019-11-12 08:51:50 +01:00
Juan Ferrer 95d943e515 E2E fixes 2019-11-11 16:32:03 +01:00
Juan Ferrer efa6ddc0f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor 2019-11-11 16:25:00 +01:00
Joan Sanchez 42524c7f1d increased width to expand class #1845
gitea/salix/dev This commit looks good Details
2019-11-11 13:22:25 +01:00
Juan Ferrer cf6961f5c5 E2E fixes
gitea/salix/1838-searchbar_refactor This commit has test failures Details
2019-11-10 14:13:55 +01:00
Juan Ferrer bee50a6b03 Front tests passed 2019-11-10 13:10:52 +01:00
Juan Ferrer 515234187a First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit Details
2019-11-10 11:08:44 +01:00
Carlos Jimenez Ruiz 76f3dc48e5 #1852 worker.time-control 2019-11-05 11:57:05 +01:00
Carlos Jimenez Ruiz b9be0188d8 manual merge 2019-11-05 09:05:00 +01:00
Carlos Jimenez Ruiz 03ab88bcd9 #1852 worker.time-control 2019-11-05 08:59:48 +01:00
Juan Ferrer 026c608f42 Faster module loading & vnAgencyCalendar bug fixes
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-11-01 13:02:47 +01:00
Juan Ferrer f759c1e11a vnDialog bug fixes & front tests, workerTimeControl date fixes
gitea/salix/dev There was a failure building this commit Details
2019-10-31 15:24:28 +01:00
Juan Ferrer 5a15e65fd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-30 16:57:26 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Javi Gallego 700c092b90 merge 2019-10-29 12:58:26 +01:00
Juan Ferrer 0a4a22ec87 vnInputFile fixed
gitea/salix/dev This commit looks good Details
2019-10-28 21:40:24 +01:00
Juan Ferrer 1b2c383502 vnDialog opens in body, nightmare extensions with detailed errors 2019-10-28 17:31:33 +01:00
Juan Ferrer 47998aaa97 vnDialog opens in body 2019-10-27 01:30:01 +02:00
Juan Ferrer 5ae558e965 Watchers performance fixes 2019-10-26 12:04:48 +02:00
Juan Ferrer c7384bb3ac API path prefix, repeated code removed from tests 2019-10-25 00:53:53 +02:00
Juan Ferrer ee196df2ff vnCompent with most common services as properties
gitea/salix/dev This commit looks good Details
2019-10-24 12:44:36 +02:00
Juan Ferrer 4685b4166b Improved event handling
gitea/salix/dev This commit looks good Details
2019-10-24 10:17:32 +02:00
Juan Ferrer 53003246c3 Merge with upstream 2019-10-23 17:42:41 +02:00
Juan Ferrer 2436bf9488 Agency events - First stable version 2019-10-23 17:38:35 +02:00
Carlos Jimenez Ruiz d5b80e7663 #1831 item.diary no hace scroll
gitea/salix/dev This commit looks good Details
2019-10-23 12:26:57 +02:00
Joan Sanchez 2ed4cf3e4a Item request refactor #1818
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-10-22 13:44:36 +02:00
Juan Ferrer 72017a64ac Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures Details
2019-10-19 01:18:25 +02:00
Juan Ferrer de9a8443ca Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 22:28:08 +02:00
Juan Ferrer 17a150370c Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 21:54:13 +02:00
Juan Ferrer 43fd8fe75e Merge 2019-10-18 21:37:28 +02:00
Juan Ferrer 457034daad Tests fixed 2019-10-18 21:36:30 +02:00