Commit Graph

821 Commits

Author SHA1 Message Date
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 209251bf8b 2173 - descriptor_quicklink
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 14:11:43 +01: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
Carlos Jimenez Ruiz 0bf0ed78ee Merge branch '2056-entry_descriptor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-25 10:49:40 +00:00
Joan Sanchez 447cdc686e 2138 - Added field m3Max to zoneEvent 2020-02-25 08:08:13 +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
Juan Ferrer 777a2e5fed Prevent index caching, automatic docker ports
gitea/salix/master This commit looks good Details
2020-01-29 14:43:15 +01:00
Carlos Jimenez Ruiz e53ce1ce1b removed debug info to prevent click issues
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 09:34:05 +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
Joan Sanchez de05cadef4 Merge branch '1975-delivery_note_tags' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-10 11:09:29 +00: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
Joan Sanchez 16a9a1f5f8 updated styles
gitea/salix/1975-delivery_note_tags This commit looks good Details
2020-01-10 11:29:11 +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 e637f32aaa removed opacity effects
gitea/salix/1986-claim_draggable_pictures This commit looks good Details
2020-01-09 08:18:13 +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
Juan Ferrer 1407b7b76f Nginx config fixes
gitea/salix/test This commit looks good Details
2019-12-19 15:45:19 +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
Juan Ferrer 6f07f7f990 Back autoheal & health-check
gitea/salix/test This commit looks good Details
2019-12-08 12:31:32 +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 1c035ca045 All tests fixed
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-12 14:18:46 +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 470b966e85 Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 22:54: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
Joan Sanchez b2b76b05d8 css fixes + back unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 13:27:50 +02:00
Joan Sanchez 4ca001d98e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 11:09:03 +02:00
Joan Sanchez 79f9e616d2 added treeview unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 11:08:40 +02:00
Joan Sanchez 6d159c50a0 css fixes
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-16 09:52:46 +02:00
Joan Sanchez dadfc92ebd pull from dev 2019-10-16 09:52:32 +02:00
Joan Sanchez 7aaa8f4a5e refactor drag & drop treeview
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-16 08:56:13 +02:00
Juan Ferrer a2881e5b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 16:19:38 +02:00
Juan Ferrer 3bf44d08de vnDatePicker refactor 2019-10-15 16:19:35 +02:00
Carlos Jimenez Ruiz 8291e97d74 removed todo coments as per #1782 2019-10-14 12:01:19 +02:00
Juan Ferrer 7dfd1fe6f2 Merge
gitea/salix/dev This commit looks good Details
2019-10-11 17:43:29 +02:00
Juan Ferrer a72c12e1c9 Tests passed 2019-10-11 17:38:04 +02:00
Joan Sanchez 21c32b0af2 dialog css fixes
gitea/salix/dev This commit has test failures Details
2019-10-10 08:07:11 +02:00
Juan Ferrer a9d5e87078 vnField alpha with ngModel 2019-10-10 00:47:29 +02:00
Juan Ferrer fc09d76422 Merge 2019-10-08 23:57:54 +02:00
Juan Ferrer 757fc6fe23 vnField stable & applied to all field except vnTextfield 2019-10-08 23:57:02 +02:00
Carlos Jimenez Ruiz 7db4945a6d #1702 Autocomplete data refresh and #1754 watcher
gitea/salix/dev This commit has test failures Details
2019-10-08 17:27:27 +02:00
Joan Sanchez 9358602471 #15 Updated changes width dev
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 13:03:19 +02:00
Joan Sanchez 770a60546a space
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 09:40:28 +02:00
Joan Sanchez eb655215f4 merge pull changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 09:23:29 +02:00
Joan Sanchez b32cf4a386 last refactor
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 07:22:38 +02:00
Juan Ferrer 4f92cafe30 CSS border style classes
gitea/salix/dev This commit has test failures Details
2019-10-06 20:13:24 +02:00
Juan Ferrer 06fad628bc vnCrudModel.status fix
gitea/salix/dev This commit has test failures Details
2019-10-05 00:23:34 +02:00
Juan Ferrer b12a666653 CSS padding/margin refactor, glob styles in core 2019-10-05 00:16:57 +02:00
Juan Ferrer f8ef70b0bb #1752 Fixes
gitea/salix/dev This commit looks good Details
2019-10-04 17:11:27 +02:00
Juan Ferrer ee6a267ac8 #1752 Fixes & CSS refactor 2019-10-04 16:55:54 +02:00
Juan Ferrer 9b385f4b90 #1749 Fixed
gitea/salix/dev This commit looks good Details
2019-10-04 13:12:53 +02:00
Juan Ferrer 9f2d137906 New: vnToggle, vnField, vnCheck & vnRadio refactor
gitea/salix/dev This commit looks good Details
2019-10-04 12:33:16 +02:00
Joan Sanchez 366d1123d4 Destroy transclude scopes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-04 12:20:49 +02:00
Joan Sanchez 8e80f53d30 show buttons on hover
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-04 11:01:47 +02:00
Joan Sanchez 9919f9a46e add & remove childs
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-04 07:41:24 +02:00
Juan Ferrer c6e8498281 ModelProxy.status, Paging removed, locale fixes
gitea/salix/dev This commit looks good Details
2019-10-03 19:34:24 +02:00
Joan Sanchez a8f2000f3f Cambios mockup #1745
gitea/salix/dev This commit looks good Details
2019-10-03 11:37:44 +02:00
Juan Ferrer ec9797a4b3 vnDataViewer applied to all module indexes
gitea/salix/dev This commit looks good Details
2019-10-02 21:02:49 +02:00
Juan Ferrer b3c7073587 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-02 19:24:55 +02:00
Juan Ferrer 87add6cd33 vnDataViewer 2019-10-02 19:24:42 +02:00
Joan Sanchez 6a184496d6 treeview refactor 2
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-02 14:12:17 +02:00
Carlos Jimenez Ruiz bae70e24f8 #1304 Scroll Down en boton others client left menu
gitea/salix/dev This commit looks good Details
2019-10-02 13:11:54 +02:00
Carlos Jimenez Ruiz 132cfef4e9 #1304 Scroll Down en boton others client left menu
gitea/salix/dev There was a failure building this commit Details
2019-10-02 12:56:19 +02:00
Joan Sanchez 9473636b5b treeview refactor
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-02 09:54:52 +02:00
Juan Ferrer 34e141e159 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-01 16:21:20 +02:00
Juan Ferrer 21992d3e69 Minimal style fixes 2019-10-01 16:21:08 +02:00
Juan Ferrer 76604744d1 Global & client style fixes 2019-10-01 16:17:57 +02:00
Joan Sanchez 183d770483 first changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-01 15:09:55 +02:00
Carlos Jimenez Ruiz f65e0cd5bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-01 14:01:18 +02:00
Carlos Jimenez Ruiz df8a823736 #499 deprecate client/core/src/lib/template.js 2019-10-01 14:01:05 +02:00
Juan Ferrer 4e4919c1e2 Agency fixes & exclusion with left calendar 2019-10-01 13:45:43 +02:00
Juan Ferrer daeb4bed09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-01 11:15:25 +02:00
Juan Ferrer 0bd852604a Refactor: vnCheck, vnRadio, vnTreeview, vnNumber 2019-10-01 11:15:15 +02:00
Joan Sanchez 26be791cf0 fixed styles
gitea/salix/dev This commit has test failures Details
gitea/salix/test This commit looks good Details
2019-10-01 10:35:27 +02:00
Juan Ferrer eba854f0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-30 20:46:34 +02:00
Juan Ferrer 679c6af0df #1297 Angular material removed from project 2019-09-30 20:46:22 +02:00
Joan Sanchez 6d54e7a89d Claim dms upload file with drag & drop #1731
gitea/salix/dev There was a failure building this commit Details
2019-09-30 14:57:54 +02:00
Javi Gallego 0573fec950 merge
gitea/salix/dev This commit has test failures Details
2019-09-30 14:37:51 +02:00
Javi Gallego 1c2759eb0f # 496 sustituir interpolate por plantillas angular 2019-09-30 14:32:42 +02:00
Juan Ferrer a177ad8e26 Fixes 2019-09-30 13:02:11 +02:00
Juan Ferrer 55133ded68 Fixes 2019-09-30 11:31:10 +02:00
Juan Ferrer 2bcdcaa133 #1285 fixed, vnInputTime fixes 2019-09-30 11:30:54 +02:00
Juan Ferrer 83c6d15eb1 Calendar fixes
gitea/salix/dev This commit looks good Details
2019-09-26 15:39:08 +02:00
Juan Ferrer dbd70da866 Merge
gitea/salix/dev This commit looks good Details
2019-09-26 13:36:22 +02:00
Joan Sanchez ca4009088d Descuadre de meses componente calendar #1733
gitea/salix/dev This commit looks good Details
2019-09-26 10:43:06 +02:00
Juan Ferrer c0f39ba87f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 10:09:07 +02:00
Carlos Jimenez Ruiz 156c9ec3ab #1716 ticket.summary añadir link a la Ruta
gitea/salix/dev This commit looks good Details
2019-09-26 09:05:54 +02:00
Juan Ferrer 91e4e62a1c Merge branch 'test' into dev 2019-09-26 08:44:00 +02:00
Juan Ferrer 2a0cc1dc8b Style/i18n fixes 2019-09-25 23:09:10 +02:00
Juan Ferrer 91b5ad5a3e Merge 2019-09-25 20:11:14 +02:00
Juan Ferrer 98cc3ce00e Agency events, delivery days viewer 2019-09-25 20:06:42 +02:00
Carlos Jimenez Ruiz d1acd60d5a added a precise selector #1680
gitea/salix/dev This commit looks good Details
2019-09-24 13:22:01 +02:00
Carlos Jimenez Ruiz 25165792c8 #1680 left-menu descriptor scrollbar overlap 2019-09-24 09:29:57 +02:00
Joan Sanchez 7f33f4c56e fixed salixfront deletedTicket icon
gitea/salix/dev This commit looks good Details
2019-09-24 07:25:22 +02:00
Joan Sanchez e55b8b7b6b precio por kilo #1690
gitea/salix/dev This commit looks good Details
2019-09-23 14:41:54 +02:00
Carlos Jimenez Ruiz 695ff14b60 removed the tests index used by karma (deprecated)
gitea/salix/dev This commit looks good Details
2019-09-23 14:17:44 +02:00
Carlos Jimenez Ruiz 0f04aed2fe #1670 Crear icono isDeleted para ticket.descriptor
gitea/salix/dev There was a failure building this commit Details
2019-09-20 17:20:54 +02:00
Carlos Jimenez Ruiz b0e5b46245 #969 componente vnSearchBar front test
gitea/salix/dev There was a failure building this commit Details
2019-09-20 09:35:12 +02:00
Juan Ferrer afb06dd4a5 #1167 Fixed
gitea/salix/dev There was a failure building this commit Details
2019-09-19 12:32:34 +02:00
Carlos Jimenez Ruiz b12d0388c9 #1074 Undo changes button for forms 2019-09-18 09:41:25 +02:00
Carlos Jimenez Ruiz 206dec59a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz 2251fb65ad #1615 migrar karma a jest 2019-09-13 16:09:14 +02:00
Joan Sanchez 248dff2747 cherry-pick
gitea/salix/master This commit looks good Details
2019-09-12 14:18:47 +02:00
Joan Sanchez f0253fd1ce Increased max file size up to 250MB
gitea/salix/dev This commit looks good Details
2019-09-12 14:16:09 +02:00
Joan Sanchez f6bd915ae6 Ticket dms CSS fixes #1692
gitea/salix/dev This commit looks good Details
2019-09-12 11:47:56 +02:00
Joan Sanchez ac26d224dd updated fonts & added "Fruit" item category #1688
gitea/salix/master Something is wrong with the build of this commit Details
2019-09-12 07:21:43 +02:00
Joan Sanchez 28ca32175e updated fonts & added "Fruit" item category #1688
gitea/salix/dev This commit looks good Details
2019-09-12 07:20:48 +02:00
Joan Sanchez 1f5a75b285 fixed karma unit tests
gitea/salix/dev This commit looks good Details
2019-09-09 10:57:10 +02:00
Joan Sanchez 7a1ae9177b Special characters not allowed on socialName #1635
gitea/salix/dev There was a failure building this commit Details
2019-09-09 09:05:13 +02:00
Joan Sanchez 178dc6f2e8 Minor changes
gitea/salix/dev This commit looks good Details
2019-09-06 08:07:46 +02:00
Joan Sanchez 176750046a Scroll component #643
gitea/salix/dev This commit looks good Details
2019-09-05 13:06:40 +02:00
Joan Sanchez 693c204e21 Calendar last day selection fixed #1465 2019-09-04 08:42:01 +02:00
Carlos Jimenez Ruiz c1cca30a26 bug fix icon add ticket.sales enables/disables
gitea/salix/dev This commit looks good Details
2019-09-03 14:42:52 +02:00
Bernat b656db3a84 #1645 refactor search panel
gitea/salix/dev This commit looks good Details
2019-08-29 08:32:46 +02:00
Carlos Jimenez Ruiz c498216f0b #1647 ticket.menu la barra de desplazamiento
gitea/salix/dev This commit looks good Details
2019-08-23 10:17:41 +02:00
Bernat c58d94ccd8 fix getCurrentUserName front test
gitea/salix/dev This commit looks good Details
2019-08-19 08:28:46 +02:00
Bernat 7eea9d1d2c Refactor #1630 state.js
gitea/salix/dev There was a failure building this commit Details
2019-08-19 07:56:20 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598
gitea/salix/dev This commit looks good Details
2019-08-08 08:37:03 +02:00
Joan Sanchez 2ff374e7ba postcode autocompletion fixes
gitea/salix/master This commit looks good Details
2019-08-02 08:28:44 +02:00
Joan Sanchez 2c71a983e3 postcode autocompletion fixes
gitea/salix/dev This commit looks good Details
2019-08-02 08:27:55 +02:00
Joan Sanchez e3c4536183 timeControl calendar fixed #1623
gitea/salix/master This commit looks good Details
2019-08-01 10:29:26 +02:00
Joan Sanchez 31b5f689df timeControl calendar fixed #1623
gitea/salix/dev This commit looks good Details
2019-08-01 09:58:59 +02:00
Joan Sanchez 77d8ac82a5 contabilize worker.calenday holidays, updated styles
gitea/salix/test This commit looks good Details
2019-07-31 09:51:08 +02:00
Joan Sanchez eccf381e56 contabilize worker.calenday holidays, updated styles
gitea/salix/dev This commit has test failures Details
2019-07-31 09:50:47 +02:00
Joan Sanchez 64a4e5f43d ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good Details
2019-07-26 11:48:01 +02:00
Joan Sanchez 51734db404 ticket dms local warehouse and company
gitea/salix/dev There was a failure building this commit Details
2019-07-17 15:01:38 +02:00
Joan Sanchez 588250b1c1 dms update files
gitea/salix/dev This commit looks good Details
2019-07-15 11:40:11 +02:00
Joan Sanchez 9d0b88cd57 nginx
gitea/salix/master This commit looks good Details
2019-07-11 17:22:42 +02:00
Joan Sanchez 597e271789 revert
gitea/salix/master This commit looks good Details
2019-07-11 17:15:28 +02:00
Joan Sanchez 57a0a4113a increased nginx file size limit
gitea/salix/master This commit looks good Details
2019-07-11 17:07:25 +02:00
Joan Sanchez b29dd291ab removed console log
gitea/salix/dev This commit looks good Details
2019-07-08 14:17:12 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585
gitea/salix/dev This commit looks good Details
2019-07-08 14:07:09 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Joan Sanchez 507bc8c2ce updated fonts & calendar acls
gitea/salix/dev This commit looks good Details
2019-06-27 11:48:33 +02:00
Carlos Jimenez Ruiz a7c5a9e598 #1566 ticket.sales state autocomplete 2019-06-27 09:44:19 +02:00
Joan Sanchez 8ff61a5d3a added zone prices, radio-group and calendar refactor #1320
gitea/salix/dev This commit looks good Details
2019-06-26 13:35:38 +02:00
Carlos Jimenez Ruiz 2ce442a022 #1555 ticket.lines transer to a new ticket
gitea/salix/dev This commit looks good Details
2019-06-25 11:17:58 +02:00
Joan Sanchez 7fd6c850d7 lock controls #1533
gitea/salix/dev There was a failure building this commit Details
2019-06-20 13:50:58 +02:00
Joan Sanchez 471da18a6c optional bank entity code #1416
gitea/salix/dev There was a failure building this commit Details
2019-06-17 08:14:48 +02:00
Joan Sanchez 0d3efd2549 fixed table "No results" message #1535
gitea/salix/dev This commit looks good Details
2019-06-14 08:41:21 +02:00
Joan Sanchez 9c00e7e67c Autocomplete geolocation from postcode #1519 and #1531
gitea/salix/dev This commit looks good Details
2019-06-13 13:08:11 +02:00
Juan Ferrer 03205e01ae NPM fix, fdescribe removed
gitea/salix/dev This commit looks good Details
2019-06-13 09:49:36 +02:00
Joan Sanchez 43e87a1cb1 mege from test to dev - no structure
gitea/salix/dev This commit looks good Details
2019-06-07 13:07:23 +02:00
Joan Sanchez 2bbcc402de added treeview margin #1507
gitea/salix/dev This commit looks good Details
2019-06-06 15:01:47 +02:00
Joan Sanchez c28734ff61 added dms tasks #1499, #1469, #1468, #1484
gitea/salix/dev There was a failure building this commit Details
2019-06-06 13:59:11 +02:00
Joan Sanchez 68f67f12d7 moveNext() movePrevious() moves now to day 1 to prevent a month jump
gitea/salix/dev This commit has test failures Details
2019-05-31 13:28:28 +02:00
Carlos Jimenez Ruiz 2c012b084a #1476 ticket.Sale check all checkbox
gitea/salix/dev This commit looks good Details
2019-05-28 06:57:56 +02:00
Carlos Jimenez Ruiz 027602e18a #1476 ticket.Sale check all checkbox
gitea/salix/dev This commit looks good Details
2019-05-27 15:10:57 +02:00
Carlos Jimenez Ruiz b6fbeb43e8 updated confirm html 2019-05-23 10:01:25 +02:00
Joan Sanchez 52e26eb99d mark manual lines #1449
gitea/salix/dev This commit looks good Details
2019-05-21 12:56:29 +02:00
Joan Sanchez 183bf137f6 added workerTimeControl #1360
gitea/salix/dev This commit has test failures Details
2019-05-17 13:27:51 +02:00
Carlos Jimenez Ruiz 417dc511f5 #1430 client.balance bug fix and e2e fix
gitea/salix/dev This commit looks good Details
2019-05-15 15:26:13 +02:00
Carlos Jimenez Ruiz 2358c94aae #1402 route.ticket 2019-05-15 13:07:32 +02:00
Joan Sanchez eae6a6f43c show spinner on load for table & catalog components #1424
gitea/salix/dev This commit looks good Details
2019-05-10 14:42:46 +02:00
Carlos Jimenez Ruiz da04d409a3 #1415 implementar color legend en worker.calendar
gitea/salix/dev This commit has test failures Details
2019-05-10 13:16:37 +02:00
Carlos Jimenez Ruiz 6f83f03400 #1411 Componente leyenda de colores 2019-05-09 14:17:44 +02:00
Bernat e43b7be526 1397 client.descriptor change icon to icon-basketadd
gitea/salix/dev This commit looks good Details
2019-05-07 11:55:47 +02:00
Joan Sanchez 6db35d744d multicheck checking all elements on pagination if checked 2019-04-30 11:20:37 +02:00
Joan Sanchez 6c3cea56aa fixed multi-check karma unit tests
gitea/salix/dev This commit looks good Details
2019-04-30 09:19:40 +02:00
Joan Sanchez a572130b6c propagate check value to multicheck component for intermediate value #1305
gitea/salix/dev There was a failure building this commit Details
2019-04-30 08:00:27 +02:00
Joan Sanchez 69403223d8 fixed treeview #1374
gitea/salix/dev This commit looks good Details
2019-04-29 11:49:43 +02:00
Carlos Jimenez Ruiz 2ca85394f3 #1385 excluded tests
gitea/salix/dev This commit looks good Details
2019-04-26 16:10:51 +02:00
Joan Sanchez 145a5e85eb dropdown element name without translation
gitea/salix/dev This commit looks good Details
2019-04-26 12:41:30 +02:00
Joan Sanchez 16bf0b3448 regenerate invoice #1342
gitea/salix/dev This commit looks good Details
2019-04-26 08:52:43 +02:00
Juan Ferrer b6c95f262f Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-25 13:23:19 +02:00
Juan Ferrer 2ebc5de441 Nginx now logs original proxy src/dst hosts
gitea/salix/test This commit looks good Details
2019-04-25 13:22:49 +02:00
Joan Sanchez 76269a8a16 added drag & drop directives on worker department #1319
gitea/salix/dev This commit has test failures Details
2019-04-23 08:29:23 +02:00
Carlos Jimenez Ruiz 7595905c5e front unit test from invoiceOut now included in the index file
gitea/salix/dev This commit looks good Details
2019-04-17 11:31:37 +02:00
Bernat dbe56b2496 #1330 add info in the search panel
gitea/salix/dev This commit has test failures Details
2019-04-12 14:33:08 +02:00
Joan Sanchez ac8a27d2f4 Added ticket invoice #1310
gitea/salix/dev This commit has test failures Details
2019-04-12 13:54:31 +02:00