Commit Graph

22128 Commits

Author SHA1 Message Date
Juan Ferrer b6f788a8db fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 14:21:16 +02:00
Pako Natek bb4f78961f element table 2024-05-14 14:01:13 +02:00
Pako Natek 5fd2ef3cff Merge pull request 'done' (!2432) from 7362-VIP into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2432
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-14 10:52:11 +00:00
Pako Natek 0adf6bfc45 Merge branch 'dev' into 7362-VIP
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 10:50:59 +00:00
Juan Ferrer eadf13b663 fix: Jenkinsfile display BRANCH_NAME
gitea/salix/pipeline/head This commit looks good Details
2024-05-14 12:20:39 +02:00
Carlos Andrés 4254fac6c2 Merge pull request '7213-Pasar-problemas-a-columnas-calculadas' (!2396) from 7213-Pasar-problemas-a-columnas-calculadas into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2396
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-14 09:35:51 +00:00
Alex Moreno d487d13cdb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-14 11:26:11 +02:00
Sergio De la torre b3170245d1 Merge pull request 'refs #6106 hotFix: getTickets' (!2449) from 6106_getTickets into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2449
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-14 09:25:54 +00:00
Sergio De la torre edb024a1f9 refs #6106 hotFix: getTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 10:14:53 +02:00
Robert Ferrús 6ae48790f3 Merge pull request 'feat: refs #7039 country' (!2361) from 7039-country-country into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2361
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-14 08:12:13 +00:00
Alex Moreno 43cd0c2ff2 Merge pull request 'deploy: dump' (!2448) from 7383-dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2448
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-05-14 07:44:39 +00:00
Alex Moreno 2ddadcd8a4 deploy: dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 09:38:03 +02:00
Pako Natek 53f49531b7 VIP now is Vip
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 09:07:43 +02:00
Pako Natek 599f22a25d catalogue tiene en cuenta apc 2024-05-14 09:03:49 +02:00
Robert Ferrús eeb36a6810 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 06:32:45 +00:00
Carlos Satorres ebcf8e2927 refs #6428 change file
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 08:30:22 +02:00
Alex Moreno 12f36dc825 hotFix: refs #6731 remove CodCOMPRADOR
gitea/salix/pipeline/head This commit looks good Details
2024-05-14 08:24:40 +02:00
Alex Moreno 3798509206 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-14 07:51:04 +02:00
Robert Ferrús c6f7a0768a Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 05:49:39 +00:00
Robert Ferrús b0da193b4a feat: refs #7039 añadir colum virtual country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 07:48:03 +02:00
Alex Moreno 7b1d931747 Merge pull request '7383-testToMaster' (!2445) from 7383-testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2445
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-14 05:44:12 +00:00
Carlos Satorres a8299383b9 refs #6428 remove sh
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 16:28:29 +02:00
Jorge Penadés b13c7c0db6 Merge pull request '#5919 createLocker' (!2446) from 5919-createLocker into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2446
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-13 13:10:39 +00:00
Jorge Penadés 45082f532f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-createLocker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 15:05:27 +02:00
Alex Moreno 6251493adb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 14:24:31 +02:00
Carlos Andrés 3ce43909e2 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 14:21:01 +02:00
Guillermo Bonet bd6ddd681d Merge pull request 'refactor: refs #7373 Deleted proc packageInvoicing' (!2444) from 7373-packageInvoicing_bye into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2444
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-13 12:16:51 +00:00
Jorge Penadés b902a1a7f7 Merge branch 'dev' into 5919-locker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:02:17 +00:00
Jorge Penadés 1f39330041 fix: refs #5919 drop focus 2024-05-13 14:00:19 +02:00
Carlos Satorres 585a0c68a8 Merge pull request 'refs #7360 fix error weekly' (!2431) from 7360-errorWeeklyHourEmail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2431
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-13 12:00:18 +00:00
Guillermo Bonet 6c325fccef refactor: refs #7373 Deleted proc packageInvoicing
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 13:41:47 +02:00
Carlos Andrés f89ca786df eat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 13:31:58 +02:00
Jorge Penadés 5d5f1ef7c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 13:20:32 +02:00
Jorge Penadés e16e5e3db3 feat: refs #5919 back test 2024-05-13 13:19:28 +02:00
Robert Ferrús 5e3fa1be8b Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 10:33:37 +00:00
Carlos Andrés b1af625937 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:32:46 +02:00
Pablo Natek db9c20fb22 Merge pull request 'fix: refs #4988 insert into agencyWorkCenter' (!2442) from 4988-fixInsert-into-agencyWorkCenter into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2442
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-13 10:31:55 +00:00
Pablo Natek bde7fc9972 fix: refs #4988 no task id on table comment
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 12:30:17 +02:00
Carlos Satorres ac4cc1506b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7360-errorWeeklyHourEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:18:03 +02:00
Guillermo Bonet 799108f041 fix: refs #7345 Fixed e2e
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 11:23:29 +02:00
Pablo Natek c7eeaf238a fix: refs #4988 add schema
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 11:04:50 +02:00
Pablo Natek 48392879cb fix: refs #4988 insert into agencyWorkCenter
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-05-13 10:59:22 +02:00
Carlos Andrés 057121582e feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 10:06:00 +02:00
Carlos Andrés 6d3f00ec95 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 09:54:27 +02:00
Jorge Penadés 29e3f934af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 09:35:08 +02:00
Alex Moreno 6ac664a139 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-13 09:06:57 +02:00
Pablo Natek 7301657a3a Merge pull request 'fix: duplicate version' (!2441) from fixTestDeploy into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2441
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-13 07:03:30 +00:00
Jorge Penadés 562aefecdd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 08:56:54 +02:00
Pablo Natek 1e956bb0f8 fix: duplicate version
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 08:53:25 +02:00
Pablo Natek a797fca2dd feat: refs #7187 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-13 08:30:20 +02:00