 Jorge Penadés
|
33656e9d9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 08:21:32 +02:00 |
 Pablo Natek
|
ecbc2fb7fc
|
Merge branch '3126-changePackageFkTopackagingFk' of https://gitea.verdnatura.es/verdnatura/salix into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 15:05:21 +02:00 |
|
Pablo Natek
|
37209a223a
|
feat(db): packagefk virtual column refs #3126
|
2023-10-19 15:05:19 +02:00 |
|
Pablo Natek
|
f26595bb62
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 12:15:43 +00:00 |
 Alex Moreno
|
cadec7d01f
|
Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 11:36:14 +00:00 |
 Guillermo Bonet
|
5c51d7fb04
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 13:22:33 +02:00 |
|
Pablo Natek
|
71182d8630
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 10:49:31 +00:00 |
|
Alex Moreno
|
1ea6b87266
|
Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 10:48:51 +00:00 |
|
Pablo Natek
|
e2f7ce8b35
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 08:58:50 +00:00 |
|
Alex Moreno
|
3294937b54
|
Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 08:50:29 +00:00 |
|
Pablo Natek
|
a5b6921592
|
refactor(changes): se mueven los sql a la ultima carpeta refs #3126
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 10:44:34 +02:00 |
|
Pablo Natek
|
f1b11fdca2
|
Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 06:51:50 +00:00 |
|
Jorge Penadés
|
8fe911ee0b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:43:22 +02:00 |
|
Jorge Penadés
|
62d2c7e701
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:42:15 +02:00 |
|
Jorge Penadés
|
ea5597d3f3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 13:40:02 +02:00 |
|
Pablo Natek
|
bf09f13aa2
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 11:07:24 +00:00 |
|
Alex Moreno
|
a7b0ef1e4c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
|
2023-10-18 09:23:55 +02:00 |
|
Alex Moreno
|
b3c7511e59
|
refs #6067 feat(url): getByUser
|
2023-10-18 08:52:06 +02:00 |
|
Alex Moreno
|
6871ce4b15
|
Merge branch '6067-vnUser_privileges_and_verifyEmail' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-10-18 07:29:03 +02:00 |
|
Alex Moreno
|
a916007314
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-10-18 07:20:34 +02:00 |
|
Pablo Natek
|
8d44bb8867
|
refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 15:05:48 +02:00 |
|
Jorge Penadés
|
fdfa481d21
|
ref #5947 drop procedure
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 14:52:47 +02:00 |
|
Pablo Natek
|
541926d3f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded
|
2023-10-17 13:57:32 +02:00 |
|
Pablo Natek
|
033c02750b
|
refactor(origin): .origin por getUrl()
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 18:24:58 +02:00 |
|
Jorge Penadés
|
bd535374d8
|
ref #6138 setPasword created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-16 15:58:25 +02:00 |
|
Jorge Penadés
|
ab6c58cd12
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 08:18:00 +02:00 |
|
Guillermo Bonet
|
e1c1d1a556
|
refs #6199 Fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 12:33:39 +02:00 |
|
Pablo Natek
|
f9fdd4c726
|
Merge branch '3126-changePackageFkTopackagingFk' of https://gitea.verdnatura.es/verdnatura/salix into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 08:54:07 +02:00 |
|
Pablo Natek
|
104d11ac3c
|
refs #3126 procReplace
|
2023-10-13 08:52:28 +02:00 |
 Sergio De la torre
|
1a7f7b6a00
|
refs #5134 feat:models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 08:02:00 +02:00 |
|
Sergio De la torre
|
35c0ec0d04
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 15:14:13 +00:00 |
|
Sergio De la torre
|
0028dd150a
|
refs #5134 feat:models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 17:12:55 +02:00 |
|
Jorge Penadés
|
179d8ab87d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-10 11:30:53 +02:00 |
|
Pablo Natek
|
c4e3fdf510
|
Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 06:03:03 +00:00 |
|
Pablo Natek
|
90fe65acc2
|
refs #6213 fixChanges
|
2023-10-06 08:03:37 +02:00 |
|
Pablo Natek
|
020de5d754
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-05 07:57:46 +00:00 |
|
Alex Moreno
|
7a6022efd4
|
Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 06:31:54 +00:00 |
|
Alex Moreno
|
9538841a30
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:28:02 +02:00 |
|
Alex Moreno
|
ca86b3cc2f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:27:35 +02:00 |
|
Alex Moreno
|
7cd2e290ce
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:22:41 +02:00 |
|
Jorge Penadés
|
c35899542d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-04 08:40:44 +02:00 |
|
Alex Moreno
|
45e41de9a9
|
refs #5918 fix(worker_time-control): isMailSended
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-03 14:03:52 +02:00 |
|
Alex Moreno
|
21ddcb7e8e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-03 11:39:44 +02:00 |
|
Alex Moreno
|
8c39f65dc3
|
refs #6067 feat: url model to everyone
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-03 09:36:11 +02:00 |
|
Pablo Natek
|
96769d9ff9
|
refs #6213 fixIntermitentError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-03 08:57:59 +02:00 |
|
Alex Moreno
|
62fa54e02f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-10-03 07:26:41 +02:00 |
|
Alex Moreno
|
9baa450298
|
Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-03 05:25:55 +00:00 |
|
Pablo Natek
|
7fd2d143c3
|
refs #6213 devMerge
|
2023-10-03 07:08:29 +02:00 |
|
Alex Moreno
|
4545a63214
|
refs #6067 feat(vnUser): verifyEmail redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-02 14:51:19 +02:00 |
|
Sergio De la torre
|
3ba349b74a
|
refs #5890 feat: itemShelvingSaleAsignado more calls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 09:14:30 +02:00 |
 Carlos Andrés
|
41ac907b05
|
refs #6254-collection_getTickets
|
2023-09-29 13:44:41 +02:00 |
|
Alex Moreno
|
10de00ea45
|
refs #5890 deploy: test to dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 12:37:53 +02:00 |
|
Alex Moreno
|
6e06d21f9e
|
refs #5890 deploy: merge dev in test 234002
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 12:36:36 +02:00 |
|
Carlos Andrés
|
2820b0253f
|
Merge branch 'test' into 6254-collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-29 10:31:14 +00:00 |
|
Alex Moreno
|
a0d705683b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-09-29 12:22:42 +02:00 |
|
Alex Moreno
|
b33700abc9
|
refs #6216 feat(ticket_sale): open filtered ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 11:57:25 +02:00 |
|
Jorge Penadés
|
6691cbf32f
|
ref #5914 changes moved
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 11:24:24 +02:00 |
|
Carlos Andrés
|
934b4c4b36
|
refs #5890
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 10:53:06 +02:00 |
|
Jorge Penadés
|
d4e78ea889
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
|
2023-09-29 08:16:12 +02:00 |
|
Alex Moreno
|
f3c55cdee9
|
refs #5929 fix(isEditable): can edit if is weekly
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 16:00:09 +02:00 |
|
Carlos Andrés
|
52cba80dc8
|
Merge branch 'dev' into 5890--itemShelvingAsignado
|
2023-09-28 15:13:37 +02:00 |
|
Alex Moreno
|
204770c2de
|
refs #6224 deploy: init version 234201
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:53:46 +02:00 |
|
Alex Moreno
|
28dfb895ca
|
refs #6224 deploy: correct sql folder and fix sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:49:58 +02:00 |
|
Jorge Penadés
|
4b213c1c9d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:31:45 +02:00 |
|
Alex Moreno
|
75e54bd82f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado
|
2023-09-28 13:21:12 +02:00 |
|
Alex Moreno
|
d4e5815d41
|
refs #6254 feat(collection_getTickets): refactor code and add test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 08:30:50 +02:00 |
|
Jorge Penadés
|
463fc8ae95
|
ref #5914 added fixtures in English
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 08:20:59 +02:00 |
|
Sergio De la torre
|
22f71e6147
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 08:18:15 +02:00 |
|
Sergio De la torre
|
65b0ec387f
|
refs #5890 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 08:09:54 +02:00 |
|
Sergio De la torre
|
4048627c76
|
refs #5890 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 08:08:40 +02:00 |
|
Sergio De la torre
|
18de92f9e7
|
refs #5134 fix: format
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 07:51:54 +02:00 |
|
Sergio De la torre
|
a86469ccd2
|
refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 07:42:44 +02:00 |
|
Alex Moreno
|
1307d4727c
|
refs #6254 feat(collection): add getTickets
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-27 15:08:36 +02:00 |
|
Sergio De la torre
|
ac3e9c811d
|
refs #5890 feat: itemShelvingSaleAsignado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-27 14:01:17 +02:00 |
|
Jorge Penadés
|
474399b383
|
ref #5914 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 15:23:51 +02:00 |
|
Alex Moreno
|
7a3d3d5e2a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-25 14:14:23 +02:00 |
|
Jorge Penadés
|
092180b3b2
|
Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-25 11:38:56 +00:00 |
 Javi Gallego
|
2607c1d215
|
Merge pull request '4059-revocar-permisos-client-account' (!1760) from 4059-revocar-permisos-client-account into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1760
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-09-25 11:29:58 +00:00 |
|
Jorge Penadés
|
98ee9bbaf3
|
ref #5914 back test added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-25 12:54:31 +02:00 |
|
Alex Moreno
|
6cf1095b10
|
refs #6067 feat: vnUser use verify() and more security when update user and mailForward
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 08:33:16 +02:00 |
|
Jorge Penadés
|
731bad5981
|
ref #5914 create ticket with new and refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 14:52:56 +02:00 |
|
Jorge Penadés
|
f64f7a975d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:51:20 +02:00 |
|
Alex Moreno
|
d43b70c971
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:30:28 +02:00 |
|
Alex Moreno
|
cf36b10763
|
refs #4815 feat: add serialNumber in deviceLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:29:48 +02:00 |
|
Alex Moreno
|
db7f72e262
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-09-22 13:19:35 +02:00 |
|
Pablo Natek
|
ed157d1fd1
|
Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 11:11:25 +00:00 |
|
Alex Moreno
|
d16ae47712
|
Merge branch 'dev' into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 11:01:25 +00:00 |
|
Jorge Penadés
|
6bc9b7b232
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
|
2023-09-22 12:05:12 +02:00 |
|
Pablo Natek
|
a854fff94f
|
refs #3126 changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 10:59:48 +02:00 |
|
Pablo Natek
|
3013e3cd9c
|
refs #6159 removeSpaces
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 09:14:59 +02:00 |
|
Pablo Natek
|
1357b60b9b
|
refs #6159 fixFixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 09:14:08 +02:00 |
|
Pablo Natek
|
850df64348
|
refs #6159 moveChangefile
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-21 14:59:26 +02:00 |
 Carlos Satorres
|
1f1dfae7e3
|
refs #5843 changes models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 12:50:07 +02:00 |
|
Javi Gallego
|
4761b0f784
|
fixes #4059 añado comillas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 10:41:20 +02:00 |
|
Pablo Natek
|
e037b0074e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6159-businessAfterInsert
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-21 09:24:18 +02:00 |
|
Jorge Penadés
|
ac4aea7d38
|
ref #5914 created transfer issued invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 09:14:46 +02:00 |
|
Pablo Natek
|
acd4f398c7
|
refs #6159 procBasedUpdate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 08:44:52 +02:00 |
|
Javi Gallego
|
4e6808ec4a
|
fixes #4059 muevo archivos a changes actual
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 08:24:57 +02:00 |
|
Javi Gallego
|
7ec47f0cc3
|
Merge branch 'dev' into 4059-revocar-permisos-client-account
|
2023-09-21 07:34:12 +02:00 |
|
Carlos Satorres
|
cd20a2d06d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 07:32:19 +02:00 |