Commit Graph

786 Commits

Author SHA1 Message Date
Alex Moreno ce06274d0a Merge branch 'dev' into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 07:12:26 +00:00
Alexandre Riera a473d3a6f9 refs #4945 changed input-number for autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:01:13 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:30:30 +01:00
Alexandre Riera 200a256016 Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 12:15:12 +00:00
Alexandre Riera be5f987b0a refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:14:49 +01:00
Alex Moreno bc9510a317 Merge branch 'dev' into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:46:16 +00:00
Alexandre Riera 4e1c43eb4d refs #4945 nombre temporal removed
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:01:49 +01:00
Alex Moreno ff39a81b8c Merge branch 'dev' into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 06:07:14 +00:00
Alex Moreno 2cc89d9ae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 13:54:16 +01:00
Alexandre Riera 9f1c6e6d1d Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 10:48:10 +00:00
Alex Moreno 021c475de7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2023-01-04 09:39:26 +01:00
Alex Moreno 9b98249398 test: front test and e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:23:18 +01:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +01:00
Alexandre Riera ac56744244 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:15:26 +00:00
Alexandre Riera 7c45ac158c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 07:09:30 +01:00
Alex Moreno 990bcc0f6e feat(app): only use ui-view for routing
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 11:18:53 +01:00
Alex Moreno bee65f9c69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-28 07:24:08 +01:00
Alexandre Riera 96a6f0b9d9 refs #4926 packingOut added
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 07:48:09 +01:00
Alexandre Riera aec22fad9d Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:16:36 +01:00
Alexandre Riera eefc5ab80d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat 2022-12-23 08:01:52 +01:00
Alex Moreno 502a692521 test(item_fixedPrice_rate2): backTest and e2e
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 12:55:11 +01:00
Alexandre Riera 342eec1e41 refs #3963 autoload fixed
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:36:58 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:54:28 +01:00
Alexandre Riera 855f00b1c9 Merge branch '4700-split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 09:51:40 +01:00
Alexandre Riera 2baa4a1954 refs #4962 ticket tour future refactor 2022-12-14 12:26:18 +01:00
Alexandre Riera 704cb71b61 refs #4866 instance log added and e2e done
gitea/salix/pipeline/head Build queued... Details
2022-12-07 13:53:59 +01:00
Alexandre Riera 569a0e8cc9 refs #3302 log modified and fixed e2e tests
gitea/salix/pipeline/head This commit looks good Details
2022-12-05 15:30:41 +01:00
Alexandre Riera cd8d5efa88 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 10:29:18 +01:00
Alexandre Riera acbd0474a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 08:50:48 +01:00
Alex Moreno 804db15ece Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-28 07:53:51 +01:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00
Alexandre Riera 5124b3b681 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 08:42:09 +00:00
Alexandre Riera 164b797ab8 front and e2e tests done
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 11:09:32 +01:00
Alex Moreno 0f8eca4700 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:23:58 +01:00
Alex Moreno 660648e01f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-22 14:35:25 +01:00
Alexandre Riera 5552cd654e Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:48:11 +00:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Alexandre Riera 40ea9805cf fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 10:49:19 +01:00
Alexandre Riera 4feb2bea2c working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 10:57:15 +01:00
Alex Moreno 8dcd567a68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 13:20:52 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 15:58:11 +01:00
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 15:54:00 +01:00
Alex Moreno 5339bc1143 feat(recoverPassword): use loopback 2022-11-09 14:51:30 +01:00
Vicent Llopis ae513fb2b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 09:12:16 +01:00
Alex Moreno d100ab4112 Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:39:47 +00:00
Alexandre Riera 4be3106245 Merge branch 'dev' into 4645-refactor-entry.ref
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:29:49 +00:00
Alex Moreno ec9139f985 Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:24:05 +00:00
Alexandre Riera 405bc8765a refs #4645 valores ref cambiados
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 12:48:48 +02:00
Vicent Llopis 2da34d0850 feat: add e2e 2022-10-20 09:40:11 +02:00
Vicent Llopis b0471037a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 08:49:08 +02:00
Vicent Llopis abd2d9a849 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 15:10:43 +02:00
Alex Moreno 84d17f4d55 Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 11:28:39 +00:00
Alex Moreno cfc626494f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter 2022-10-14 07:39:23 +02:00
Alex Moreno e85d6bec8c fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:03:29 +02:00
Vicent Llopis ea1714240e fix: test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:45:34 +02:00
Joan Sanchez 8ccb47d741 Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Vicent Llopis 68e4f3a8bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 09:10:15 +02:00
Alex Moreno cca2878716 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4073-user_privileges
gitea/salix/pipeline/head This commit looks good Details
2022-10-03 15:16:33 +02:00
Alex Moreno 7a690dd880 feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good Details
test(user):back and e2e
2022-10-03 15:11:29 +02:00
Javi Gallego eb48685484 selectores reparados
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 14:55:31 +02:00
Alex Moreno 84003ab09c fix(searchbar): smart-table.tableQ integration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 12:36:16 +02:00
Javi Gallego 426ff5f753 selector con weightByPieceCheckbox
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 11:26:36 +02:00
Vicent Llopis 182fe4a38e fix: te2e
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 14:03:49 +02:00
Alex Moreno 2b101cf7c1 refactor(travel_extra-community): use smart-table, fix scroll
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 15:11:14 +02:00
Joan Sanchez 468da0c5a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-27 08:12:06 +02:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Alex Moreno ca767b84f0 fix(entry): change isInventory to isExcludedFromAvailable
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:21:07 +02:00
Alex Moreno 22fd0e91b0 title translations, and getWorkedHours test
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 12:10:37 +02:00
Alex Moreno a3f1c36226 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests 2022-06-28 11:12:06 +02:00
Carlos Jimenez Ruiz bdf4ecdf50 Merge branch 'dev' into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 07:03:44 +00:00
Carlos Jimenez Ruiz 84606de1da e2e path for claim notes + refactor
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 17:25:35 +02:00
Alex Moreno 7980a941a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 14:03:24 +02:00
Alex Moreno 212c351064 fix(item_create): fixtures and test
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 13:17:22 +02:00
Alex Moreno a98a927663 fix back test and e2e that now fail
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 11:17:45 +02:00
Alex Moreno 4155b45785 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 07:22:43 +02:00
Alex Moreno 4d4e09fb9f test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 14:07:53 +02:00
Joan Sanchez 2381a5d09a Updated e2e tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-22 12:40:11 +02:00
Alex Moreno 8d9d64b49d feat(client_web-access): add email field
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-20 07:31:10 +02:00
Carlos Jimenez Ruiz 1e504b6b9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2808-e2e_account_descriptor 2022-06-16 16:46:33 +02:00
Alex Moreno 3650567caf test(account): e2e for ldap and samba
gitea/salix/pipeline/head This commit looks good Details
2022-05-19 15:02:39 +02:00
Alex Moreno 34bcdf1bd3 test(account): acl, connections and accounts secctions
gitea/salix/pipeline/head This commit looks good Details
2022-05-18 14:01:30 +02:00
Carlos Jimenez Ruiz 4647d6e54e e2e path for activate/deactivate user on account/descriptor
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 15:38:24 +02:00
Alex Moreno 89baf63646 feat(account): add e2e acl
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 15:19:54 +02:00
Carlos Jimenez Ruiz 990f7fe4b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation 2022-05-13 18:37:48 +02:00
Carlos Jimenez Ruiz 833addcb75 gulp-jasmine replaced by jasmine
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 19:38:10 +02:00
Joan Sanchez afe4f0ba94 Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:46:39 +00:00
Carlos Jimenez Ruiz a47c0dbaea Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 11:47:14 +00:00
Vicent Llopis f08a384a7c fix: e2e test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:49:37 +02:00
Vicent Llopis 4a6873a0fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 09:34:37 +02:00
Alex Moreno 62f7b80ed4 quit $
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 08:55:43 +02:00
Carlos Jimenez Ruiz 9085098a04 Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:19:50 +00:00
Carlos Jimenez Ruiz 6015050eed Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:12:14 +00:00
Joan Sanchez c2271b6071 Merge branch 'dev' into 3758-client_unpaid
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:00:28 +00:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:12:28 +00:00
Vicent Llopis 013390fae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:49:34 +02:00
Vicent Llopis 4872407723 fix test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 11:57:56 +02:00
Alex Moreno c9e8826627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:08:55 +02:00