Commit Graph

1357 Commits

Author SHA1 Message Date
Carlos Satorres ea9a15ece1 Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 10:44:24 +00:00
Alexandre Riera be1993cf8b refs #5206 version with top-searcher and two fields for reference and id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 11:33:55 +01:00
Joan Sanchez 57e36cebde fix(field): prevent input size changes when showing clear icon
gitea/salix/pipeline/head This commit looks good Details
Refs: #5338
2023-03-02 09:44:45 +01:00
Vicent Llopis bc542d8a40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:11:12 +01:00
Carlos Satorres 1c3aa29642 refs #5090 model.ezp nuevo
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 11:56:41 +01:00
Vicent Llopis 8a1a7d7159 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 08:20:28 +01:00
Alexandre Riera 94901d5b1f refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 07:49:34 +01:00
Vicent Llopis c8c48ea175 feat: colorar numeros de semanas segun el registro de horas
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 15:16:28 +01:00
Vicent Llopis 1c1e4cc176 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 13:37:53 +01:00
Vicent Llopis 432c8a9ab8 refactor: cambiados estilos de los chips
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 10:56:46 +01:00
Joan Sanchez c5c76984ff Merge pull request 'fix(image): store images with a name generated through uuid instead of url path' (!1337) from 5266-image_fixes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1337
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-02-21 08:56:19 +00:00
Joan Sanchez 90e1136ee2 fix(image): store images with a name generated through uuid instead of url path
gitea/salix/pipeline/head This commit looks good Details
Refs: #5266
2023-02-20 12:40:13 +01:00
Alexandre Riera b926666b25 refs #5220 fonts updated
gitea/salix/pipeline/head This commit looks good Details
2023-02-20 09:38:24 +01:00
Joan Sanchez 527caf9ca0 refactor(zerofill): deprecated zerofill and removed function
gitea/salix/pipeline/head This commit looks good Details
Refs: #5207
2023-02-17 11:19:35 +01:00
Alex Moreno 65df9b87e7 fix: conflicts
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 13:22:53 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 09:16:30 +01:00
Vicent Llopis be539a54ce delete console.log
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 09:31:03 +01:00
Vicent Llopis cda7a6e3fd fix: no mostraba los numeros de la semana al inicio
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 15:01:33 +01:00
Alex Moreno 575784c870 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-03 10:03:59 +01:00
Alex Moreno e16c16c194 Merge branch 'dev' into 5170-recover-password_use_user
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 08:12:54 +00:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Vicent Llopis 15429293dd fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 11:34:13 +01:00
Vicent Llopis 76865fc7b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5084-monitor.index_tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 09:18:37 +01:00
Joan Sanchez 4477486f8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:58:44 +01:00
Joan Sanchez 7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:23:17 +01:00
Alex Moreno 4a587049fc feat(recover-password): use user
gitea/salix/pipeline/head This commit looks good Details
refs #5170
2023-02-01 15:13:38 +01:00
Alexandre Riera 2ef7b0d756 refs #5157 clip-path deleted
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:48:33 +01:00
Alex Moreno 2528b2d3ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:10:51 +01:00
Joan Sanchez e34d64361b Account refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:57:24 +01:00
Pau 136ad332b9 Merge branch 'dev' into 5148-logs-style
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:36:17 +00:00
Alex Moreno 4740cdbbb9 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:37:18 +01:00
Pau 8580851b5b refs #5148 @0:30h change style to pre-line
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 13:32:09 +01:00
Alex Moreno 4e65e88621 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 07:56:12 +01:00
Alex Moreno 788ebd4133 refactor(recover-password): recovery password label
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 07:50:37 +01:00
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 08:20:32 +00:00
Vicent Llopis 67a64582e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:21:30 +01:00
Vicent Llopis 51400b1c74 reactor: eliminado try y catch, y añadido finally
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 08:19:52 +01:00
Alex Moreno eb59efbb85 refactor(front): use vn-loopback/boot/date
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 15:12:16 +01:00
Vicent Llopis 5a70fd4779 fix: las peticiones no colisionan
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 14:45:35 +01:00
Alexandre Riera 1e89352446 hotfix instanceLog css
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 14:37:08 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 15:24:00 +01:00
Alex Moreno 4a06b8e8a9 fix: import date.js and fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 15:16:42 +01:00
Vicent Llopis 9eb65507b5 fix: elimino this.model.refresh que siempre daba fallo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 14:43:31 +01:00
Alex Moreno fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01:00
Vicent Llopis 5a19e5801f fix: enabled button when an error occurs
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 11:50:54 +01:00
Alex Moreno 6b6f27c2f2 fix: typo
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 08:44:58 +01:00
Alex Moreno bd0f4d89f8 Merge branch '5043-mock_Date' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 08:07:45 +01:00
Alex Moreno 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +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
Vicent Llopis ef7a0508ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:29:42 +01:00
Alex Moreno 8d33aa8454 fix(fixtures): use static dates
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-17 15:36:39 +01:00
Alexandre Riera fea76f29e7 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 07:31:45 +00:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Alex Moreno 6b1a6fe44b feat: mock dates front and back 2023-01-16 15:18:00 +01: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
Joan Sanchez c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 08:55:01 +01:00
Pau b6de50848a refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:48:44 +01:00
Vicent Llopis 2451d00998 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 07:59:43 +00:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +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
Vicent Llopis eb3ed95b22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-10 08:32:44 +01:00
Alex Moreno 8688fc4652 Merge branch 'dev' into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 06:23:21 +00:00
Robert Ferrús bcefea726c Merge branch 'dev' into 4857-invoiceOutTranslate
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 13:54:01 +00:00
Robert Ferrús 6891da4863 refactor(invoiceOut): updated translation
gitea/salix/pipeline/head This commit looks good Details
Refs #4857
2023-01-05 11:43:08 +01:00
Vicent Llopis 3edc0403ba fix 2023-01-05 10:35:42 +01:00
Vicent Llopis 9ae7b92bbf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 09:00:37 +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
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:13:47 +01:00
Joan Sanchez 674fe49058 fix(icons): prevent icon translation when using google translator
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 5044
2023-01-03 08:41:58 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Vicent Llopis 3792a80ad5 refs #4925 feat: añadido back para editar tags
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 14:24:32 +01:00
Alex Moreno 90acbac2ad refactor(login): split in differents folder
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 14:06:51 +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
Alexandre Riera 762e39f7be refs #4866 refactor component instance-log
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 15:10:35 +01:00
Vicent Llopis 682b6d8961 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 09:59:21 +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 c34c239375 refs #3302 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:13:08 +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
Joan Sanchez e15d724db5 Merge pull request 'closes #3681 move-sign_save-to-salix' (!1151) from 3681-move-sign_save-to-salix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1151
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 12:44:01 +00:00
Joan Sanchez 606bacbad7 Merge branch 'dev' into 4531-monitor_duplicates
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:37:48 +00:00
Pau aa716634db Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:30:36 +01:00
Vicent Llopis 8880a83b89 feat: añadido saleTracking
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 15:03:41 +01:00
Alex Moreno 27288d011d fix(searchBar): applyParams
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 15:01:05 +01:00
Pau c9b4e1ab9a Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 06:38:20 +00:00
Alexandre Riera c3508c50d4 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-20 15:29:44 +01:00
Alexandre Riera c99bfef917 refs #3302 fixed scss
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 15:29:21 +01:00
Alexandre Riera 1982e4c989 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-20 14:25:38 +01:00
Alexandre Riera 27e0c2d0be refs #3302 where with changedModel and changedModelId
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 14:23:47 +01:00
Alexandre Riera 62152d1668 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-20 12:16:40 +01:00
Alexandre Riera 5b87514501 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:15:50 +01:00
Pau 1305513b07 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:01:38 +00:00
Alexandre Riera 8403af7db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:37:40 +01:00
Joan Sanchez 73ea928b33 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:40:23 +01:00
Joan Sanchez c063c0e72f fix(pagination): duplicated rows on paginate
gitea/salix/pipeline/head This commit looks good Details
Refs: #4531
2022-12-20 09:48:41 +01:00
Pau 5a01e49f27 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-19 12:25:58 +00:00
Alexandre Riera 98c9e0ac50 refs #4962 autoload added and second header
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:42:23 +01:00
Alex Moreno 19cbd5b57b fix css
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-16 08:43:34 +01:00
Alex Moreno ed68637059 disable outLayout
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 15:05:17 +01:00
Alexandre Riera 92a961ecc9 refs #3302 refactor
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 14:24:57 +01:00
Alex Moreno 8d7757ddbe add reset-password
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 07:40:51 +01:00
Joan Sanchez 11db08b32b Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2022-12-14 14:20:41 +01:00
Joan Sanchez a86636bee4 Use proper module codes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:49:49 +01:00
Alexandre Riera 4bafcc905a refs #4866 fix css
gitea/salix/pipeline/head This commit looks good Details
2022-12-09 11:41:08 +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 36a78fac7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good Details
2022-12-05 08:06:25 +01:00
Pau 9ed9c1a82c Delete sendsms from core/components
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:13:06 +01:00
Pau a676351e5b Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 07:24:26 +01:00
Joan Sanchez 990dd88e2c Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1186
2022-11-29 13:08:38 +00:00
Vicent Llopis a0f5cf1449 refactor: borrados saltos de linea
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 14:48:37 +01:00
Vicent Llopis c3d06ca5db fix: crashea cuando el log no tiene changedModel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 14:47:23 +01:00
Alex Moreno d9e4ff6772 fix: use $location
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 11:48:25 +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
Pau 8f98082910 refs #4791 @2h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:59:02 +01:00
Pau 1c9964b902 Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 08:23:59 +01:00
Pau d47e7ffb16 change component location 2022-11-25 08:23:57 +01:00
Pau 7c71e40cc5 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:15:54 +00:00
Vicent Llopis 20d0d053ac Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:03:23 +00:00
Vicent Llopis 74e8789439 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 10:54:40 +00:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 08:08:56 +00:00
Alex Moreno 30a25664de out-layout component
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 13:49:50 +01:00
Vicent Llopis 9a47b2fea4 Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 10:00:27 +00:00
Pau a8520f851c Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 08:28:07 +00:00
Alex Moreno 314e98b838 fix: nested router
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:57:52 +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
Vicent Llopis 89141419c1 fix: merge filter
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 10:36:40 +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
Vicent Llopis cac8879ec7 fix: solo vuelve a buscar el mismo filtro en caso de que se encuentre en un index
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 09:22:06 +01:00
Pau 4bd643143b requested changes refs #4791 @1h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 07:59:18 +01:00
Pau 4e97d931f7 refs #4791 @2h 2022-11-21 08:45:45 +01:00
Vicent Llopis d4712e27c3 fix: no repite la llamada filter cada vez q cambias de seccion
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 11:31:36 +01:00
Alex Moreno 9405333c07 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 15:29:02 +01:00
Pau 5b4c1ad4e6 Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:26:59 +01:00
Vicent Llopis 3d352fa0fd fix: locale no puede ser undefined
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:06:50 +01:00
Alex Moreno 9085e7fab1 fix: use routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:12: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
Vicent Llopis 843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:41:57 +01:00
Pau 9d0cd36afe Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:49:21 +01:00
Alexandre Riera 7dd87b1ea8 refs #4700 icons future
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:56:23 +01:00
Juan Ferrer e7f26e8502 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 00:56:20 +01:00
Juan Ferrer c2b4187b97 refs #4609
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 23:46:03 +01:00
Alex Moreno 4c216c4556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:40:55 +01:00
Alex Moreno 517422be8c refactor: not use axios
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:32:07 +01:00
Pau a237375db6 Merge branch 'dev' into 3681-move-sign_save-to-salix 2022-11-10 10:42:53 +01:00
Alexandre Riera 897a7d079d Merge branch 'dev' into 2596-arrastrar-ficheros
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 07:40:10 +00:00
Alex Moreno 5339bc1143 feat(recoverPassword): use loopback 2022-11-09 14:51:30 +01:00
Juan Ferrer 993ae11277 refs #3302
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 09:19:56 +01:00
Alex Moreno fcf46ade7d feat: reset-password section
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 15:15:00 +01:00
Alexandre Riera 07b2ac99ce refs #2596 css corregido
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 15:45:36 +01:00
Alexandre Riera f3085bef66 refs #2596 css actualizado
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 15:28:52 +01:00
Alex Moreno 36894c31de Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:04 +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 e1eeb81696 refs #2596 tabulación y css
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 08:18:24 +01:00
Alex Moreno 9891f7060d fix(smart-table): monitor only ticketFilter use url and add ?q in routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 09:40:09 +01:00
Alexandre Riera aaaa73644d refs #2596 drag and drop implementado
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 08:18:58 +01:00
Joan Sanchez fe3ebe8e0c Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:43:43 +00:00
Alex Moreno f8f44aaae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter 2022-11-02 07:37:28 +01:00
Alex Moreno 755a1667dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 07:35:04 +01:00
Pau 0739608de3 Merge branch 'dev' into 4457-hasInvoiceElectronic
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:57:50 +01:00
Pau c1c06f27d3 create save.js 2022-10-27 08:21:21 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Alex Moreno 107a0a6555 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:35:12 +02:00
Alex Moreno bcfbeb7032 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-21 12:41:39 +02:00
Vicent Llopis 888f612dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 11:41:53 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Pau cf50c4690a Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:41:39 +00:00
Alex Moreno 248572feb4 use variable 2022-10-14 07:40:11 +02: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
Vicent Llopis 7b7e01f49e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 07:09:20 +02:00
Alex Moreno 5c4daee35e 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-10-10 14:20:22 +02:00
Pau 4f25961988 Created checkbox and logic, package-lock
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 08:33:45 +02:00
Joan Sanchez 9764b79f81 Restored engine versions
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 12:52:50 +02:00
Joan Sanchez f2eaa9d0e5 Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 06:28:00 +00:00
Vicent Llopis 2f17257e46 feat: add new sub section itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 15:13:48 +02:00
Joan Sanchez 3dbd304217 Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:21:24 +02:00
Pau 9c7ec6fdc9 Implemented Insertable in the textfield class
gitea/salix/pipeline/head This commit looks good Details
2022-10-03 13:48:35 +02:00
Pau 5ca39c9dd3 Modified TextField to have a insertable option
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:48:04 +02:00
Joan Sanchez 21bb95fc88 CSV refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:28:47 +02:00
Alex Moreno e931414bb7 unnecessary code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 08:59:49 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Alex Moreno 94c143bc4c test(searchbar_smart-table): fix for integration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:28:50 +02:00
Pau 796988bb18 Removed e.stopPropagation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:14:05 +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
Pau 7ac7189a8a added maxlength binding, finished logic on insert
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 08:08:49 +02:00
Alex Moreno 203b223cc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-28 12:24:40 +02:00
Pau dff378632b Changed the logic
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-28 12:23:25 +02:00
Alex Moreno 840140c40f 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-09-28 12:20:35 +02:00
Alex Moreno 81752e7f30 quit userError 2022-09-28 12:20:29 +02:00
Alex Moreno 4df99a82e1 feat(tableOrder): save order in url
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-28 11:22:29 +02:00
Alex Moreno 444bc36f31 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter 2022-09-28 08:26:54 +02:00
Alex Moreno 8082e3071a try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 15:17:54 +02:00
Pau c2813e3633 Removed console logs and other debugging elements
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 13:05:46 +02:00
Pau d30065f90a Add vn-input-account tag and logic
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 12:12:25 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 14:49:11 +02:00
Alex Moreno f698a22fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 09:25:43 +02:00
Alex Moreno 63acbc50d5 quit comment
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 09:08:09 +02:00
Alex Moreno d2cbaa565e add translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:48:46 +02:00
Alex Moreno c79f884526 feat(recover-password): open changePass in front and tests done
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 09:22:24 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Alex Moreno 00f5689825 feat(account): recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-21 15:15:19 +02:00