Commit Graph

882 Commits

Author SHA1 Message Date
Joan Sanchez 71e29e747a Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 14:45:39 +02:00
Joan Sanchez cdde4d95d7 Added filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 07:53:03 +02:00
Joan Sanchez 38df5a4d83 2462 - Prevent searchbarfocus on 'state' source
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 08:13:49 +02:00
Joan Sanchez d2dbf417f4 Updated to standard color
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 11:15:35 +02:00
Joan Sanchez c49614b8cf Merge branch 'dev' into 2449-ticket_basicData
gitea/salix/pipeline/head This commit looks good Details
2020-09-23 09:23:09 +00:00
Juan Ferrer 3880e21ce3 Test fixes 2020-09-21 16:09:34 +02:00
Joan Sanchez fa344f4ff6 2449 - Autocompletion
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-19 13:02:00 +02:00
Juan Ferrer 901c00066f Front test fixed
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:47:23 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Bernat Exposito Domenech 174cea7bc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 07:17:23 +02:00
Bernat Exposito Domenech 92e14d5292 update getComponentSum 2020-09-08 07:17:16 +02:00
Carlos Jimenez Ruiz 13f80cd76c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable 2020-09-02 15:52:44 +02:00
Carlos Jimenez Ruiz 605fbe7999 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 13:09:30 +02:00
Carlos Jimenez Ruiz 1c0d5dbd76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-02 09:42:13 +02:00
Joan Sanchez 33aec33cba Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 08:12:32 +02:00
Carlos Jimenez Ruiz 9fa3f17a9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-01 17:45:00 +02:00
Joan Sanchez 6a065091de First version of multicheck selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-01 15:13:33 +02:00
Carlos Jimenez Ruiz a555dea339 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable 2020-09-01 10:51:54 +02:00
Joan Sanchez baf9ec6e70 2416 - Item request - Added state filter
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 08:32:30 +02:00
Carlos Jimenez Ruiz 3a82ef0e06 2375 entry lastBuy seccion
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 16:33:47 +02:00
Carlos Jimenez Ruiz dee3ab166a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-17 14:18:44 +02:00
Joan Sanchez e2c742c893 #2383 - Changed model
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:29:25 +02:00
Joan Sanchez 35c9cf7146 #2331 Refresh data on onFilter() when source is "state"
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 08:47:00 +02:00
Carlos Jimenez Ruiz e974f638dd 2361 ticket sale multi check fix-ish +popover size
gitea/salix/pipeline/head This commit looks good Details
2020-07-30 16:05:48 +02:00
Carlos Jimenez Ruiz b926f8f8ad core component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 17:46:06 +02:00
Carlos Jimenez Ruiz 9d8c64fb92 parts of core component to vnComponent working 2020-07-24 17:04:34 +02:00
Carlos Jimenez Ruiz fbd020e600 front salix component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:55:01 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +02:00
Carlos Jimenez Ruiz 59e43ea17f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable
gitea/salix/pipeline/head This commit looks good Details
2020-07-20 11:51:23 +02:00
Carlos Jimenez Ruiz f2730dd51c some parts of latestsBuys WIP
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-20 11:31:47 +02:00
Joan Sánchez 01b32d2b89 Calendar changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-08 15:05:56 +02:00
Carlos Jimenez Ruiz 0ae7587698 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 16:56:37 +02:00
Carlos Jimenez Ruiz 8794932949 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2295-add_quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 16:44:36 +02:00
Carlos Jimenez Ruiz f2e1f00ae3 using csss variables plus a traduction
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 16:43:45 +02:00
Carlos Jimenez Ruiz 0b8e749939 removed autoLoad from vnTable
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 15:14:57 +02:00
Carlos Jimenez Ruiz 663b5fb9aa descriptor can now have 4 quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 13:28:49 +02:00
Carlos Jimenez Ruiz 1839bb43d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1786-input_validation_Jest
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 12:13:51 +02:00
Carlos Jimenez Ruiz 018e17487e imput validation is ok with Jest 2020-07-03 12:13:42 +02:00
Carlos Jimenez Ruiz 8b040a119f id is now shown in black
gitea/salix/pipeline/head This commit looks good Details
2020-07-02 15:20:11 +02:00
Joan Sanchez c9d94ca814 Reset watcher changes if there's no new data to save
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 09:37:09 +02:00
Joan Sanchez 2c23f3417a Sale selection fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 11:43:53 +02:00
Juan Ferrer 8e51104e1b Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:31:54 +02:00
Juan Ferrer 8ece348b30 Language bug fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:09:40 +02:00
Joan Sanchez ed83fd5f73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption 2020-06-15 09:00:24 +02:00
Bernat Exposito e335775cdb Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:24:23 +00:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Joan Sanchez 48034b234f 2325 - Search address
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 10:53:33 +02:00
Joan Sanchez 5fbcb5c439 2290 - Client consumption
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-10 13:35:41 +02:00
Joan Sanchez ab776fc652 Fixed remove filter
gitea/salix/pipeline/head This commit looks good Details
2020-06-09 12:43:14 +02:00
Joan Sanchez 1fed4c7913 Contextmenu fixes
gitea/salix/pipeline/head This commit looks good Details
2020-06-09 12:16:40 +02:00
Joan Sanchez 6883303bb1 Added scss file
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 13:15:48 +02:00
Joan Sanchez ab1e8fb622 2176 First working version
gitea/salix/pipeline/head This commit has test failures Details
2020-06-08 12:14:27 +02:00
Joan Sanchez 181f2f0148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu
gitea/salix/pipeline/head This commit has test failures Details
2020-06-08 08:19:18 +02:00
Joan Sanchez 048f01305d 2220 - Added clearDisabled param
gitea/salix/pipeline/head This commit looks good Details
2020-06-05 13:14:14 +02:00
Joan Sanchez 16d7186829 Fixed initial filters
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 14:42:58 +02:00
Joan Sanchez 90ae1562dd Added filters
gitea/salix/pipeline/head This commit looks good Details
2020-05-29 11:10:58 +02:00
Joan Sanchez 0fe78a2b8f 2176 - Added contextmenu
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 08:07:26 +02:00
Joan Sanchez aa95a9f984 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 12:33:01 +02:00
Joan Sanchez 03c9b7ffa6 Removed fetchSelection()
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 12:15:41 +02:00
Joan Sanchez d082f5d6c2 2225 Prevent location override
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 11:14:34 +02:00
Carlos Jimenez Ruiz 4df8d78a4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1791_dreprecate_boot-salixjs 2020-05-21 09:25:19 +02:00
Carlos Jimenez Ruiz 44cd2f743f updated the modelInfo route for the tests
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 09:23:44 +02:00
Carlos Jimenez Ruiz d299f455d6 boot/salix.js deprecated
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-21 09:06:02 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech d729efb761 searchbar fix
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 09:03:47 +02:00
Bernat Exposito Domenech 4133021e5c fix translate on plural
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 08:52:20 +02:00
Juan Ferrer c998097ba1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 12:30:00 +02:00
Javi Gallego 692af6078c Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-05-19 10:21:33 +00:00
Juan Ferrer e7cf060e12 Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:51:50 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:27:22 +02:00
Juan Ferrer d7f2e686b1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 09:28:50 +02:00
Javi Gallego a7e6e3d4b7 cr juan
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 08:46:42 +02:00
Joan Sanchez 53b55468fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 11:45:43 +02:00
Carlos Jimenez Ruiz b7b02566d1 fixed tooltip unit test for Jest
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 10:05:54 +02:00
Joan Sanchez 67fc332b46 1833 Currency filter error
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 17:00:55 +02:00
Carlos Jimenez Ruiz c296c454d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test 2020-05-15 16:10:38 +02:00
Joan Sanchez 94a219760c 2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-13 15:04:57 +02:00
Carlos Jimenez Ruiz 3946155e24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test 2020-05-13 09:21:09 +02:00
Juan Ferrer 07cbac7fcd Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 19:56:39 +02:00
Juan Ferrer 7a1bb7e68d Merge branch 'dev' into 1882-descriptorRefactor 2020-05-08 14:01:49 +02:00
Juan Ferrer b14d2f9455 Small fixes in vnOrderCatalog and vnZoneEvents
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 13:23:06 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Javi Gallego 7e895749eb sin use strict
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 08:18:40 +02:00
Javi Gallego 7da7e6cfaf test
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 08:13:25 +02:00
Javi Gallego ceb3d1f4cf all filters tested 2020-04-30 07:20:43 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-25 11:50:04 +02:00
Juan Ferrer a1a460d049 gulp-jamine@4.0.0, waitForSnackbar()
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 11:24:40 +02:00
Juan Ferrer 4336a303c0 Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate 2020-04-07 13:03:57 +02:00
Javi Gallego d835dd60ed 2219 Añadir menu wikipedia 2020-04-06 12:40:21 +02:00
Juan Ferrer 81d50c92ae SCSS em to px: Fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-02 17:06:07 +02:00
Juan Ferrer d75b975b14 SCSS em to px: last refactor fixes 2020-04-02 16:29:13 +02:00
Juan Ferrer 2249f68d6e SCSS px to em: rem for font-size 2020-04-02 15:11:42 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Juan Ferrer c43727aef9 Global style fixes px/em 2020-04-02 14:08:38 +02:00
Juan Ferrer bf68d15264 E2E expeditions fixes, scss px/em fixes 2020-04-02 11:39:39 +02:00
Juan Ferrer eb586c510e E2E focus fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-04-01 16:05:43 +02:00
Carlos Jimenez Ruiz a7c3a7b7b5 tooltip test enabled but not yet fixed 2020-03-31 09:51:10 +02:00
Juan Ferrer dfb9d32c2a Client & ticket E2E fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-30 17:30:03 +02:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:52:41 +01:00
Javi Gallego d53cedd5d4 preparado para PR
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:41:40 +01:00
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 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