Commit Graph

1526 Commits

Author SHA1 Message Date
Joan Sanchez 8ccb47d741 Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Joan Sanchez 1bf090b6ee Pass network name 2022-10-06 09:09:49 +02:00
Joan Sanchez 3d36c0339a Merge branch 'dev' into 4592-jenkins_tests 2022-10-05 12:05:10 +00:00
Joan Sanchez 8468eda05a run with network 2022-10-05 12:47:37 +02:00
Joan Sanchez 627f0d762e attach to network 2022-10-05 12:33:06 +02:00
Joan Sanchez 1cafbdab6e Connect to docker network 2022-10-05 12:26:42 +02:00
Joan Sanchez e6512d00a1 Use port 3306 2022-10-05 12:16:59 +02:00
Joan Sanchez 0502f9ebf0 Log port 2022-10-05 11:19:07 +02:00
Joan Sanchez 0ad583f22f Log host & port 2022-10-05 11:14:49 +02:00
Joan Sanchez 0fccae0113 Network ip address 2022-10-05 11:06:23 +02:00
Joan Sanchez 239c324eff Log network settings 2022-10-05 11:03:48 +02:00
Joan Sanchez ee0938d7d6 Test 2022-10-05 10:36:05 +02:00
Joan Sanchez 80d0b415ec Host log 2022-10-05 10:28:07 +02:00
Joan Sanchez b0dac6c12d Use jenkins network 2022-10-05 10:23:24 +02:00
Joan Sanchez 1534bdd188 Syntax error 2022-10-05 10:16:17 +02:00
Joan Sanchez 13bfed6955 use jenkins network 2022-10-05 10:06:11 +02:00
Joan Sanchez 98a2f79691 Run container on jenkins network 2022-10-05 10:05:01 +02:00
Joan Sanchez 377a0f7228 Attachments refactor 2022-10-04 13:41:37 +02:00
Alex Moreno 7a690dd880 feat(user): add section privileges and remove changeRole in descriptor
test(user):back and e2e
2022-10-03 15:11:29 +02:00
Joan Sanchez c177c0366d Item PDF 2022-10-03 13:35:49 +02:00
Joan Sanchez 3b0f1efbf4 ACL's 2022-09-30 13:54:20 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2 2022-09-29 14:52:31 +02:00
Joan Sanchez 3601881026 Client consumption queue 2022-09-29 14:43:27 +02:00
Joan Sanchez 7a7ad6ac5f InvoiceOut_sendQueued 2022-09-29 13:09:44 +02:00
Joan Sanchez 5aec280adb Closure migration 2022-09-29 09:07:18 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor 2022-09-27 14:20:57 +02:00
Pau 2dd6de1d47 Modified Fixtures, clone.js and the item model 2022-09-27 13:46:23 +02:00
Joan Sanchez 7f78286d6b Reports refactor 2022-09-26 13:33:27 +02:00
Joan Sanchez 85698410db Templates refactor 2022-09-26 08:07:45 +02:00
Pau 26a16bf846 ACL para sector,añadido sector al model-config 2022-09-23 13:53:33 +02:00
Joan Sanchez 664fd444cc Sample refactor 2022-09-22 15:44:35 +02:00
Joan Sanchez 68f3544477 Claim pickup order 2022-09-22 09:17:14 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Joan Sanchez 71f8e73e55 Merge pull request '4155-close_tickets' (#1056) from 4155-close_tickets into dev
Reviewed-on: #1056
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-21 06:46:24 +00:00
Joan Sanchez 5d6459d565 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-09-21 08:37:20 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure 2022-09-19 09:45:28 +02:00
Vicent Llopis a330e9d64a refactor: change acl 2022-09-16 12:02:04 +02:00
Vicent Llopis 6367f1ef05 refator: delete sensitive info 2022-09-16 11:46:55 +02:00
Vicent Llopis afeed9757c refactor: change acl 2022-09-16 10:39:59 +02:00
Vicent Llopis a695468bb7 refator: deleted sensitive information 2022-09-16 10:32:37 +02:00
Vicent Llopis cfe5c66fe4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets 2022-09-16 09:23:56 +02:00
Vicent Llopis 503e78d4f0 fix: rollback mariadb version 2022-09-16 09:07:43 +02:00
Joan Sanchez 793705413e #452 - Dumped db 2022-09-16 07:05:27 +00:00
Joan Sanchez 9d5351c84c Updated db image 2022-09-15 07:31:49 +00:00
Vicent Llopis 28bf7bd747 feat: check general status 'open' to close ticket 2022-09-15 08:34:42 +02:00
Joan Sanchez 5cff983d4c Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:33:04 +00:00
Vicent Llopis 1fd97f167c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk 2022-09-13 11:35:15 +02:00
Javi Gallego 9fe32788fc regularizado 2022-08-24 14:38:05 +02:00
Joan Sanchez 6b6d00cf95 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-08-10 12:23:28 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts 2022-08-10 12:13:31 +02:00