Commit Graph

7524 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz d5c366b1da Merge pull request 'edit e2e client web access' (#314) from 2327-e2e_edit_web-access into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-16 10:14:44 +00:00
Joan Sanchez 330b268c2c Merge pull request 'hasta precio' (#315) from hasta-precio into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-06-16 08:58:48 +00:00
Javi Gallego 552828a1ba hasta precio
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:47:01 +02:00
Bernat Exposito Domenech 201c6173e2 edit e2e client web access
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:32:32 +02:00
Bernat Exposito ecf1a1159c Merge pull request '2332 - Fixed on load error' (#313) from 2332-claim_detail_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-16 07:04:59 +00:00
Joan Sanchez 7fd77bdaef 2332 - Fixed on load error
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 08:50:59 +02:00
Joan Sanchez 1b71c1b3b1 Merge pull request '2290-client_consumption' (#307) from 2290-client_consumption into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 07:21:16 +00:00
Joan Sanchez 279677bda9 Removed report from descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-15 09:07:13 +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
Bernat Exposito 70d5c641ad Merge pull request '2293 - getVolume() call to saleVolume' (#309) from 2293-getVolume into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:16:55 +00:00
Bernat Exposito db1bceb5f4 Merge pull request '2239 - Added services' (#310) from 2239-report_service_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:14:51 +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 36ec930878 Updated test
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 12:01:53 +02:00
Joan Sanchez 3d388ad226 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-12 11:39:33 +02:00
Joan Sanchez dddfe2773a 2293 - getVolume() call to saleVolume
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-12 11:26:32 +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 cba5fb01a6 Removed onused styles
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:28:44 +02:00
Joan Sanchez b3db5681fe 2290 - Added consumption section
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:18:19 +02:00
Carlos Jimenez Ruiz a66cc4a36d Merge pull request 'gulpfile refactor and removed unused code' (#294) from 2266_refactor_gulpfile_docker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-06-11 10:10:38 +00:00
Carlos Jimenez Ruiz 42b21047f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2266_refactor_gulpfile_docker
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 11:42:10 +02:00
Joan Sanchez 8688c2899b Merge pull request '2321-log_web_access' (#306) from 2321-log_web_access into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-11 09:41:35 +00:00
Carlos Jimenez Ruiz aa9ec30e34 updated package.json and readme
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 11:16:28 +02:00
Carlos Jimenez Ruiz 3f92b6fcaa removed private function description as it is no longer exported
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-11 11:02:47 +02:00
Carlos Jimenez Ruiz d4f1a90f87 ip botained for ci and localhost
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 10:37:55 +02:00
Bernat Exposito Domenech f9025bef98 delete test
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 10:37:40 +02:00
Carlos Jimenez Ruiz a6b6853ec4 Merge pull request '2283_e2e_delete_ticket_with_stowaway' (#305) from 2283_e2e_delete_ticket_with_stowaway into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-11 08:14:51 +00:00
Carlos Jimenez Ruiz 477b1c8e1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2266_refactor_gulpfile_docker 2020-06-11 10:13:54 +02:00
Carlos Jimenez Ruiz fadf36da69 added a css selector to selectors
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 09:20:44 +02:00
Carlos Jimenez Ruiz 1d591c7ddd removed unused selector
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-11 09:00:50 +02:00
Bernat Exposito Domenech 061dceb2b0 test client hook 2020-06-11 08:46:03 +02:00
Bernat Exposito Domenech 2c5f44f94a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access 2020-06-11 08:45:16 +02:00
Carlos Jimenez Ruiz 54845da836 e2e isDeleted
gitea/salix/pipeline/head This commit looks good Details
2020-06-10 16:51:04 +02:00
Carlos Jimenez Ruiz 538ae75b89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway 2020-06-10 16:24:17 +02:00
Joan Sanchez 8f6b426624 Merge pull request '2323 - Filter by myTeam fix' (#304) from 2323-ticket_filter_myTeam into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-10 12:16:50 +00:00
Joan Sanchez 5edfc59d97 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-06-10 13:57:32 +02:00
Joan Sanchez 461fec7e64 Updated unit test 2020-06-10 13:57:08 +02:00
Carlos Jimenez Ruiz 4b1e79a433 2314 server side unit test fixed 2020-06-10 13:50:03 +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 3cfb8b4730 2323 - Filter by myTeam fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-10 12:13:07 +02:00
Bernat Exposito Domenech d2aca11e16 log web access, create hook in client
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-10 12:09:27 +02:00
Bernat Exposito Domenech 704e27a657 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access
gitea/salix/pipeline/head This commit looks good Details
2020-06-10 12:08:54 +02:00
Bernat Exposito Domenech ee58aebe16 first step, client hook
gitea/salix/pipeline/head This commit looks good Details
2020-06-10 09:26:51 +02:00
Joan Sanchez 4b262dc3cc Disabled contextmenu option
gitea/salix/pipeline/head This commit looks good Details
2020-06-09 13:18:29 +02:00
Joan Sanchez 1abe0addcb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-09 12:43:40 +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
Javi Gallego 77e1b20868 Merge pull request 'fix travel descritor' (#303) from 2320-travel.descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-06-09 06:49:58 +00:00
Bernat Exposito Domenech 294021391d fix travel descritor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-09 08:32:57 +02:00
Joan Sanchez 0a2366194a Merge pull request '2315-client_web_access' (#301) from 2315-client_web_access into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-08 14:09:18 +00:00