Commit Graph

6692 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz d400e63aac Merge branch '2040-update_view_holidays' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-06 08:44:10 +00:00
Bernat Exposito Domenech 7bb5b19398 refactor table holidayType and holidayDetail
gitea/salix/2040-update_view_holidays This commit looks good Details
2020-02-06 09:33:36 +01:00
Carlos Jimenez Ruiz 1e8059c9f5 Merge branch '2023-ticket_index_advanced_search' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-06 07:26:39 +00:00
Joan Sanchez 4d723a721e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2076-item_tags_refactor
gitea/salix/2076-item_tags_refactor This commit looks good Details
2020-02-06 08:02:59 +01:00
Bernat Exposito 2186cfc959 Merge branch '1944-ticket-summary' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-06 07:01:24 +00: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 610c21f23d corrected a typo
gitea/salix/1944-ticket-summary This commit looks good Details
2020-02-06 07:39:00 +01:00
Bernat Exposito Domenech 8193b0ffc0 update ticket.filter
gitea/salix/2023-ticket_index_advanced_search This commit looks good Details
2020-02-06 07:37:41 +01:00
Carlos Jimenez Ruiz 57c8ef99dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1944-ticket-summary
gitea/salix/1944-ticket-summary This commit looks good Details
2020-02-05 14:14:09 +01:00
Carlos Jimenez Ruiz deb6d8e730 #1944 ticket.summary e2e selector updated 2020-02-05 14:14:02 +01:00
Carlos Jimenez Ruiz 06c3580bc4 #1944 ticket.summary 2020-02-05 13:37:36 +01:00
Joan Sanchez 84d6d7cec0 Merge branch '1798-e2e-extensions' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-05 11:59:10 +00:00
Carlos Jimenez Ruiz 76fc5a3311 #1944 ticket.summary 2020-02-05 12:44:14 +01:00
Carlos Jimenez Ruiz dc515531c6 gulp task arg enabled
gitea/salix/1798-e2e-extensions This commit looks good Details
2020-02-05 09:08:55 +01:00
Carlos Jimenez Ruiz 0ece3e3a00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1798-e2e-extensions
gitea/salix/1798-e2e-extensions This commit looks good Details
2020-02-05 09:04:34 +01:00
Carlos Jimenez Ruiz 1c6032a904 Merge branch '2069-ticket_index_scope_days' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-05 08:04:15 +00:00
Carlos Jimenez Ruiz 2484c83b32 headless mode enables
gitea/salix/1798-e2e-extensions This commit looks good Details
2020-02-05 09:01:00 +01:00
Carlos Jimenez Ruiz 9546c4c016 #1909 fusionar waitForURL y parsedUrl
gitea/salix/1798-e2e-extensions This commit looks good Details
2020-02-05 08:43:46 +01:00
Joan Sanchez 218ed38b54 changed comment
gitea/salix/2069-ticket_index_scope_days This commit looks good Details
2020-02-05 08:24:29 +01:00
Joan Sanchez bee814f6a6 #2069 bug-fix ticket scope days
gitea/salix/2069-ticket_index_scope_days This commit looks good Details
2020-02-05 08:23:23 +01:00
Carlos Jimenez Ruiz 973436bfa6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1798-e2e-extensions
gitea/salix/1798-e2e-extensions This commit looks good Details
2020-02-05 07:08:29 +01:00
Carlos Jimenez Ruiz 6f2cd4b446 expectURL ext plus refactors
gitea/salix/1798-e2e-extensions This commit has test failures Details
2020-02-04 16:21:10 +01:00
Carlos Jimenez Ruiz 5a90c9a2d8 Merge branch '1959-client_fiscal_data_check_phone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
LGTM
2020-02-04 12:36:29 +00:00
Joan Sanchez f86d3a0052 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1959-client_fiscal_data_check_phone
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good Details
2020-02-04 13:23:02 +01:00
Joan Sanchez 041c4966d6 changed line
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good Details
2020-02-04 12:29:04 +01:00
Joan Sanchez 494b14bab4 added translation 2020-02-04 12:28:01 +01:00
Joan Sanchez e76298b00e Merge branch '2040_view_holiday' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-04 11:16:39 +00:00
Joan Sanchez 5b0bb5dc73 updated e2e
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good Details
2020-02-04 11:25:15 +01:00
Bernat Exposito Domenech 89dc8e27e0 update models
gitea/salix/2040_view_holiday This commit looks good Details
2020-02-04 11:20:05 +01:00
Carlos Jimenez Ruiz cbd43253e0 1795 and 1798 refactors
gitea/salix/1798-e2e-extensions This commit has test failures Details
2020-02-03 15:55:11 +01:00
Joan Sanchez 711e973c23 Merge branch '2075-ticket_gestdoc' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-03 13:49:04 +00:00
Bernat Exposito Domenech eab2593306 update ticket.dms.create
gitea/salix/2075-ticket_gestdoc This commit looks good Details
2020-02-03 14:36:04 +01:00
Joan Sanchez e55645486a Merge branch '2020-worker_index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-03 13:10:46 +00:00
Bernat Exposito Domenech 759ac5b5c7 add icon in worker.index
gitea/salix/2020-worker_index This commit looks good Details
2020-02-03 14:03:09 +01:00
Joan Sanchez 5d56ed8f88 Merge branch '2071-ticket_sale_split' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-03 11:44:49 +00:00
Bernat Exposito Domenech 0681f5efc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2071-ticket_sale_split
gitea/salix/2071-ticket_sale_split This commit looks good Details
2020-02-03 11:12:09 +01:00
Bernat Exposito Domenech 668f20c433 update lastActiveTickets 2020-02-03 11:12:04 +01:00
Joan Sanchez 2c2e4548d8 Merge branch '2039-ticket_basicData' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-03 08:41:59 +00:00
Bernat Exposito Domenech 6265796260 add icon in ticket.basicData
gitea/salix/2039-ticket_basicData This commit looks good Details
2020-02-03 09:24:49 +01:00
Joan Sanchez b743938fee merge
gitea/salix/1959-client_fiscal_data_check_phone There was a failure building this commit Details
2020-01-31 08:18:54 +01:00
Carlos Jimenez Ruiz bfd91d2918 Merge branch '2064-catalog_refactor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-30 13:59:04 +00:00
Joan Sanchez 43693c35ad removed fdescribe
gitea/salix/2064-catalog_refactor This commit looks good Details
2020-01-30 14:35:21 +01:00
Joan Sanchez 8f851d5c15 refactor
gitea/salix/2064-catalog_refactor This commit looks good Details
2020-01-30 13:53:14 +01:00
Joan Sanchez 31349b2ebf Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-30 11:54:51 +01:00
Joan Sanchez 71576fdaf9 Merge branch 'fixGetWorkerHours' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-30 10:38:41 +00:00
Carlos Jimenez Ruiz 7f745b95b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1798-e2e-extensions 2020-01-30 11:23:31 +01:00
Carlos Jimenez Ruiz 8bdb0a6032 removed fdescribe 2020-01-30 11:23:13 +01:00
Bernat Exposito Domenech c07d5f337a fix getWorkerdHours
gitea/salix/fixGetWorkerHours This commit looks good Details
2020-01-30 11:20:41 +01:00
Joan Sanchez 3164b7dbee Merge branch '2003-adress_validate_uee_members' of verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2020-01-30 09:51:11 +00:00
Carlos Jimenez Ruiz 2a2ecdd438 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1798-e2e-extensions 2020-01-29 14:56:05 +01:00