Commit Graph

504 Commits

Author SHA1 Message Date
Carlos Satorres 071849065a refs #5334 fix main
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:55:35 +02:00
Carlos Satorres 598067f757 refs #5334 routes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:15:33 +02:00
Carlos Satorres 87e1caa4eb refs #5334 department seccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 10:43:06 +02:00
Alexandre Riera c2de5c5ff4 refs #4797 added redirection section
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-02 07:28:59 +02:00
Alex Moreno ac55dc4cc7 refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 14:17:19 +02:00
Alex Moreno c62f8e1c14 refs #5297 feat(worker): iban and bankEntity not required
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:13:14 +02:00
Vicent Llopis 5ace66ebca refs #5318 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:54:54 +02:00
Vicent Llopis be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 09:52:28 +02:00
Joan Sanchez 6f2aa0f618 Worker note ACL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:51:48 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Vicent Llopis 58750aa065 refs #5318 eliminido triggers y añadido loggable en salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 10:02:06 +02:00
Joan Sanchez 5732f9a33b Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-11 07:07:55 +00:00
Vicent Llopis 0db3bc5e26 refs #4856 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:29:51 +02:00
Vicent Llopis 862101c4b0 refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-03 21:29:02 +02:00
Joan Sanchez 8b4c70e8ba 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-30 14:57:00 +02:00
Vicent Llopis 5a67f47305 refs #4856 fix: actualizar estado a 'SENDED' movido al back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 08:14:17 +02:00
Vicent Llopis d066c4ea0b refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 11:27:48 +02:00
Carlos Satorres c68c78cc5b refs #5250 solucion error WorkerObserv
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 12:11:42 +01:00
Carlos Satorres fde854f5c2 refs #5250 campo de notes
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:21:15 +01:00
Vicent Llopis a87e0c52d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control 2023-03-16 07:32:04 +01:00
Vicent Llopis 4dc9e9e590 refs #4856 refactor: make agnostic the component calendar 2023-03-14 07:44:39 +01:00
Carlos Satorres e947672c69 Merge branch 'dev' into 5352-worker.create_swift/bic
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 14:36:51 +00: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 f461c75af1 feat: add front test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:06:31 +01:00
Vicent Llopis 776f7783c6 refactor code 2023-03-08 12:06:20 +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
Vicent Llopis 760690a625 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 09:51:21 +01:00
Joan Sanchez 3ad96b6ad7 Endpoint fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 11:55:13 +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 497d756af6 fix: autocompletar el switf/bic
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 13:46:18 +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
Vicent Llopis 3051768781 WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:50:23 +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
Alexandre Riera d5ea59e284 refs #5287 permisos añadidos
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 12:46:48 +01:00
Alexandre Riera 96e103d76e refs #5287 sections sorted
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 08:37:17 +01:00
Alexandre Riera 7a04b0b3de refs #5287 icon added
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 08:00:18 +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
Alexandre Riera 5d9220c5c0 refs #5287 locker added
gitea/salix/pipeline/head This commit looks good Details
2023-02-27 08:39:46 +01:00
Vicent Llopis 9b11987d75 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 14:33:38 +01:00
Vicent Llopis 9310e92223 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 10:44:08 +01:00
Vicent Llopis 35b47c6da2 refactor code
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 08:21:59 +01:00
Vicent Llopis 05d91ed50e feat: actualizada interfaz
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 15:12:25 +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
Joan Sanchez 12cf79ab39 Updated e2e 2023-01-25 14:14:55 +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 fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01: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 ecfad94057 refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:19:03 +01:00
Alex Moreno 9b98249398 test: front test and e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:23:18 +01:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +01:00
Alex Moreno 46c3d87dab feat(worker_create): add vn-acl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:09:46 +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
Alex Moreno 156f2b9129 feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 15:03:55 +01:00
Alex Moreno bb944f9fee feat(newWorker): use worker-welcome
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 15:05:49 +01:00
Alex Moreno db3a6df23d feat(worker): new worker 2022-11-14 15:19:16 +01:00
Vicent Llopis 11459bbd56 refactor: change column name 2022-11-08 08:46:36 +01:00
Vicent Llopis 6df74facdc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-11-02 14:23:20 +01:00
Vicent Llopis 57564325e1 feat: añadidas opciones para confirmar o no confirmar el registro de horas
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:22:18 +01:00
Vicent Llopis 786ba0d614 feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:34:34 +01:00
Pau 1d8fb25325 Refactored according to the suggested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 10:25:54 +02:00
Pau 3376293d1a Added user icon and fixed icon not updating
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 11:54:14 +02:00
Pau 1165e050eb feat: workerDisableExcluded update DB field
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 10:18:08 +02:00
Pau 600dd7a434 Created the model and UI 2022-10-05 11:52:14 +02:00
Vicent Llopis 3bf7efea16 feat: add phone extension and personal phone. Update bussiness phone
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 12:16:41 +02:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:12:28 +00:00
Vicent Llopis a348762153 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:09:05 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +02:00
Vicent Llopis 443db55f58 feat(worker_basic-data): add new fields
gitea/salix/pipeline/head This commit looks good Details
2022-03-31 09:18:18 +02:00
Carlos Jimenez Ruiz 74fb7c95c2 Merge branch 'dev' into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:18:13 +00:00
Vicent Llopis 133152460a fix: translate
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 14:14:41 +02:00
Vicent Llopis 4bdc29e283 refactor: calculate holidays through db procedures 2022-03-24 10:59:23 +01:00
Alex Moreno 254fee5036 feat(worker_calendar): repaint, fix front test and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 14:02:48 +01:00
Alex Moreno 0963b66560 fix(worker_calendar): absence in holiday day
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-23 13:06:17 +01:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Vicent Llopis e850fdaf4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays 2022-01-12 12:15:32 +01:00
Carlos Jimenez Ruiz 7b5e6e8a23 added shorcuts for order, monitor and worker modules
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 16:08:45 +01:00
Vicent Llopis 914fca0814 fix: delete unnecessary ng-if
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 10:28:06 +01:00
Vicent Llopis ac833ac625 feat: add field payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 11:30:28 +01:00
Vicent Llopis e1c4f144a7 feat: add code
gitea/salix/pipeline/head This commit looks good Details
2021-12-23 14:57:22 +01:00
Vicent Llopis 671a35f8c9 upload branch
gitea/salix/pipeline/head This commit looks good Details
2021-12-23 13:11:17 +01:00
Alex Moreno 594f258232 modify js date format
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 07:16:43 +01:00
Alex Moreno 85e3b47408 test(worker_time-control): tested url parameter timestamp
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-29 15:22:16 +01:00
Alex Moreno 65053f5f28 feat(worker_time-control): add timestamp url param
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 13:26:48 +01:00
Joan Sanchez 9c5939b661 Updated styles
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 16:02:47 +01:00
Joan Sanchez c98730e6b9 Updated styles
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 14:00:45 +01:00
Alex Moreno da80fee0e2 refactor(time-control): getWorkedHours.spec
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 10:09:44 +01:00
Alex Moreno 9e4627617d fix(time-control): modify select & refactor dates
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 14:08:44 +01:00
Joan Sanchez b3a34489b0 fix(calendar): Event colors were not showing properly
gitea/salix/pipeline/head This commit looks good Details
Refs: 3166
2021-10-04 09:30:55 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Joan Sanchez 4494522ad1 feat(calendar): component shows now the year week numbers
gitea/salix/pipeline/head This commit looks good Details
Refs: 2389
2021-09-16 12:13:20 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:38:41 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Carlos Jimenez Ruiz 1a045442d4 added acl to goToUser button on client and worker descriptors 2021-08-13 14:53:39 +02:00
Carlos Jimenez Ruiz ae4f1d1730 the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 10:09:24 +02:00
Carlos Jimenez Ruiz 4148500c61 workers without active contract no longer set calendar and timeControl at fault
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 14:05:16 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Joan Sanchez 0ff114ff36 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 12:32:37 +02:00
Joan Sanchez bc7c288742 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:03:55 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-17 15:09:04 +02:00
Joan Sanchez 59e90c2c10 Removed commented block
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 11:58:39 +02:00
Joan Sanchez a72010554c Fixes and E2E updated
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 10:58:00 +02:00
Joan Sanchez 8284702603 2567 - Working calendar refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 11:24:32 +02:00
Joan Sanchez 3c8629b3f3 Added entilementRate effects
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-08 16:36:16 +02:00
Joan Sanchez c853cfc86f Refactor 2021-06-04 15:49:48 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00
Joan Sanchez 714142f868 Merge branch 'dev' into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:53:33 +00:00
Joan Sanchez a9e33abacc FIX: Show employee list
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz c0e2ff12da moved vn-log to salix components + css changes and renamed worker-log to log 2021-05-18 13:22:40 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
jorgebl 1fd18cae5a QA
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 11:40:01 +01:00
jorgebl cdd903dedf removed line break because the app interpretate it's a space 2021-03-03 15:09:01 +01:00
jorgebl 56154181aa QA done 2021-03-03 13:39:25 +01:00
jorgebl 60ca3e87a5 Test git 2021-03-02 16:53:54 +01:00
jorgebl 3c82a4997b Test gitea 2021-03-02 16:52:14 +01:00
jorgebl 022d31c952 remove line break
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 14:43:55 +01:00
jorgebl 325a7e7235 Translate note
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 12:50:07 +01:00
jorgebl 094552e0f2 Added ellipsize and align label
gitea/salix/pipeline/head This commit looks good Details
2021-02-26 12:32:05 +01:00
jorgebl 1f1db53d41 Summary boss shown on descriptor 2021-02-24 16:12:44 +01:00
jorgebl 9855bd14fe Translate Boss
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 11:08:57 +01:00
jorgebl 8deb11d333 Added boss on basic data and summary 2021-02-19 17:45:45 +01:00
Joan Sanchez 2c9fd45958 2778 - Allow edit order number
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 12:09:48 +01:00
Joan Sanchez 84cef1949b Image size fix
gitea/salix/pipeline/head This commit looks good Details
2021-02-04 18:28:58 +01:00
Jorge Padawan b4899fc0ff Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 10:17:12 +01:00
Jorge Padawan f45aa7937d Added conditionals with rols to display or not the icons with link 2021-01-12 07:39:12 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +01:00
Joan Sanchez 6416b0ad79 2666 - Closure invalid email notification
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 14:56:21 +01:00
Carlos Jimenez Ruiz ec0ae8f07c years previous to contrar error corrected
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 13:52:37 +01:00
Joan Sanchez 6717853efb Updated front tests
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 18:02:41 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +01:00
Carlos Jimenez Ruiz e9f73c3299 worker module refactors 2020-12-16 10:32:32 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +01:00
Joan Sanchez 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Joan Sanchez 8eb14a8bdc 2588 - No ellipsize on summary notes or address
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 14:56:10 +01:00
Joan Sanchez 80bae4de0a 2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 08:22:54 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:41:51 +01:00
Juan Ferrer 80cbb53dfe Merge branch 'test' into dev 2020-11-13 10:49:59 +01:00
Juan Ferrer cdf6cb661f Login sync fixes 2020-11-13 10:33:34 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 16:47:39 +01:00
Carlos Jimenez Ruiz 25684ec521 small refactor timeControl index
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 13:46:36 +01:00
Joan Sanchez 011bba1660 Added vn-anchor to client and ticket index
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-19 09:05:38 +02:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 08:17:12 +02:00
Joan Sanchez 420dfdbdff Send notification by email
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 12:23:48 +02:00
Joan Sanchez d2dbf417f4 Updated to standard color
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 11:15:35 +02:00
Joan Sanchez d18d7670ec Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 10:44:12 +02:00
Joan Sanchez 53e729eddd 2366 - Merge event colors
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 10:14:53 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Joan Sanchez d0ac1b621c Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 09:06:11 +00:00
Joan Sanchez 03a0a22526 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:53:47 +02:00
Joan Sanchez ba9cfedec7 Worker calendar holiday name
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 07:59:27 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Joan Sanchez a3d3ed4aba Fixed unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 14:14:34 +02:00
Joan Sanchez 540d5e9e71 Fixed errors
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 13:50:08 +02:00
Joan Sanchez b50b30c792 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-11 12:16:19 +02:00
Joan Sanchez d17f289af9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter 2020-08-11 07:42:26 +02:00
Joan Sanchez 7833b87475 Added filter
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:44:57 +02:00
Joan Sanchez e2c742c893 #2383 - Changed model
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:29:25 +02:00
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz e126350079 scroll removed as it comes from layaout 2020-07-28 19:22:21 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good Details
2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +02:00
Joan Sanchez a07d960a2e Fixed test
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 12:09:50 +02:00
Joan Sanchez cbb2ad7f44 Removed duplicated test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-16 11:59:16 +02:00
Joan Sanchez bbf3b72001 Added front & back tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 10:04:16 +02:00
Joan Sanchez 2f9d80be7a Added ACL + unit tests
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-07-15 11:35:34 +02:00
Joan Sanchez 91e739547b Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-11 18:30:27 +02:00
Joan Sánchez 01b32d2b89 Calendar changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-08 15:05:56 +02:00
Joan Sánchez dd8e03dd0f Added absence selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-07 14:29:57 +02:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Bernat Exposito Domenech e24c5b00e9 fix descriptors
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 11:05:17 +02:00
Bernat Exposito Domenech 90541a4c13 fix client descriptor in log section 2020-06-05 12:13:05 +02:00
Joan Sanchez d24f04912e 2205 - Prevent relations to being logged in
gitea/salix/pipeline/head This commit has test failures Details
2020-05-26 14:37:34 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech 4133021e5c fix translate on plural
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 08:52:20 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:27:22 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-25 11:50:04 +02:00
Javi Gallego dad77cfa08 Merge branch 'dev' into #2219-Añadir-menu-wikipedia
gitea/salix/pipeline/head This commit looks good Details
2020-04-06 12:41:07 +02:00
Javi Gallego d835dd60ed 2219 Añadir menu wikipedia 2020-04-06 12:40:21 +02:00
Javi Gallego ea1cc68d29 test passed
gitea/salix/pipeline/head This commit looks good Details
2020-04-03 17:52:47 +02:00
Javi Gallego b6aedd2e6d Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 12:26:27 +02:00
Javi Gallego 0b966cbb76 Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 08:28:49 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:52:41 +01:00
Joan Sanchez e71ace6da7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:59:41 +01:00
Bernat Exposito Domenech dcdae825d2 fixex pull request
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 08:43:49 +01:00
Javi Gallego 0561f19313 version 1
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-24 17:34:23 +01:00
Javi Gallego a30a4bf961 quitado el campo provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:32:30 +01:00
Bernat Exposito Domenech 423f59dfb0 worker log
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 12:20:53 +01:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 12:00:53 +01:00
Joan Sanchez 3d23583e0b Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 14:08:04 +01:00
Joan Sanchez a9c622377e Refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 12:55:22 +01:00