 Alexandre Riera
|
c6fc2dee24
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-23 10:53:11 +01:00 |
 Carlos Satorres
|
f5109724bf
|
refs #5073 adaptacion para solo el año
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-17 11:39:16 +01:00 |
 Vicent Llopis
|
c51e542235
|
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-14 13:43:59 +01:00 |
|
Vicent Llopis
|
2be7320d89
|
refs #4856 fix: backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-14 07:45:22 +01:00 |
|
Vicent Llopis
|
4dc9e9e590
|
refs #4856 refactor: make agnostic the component calendar
|
2023-03-14 07:44:39 +01:00 |
|
Vicent Llopis
|
165dc73b33
|
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-03-08 12:22:29 +01:00 |
|
Vicent Llopis
|
07edacd557
|
fix: frontTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-08 12:22:14 +01:00 |
|
Vicent Llopis
|
0396d3707c
|
refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-08 11:47:10 +01:00 |
 Joan Sanchez
|
56d3b32af5
|
Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-08 09:12:53 +00:00 |
|
Vicent Llopis
|
a68fef8a5b
|
feat: test front
|
2023-03-08 09:51:09 +01:00 |
|
Joan Sanchez
|
14a5c78303
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-07 08:13:07 +01:00 |
|
Joan Sanchez
|
c0ff6bea57
|
fix(smartTable): fixed filtering with an intermediate check
gitea/salix/pipeline/head There was a failure building this commit
Details
Refs: #5177
|
2023-03-07 07:47:30 +01:00 |
|
Vicent Llopis
|
a98bb59479
|
fix: test front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-06 12:47:49 +01:00 |
|
Vicent Llopis
|
9e9807c4b5
|
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-03-06 11:55:30 +01:00 |
|
Joan Sanchez
|
37043beb68
|
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-03-03 07:44:31 +01:00 |
|
Vicent Llopis
|
7c24b940b3
|
feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-02 14:55:18 +01:00 |
|
Alexandre Riera
|
dbe42e3bf4
|
refs #5206 version with plane added, needs to implement general search
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-02 13:55:47 +01:00 |
|
Carlos Satorres
|
79d15d930e
|
Updated package-lock
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-02 11:50:36 +01:00 |
|
Carlos Satorres
|
a1d4dff7d8
|
Merge branch '5090-renameGoLabel' of https://gitea.verdnatura.es/verdnatura/salix into 5090-renameGoLabel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-02 11:48:50 +01:00 |
|
Carlos Satorres
|
6509a79b02
|
Deleted package-lock
|
2023-03-02 11:48:45 +01:00 |
|
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 |