Commit Graph

247 Commits

Author SHA1 Message Date
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
Juan Ferrer 56a21edeca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult 2020-03-16 18:33:39 +01:00
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Bernat Exposito Domenech f9abaa409a fix calendar-holiday model
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 13:10:04 +01:00
Bernat Exposito Domenech 6798f9709c update view holiday
gitea/salix/pipeline/head This commit looks good Details
2020-03-12 10:59:41 +01:00
Joan Sanchez 97671fd4a1 Merge branch '1878-print_with_auth' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 10:34:38 +00:00
Joan Sanchez fddc8e7ed1 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-05 14:49:41 +01:00
Carlos Jimenez Ruiz 0f7ed5bbfa get worked hours unit test 2020-03-03 15:14:28 +01:00
Joan Sanchez 03e952c83e Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 07:57:33 +01:00
Joan Sanchez 28553a1c0d Worker dms changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 07:50:07 +01:00
Joan Sanchez 28b7f5d3a2 2151 - Added thermograph edit section
gitea/salix/pipeline/head This commit has test failures Details
2020-02-28 14:18:55 +01:00
Joan Sanchez 25a1c0d2de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 08:34:42 +01:00
Joan Sanchez a8eea3d8f6 Changed primary key 2020-02-28 08:19:37 +01:00
Joan Sanchez 220f36d795 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 07:34:26 +01:00
Joan Sanchez 442541d0f8 Renamed rgb column 2020-02-28 07:24:36 +01:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Bernat Exposito Domenech 005adc252d worker dms index 2020-02-24 08:05:26 +01:00
Bernat Exposito Domenech 3f978bd32b entry index refactor
gitea/salix/2122-entry_index This commit looks good Details
2020-02-18 10:33:17 +01:00
Joan Sanchez e1942875af 1684 - Log transfer old values
gitea/salix/1684-ticket_transfer_salesLog Something is wrong with the build of this commit Details
2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech 7bb5b19398 refactor table holidayType and holidayDetail
gitea/salix/2040-update_view_holidays This commit looks good Details
2020-02-06 09:33:36 +01:00
Bernat Exposito Domenech 89dc8e27e0 update models
gitea/salix/2040_view_holiday This commit looks good Details
2020-02-04 11:20:05 +01:00
Bernat Exposito Domenech 759ac5b5c7 add icon in worker.index
gitea/salix/2020-worker_index This commit looks good Details
2020-02-03 14:03:09 +01:00
Bernat Exposito Domenech c07d5f337a fix getWorkerdHours
gitea/salix/fixGetWorkerHours This commit looks good Details
2020-01-30 11:20:41 +01:00
Bernat Exposito Domenech 9f73c68210 udate client.log styles
gitea/salix/1997-client_log This commit looks good Details
2020-01-24 14:22:11 +01:00
Javi Gallego 08fda3ed1b #workedHours
gitea/salix/%232037-worked-hours This commit looks good Details
2020-01-24 12:38:08 +01:00
Joan Sanchez 3ff1fb7d2d Added back unit tests
gitea/salix/2015-chat_sendCheckingPresence This commit looks good Details
2020-01-20 11:59:15 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 8a36e0913f changed fixtures for dynamic holidays
gitea/salix/1924-worker_calendar_dynamic_holidays This commit looks good Details
2020-01-03 08:43:03 +01:00
Joan Sanchez 7fb3f75808 changed comparator
gitea/salix/1966-teamBoss_worker_time_control This commit looks good Details
2020-01-02 11:21:11 +01:00
Joan Sanchez 8f92abe49c fixed procedure bug
gitea/salix/1967-worker_time_control_worked_hours This commit looks good Details
2019-12-31 14:01:05 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good Details
2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech 9a6c8db140 focus on the dialog
gitea/salix/1937-workerDepartment This commit looks good Details
2019-12-20 08:32:02 +01:00
Joan Sanchez f42f46dc42 Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
2019-12-17 12:53:06 +00:00
Joan Sanchez 8ddcd5a654 ACL fixes
gitea/salix/master This commit looks good Details
2019-12-17 12:18:17 +01:00