 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
|
de30a2d978
|
Total holidays fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 08:09:53 +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
|
3f3e5c2735
|
Unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 16:05:10 +02:00 |
|
Joan Sanchez
|
1b62233ea7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework
|
2021-06-10 14:22:13 +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
|
8fa64122f8
|
Ammends
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-07 14:58:24 +02:00 |
|
Carlos Jimenez Ruiz
|
a46fef5295
|
endpoint minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 14:26:34 +02:00 |
|
Joan Sanchez
|
c853cfc86f
|
Refactor
|
2021-06-04 15:49:48 +02:00 |
|
Joan Sanchez
|
b77ecc2c06
|
changes2
|
2021-06-04 11:45:35 +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 |
|
Carlos Jimenez Ruiz
|
b2ecd7d3c2
|
Merge branch 'dev' into 2878-activeWorkers_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-14 08:15:06 +00:00 |
|
Joan Sanchez
|
dac95805e8
|
2882 - Replaced worker userFk property by user id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-14 09:02:08 +02:00 |
|
Joan Sanchez
|
78313bd9a7
|
Updated unit tests
|
2021-04-14 08:15:03 +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 |
|
Joan Sanchez
|
dea858c314
|
Removed focus
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 10:12:37 +01:00 |
|
Joan Sanchez
|
a21d8acde6
|
2762 - Delete entry ass teamBoss
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-02 10:07:13 +01:00 |
|
Joan Sanchez
|
f5f4c5936d
|
2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 09:29:47 +01:00 |
|
Joan Sanchez
|
dd29b351d2
|
Disabled loggable
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-12 14:25:01 +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 |
 Bernat Exposito
|
4d91b26537
|
checkinbox moved to worker
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-20 13:35:01 +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 |
Carlos Jimenez Ruiz
|
a797a2db8b
|
fixed the absences unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-23 13:34:57 +02:00 |
|
Joan Sanchez
|
3c37f0e993
|
Merge branch 'dev' into 2428-anchor_directive
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 08:32:31 +00: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 |
|
Carlos Jimenez Ruiz
|
b6b84cfea7
|
more tests fixed + small refactors
|
2020-10-08 16:00:19 +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
|
71e29e747a
|
Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 14:45:39 +02:00 |
|
Joan Sanchez
|
d0ece57219
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 10:09:36 +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
|
58965a9687
|
Enabled loggable on calendar model
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-30 07:38:43 +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 |
Bernat Exposito Domenech
|
ce1c4e6f60
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
|
2020-09-22 14:00:52 +02:00 |
|
Bernat Exposito Domenech
|
06f03c6b84
|
mail models and fix checkInbox
|
2020-09-22 13:59:00 +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
|
87fa66fe8c
|
Updated methods description
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-16 11:45:44 +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 |
 Javi Gallego
|
039eec7d26
|
test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-30 10:16:22 +02:00 |
|
Javi Gallego
|
db06626675
|
refactor
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-29 14:26:27 +02:00 |
|
Joan Sanchez
|
8729d1c765
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-19 10:35:57 +02:00 |
|
Joan Sanchez
|
41eeaeef0b
|
Entitlement rate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-19 09:58:09 +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 |
|
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 |
|
Juan Ferrer
|
d1341c2758
|
Hotfixes
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-12-17 09:23:11 +01:00 |
|
Joan Sanchez
|
ef95244d07
|
stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good
Details
|
2019-12-17 08:38:36 +01:00 |
|
Bernat Exposito Domenech
|
2e68ad0d01
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1858testworkerPhone
gitea/salix/1858testworkerPhone This commit looks good
Details
|
2019-12-13 10:54:52 +01:00 |
|
Juan Ferrer
|
d61b08ed10
|
Merge branch '1922-mysql8' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-12 13:49:05 +00:00 |
|
Bernat Exposito Domenech
|
a87ce44f08
|
test front worker.phone
gitea/salix/1858testworkerPhone This commit looks good
Details
|
2019-12-12 12:23:31 +01:00 |
|
Joan Sanchez
|
62aae9ce14
|
removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good
Details
|
2019-12-12 09:46:29 +01:00 |
|
Juan Ferrer
|
3428dfa6e0
|
Migration complete & test
|
2019-12-11 15:01:01 +01:00 |
|
Joan Sanchez
|
f9dba9489f
|
updated tests
gitea/salix/1762-worker_dms This commit looks good
Details
|
2019-11-25 09:17:24 +01:00 |
|
Joan Sanchez
|
a077dd5165
|
test unitario
gitea/salix/1762-worker_dms There was a failure building this commit
Details
|
2019-11-22 14:34:20 +01:00 |
|
Joan Sanchez
|
3c144ea0cd
|
transaction changes
gitea/salix/1762-worker_dms There was a failure building this commit
Details
|
2019-11-22 13:46:38 +01:00 |
|
Joan Sanchez
|
5aae48c7dc
|
added gestdoc
gitea/salix/1762-worker_dms There was a failure building this commit
Details
|
2019-11-22 10:42:05 +01:00 |
|
Carlos Jimenez Ruiz
|
6a0783d22f
|
#1891 tests for worker time control function
|
2019-11-21 11:16:10 +01:00 |
|
Carlos Jimenez Ruiz
|
c04640bd62
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
|
2019-11-21 09:19:15 +01:00 |
|
Carlos Jimenez Ruiz
|
52a8d5e0c2
|
#1891 tests for worker time control function
|
2019-11-21 09:19:03 +01:00 |
|
Bernat
|
d1dfa126c0
|
#1711 Eliminar referencias al esquema vn2008
|
2019-11-21 09:08:43 +01:00 |
|
Carlos Jimenez Ruiz
|
6929e3d497
|
#1889 absences() unit test fixed + refactor
gitea/salix/dev This commit looks good
Details
|
2019-11-20 14:22:44 +01:00 |
|
Bernat
|
9743b61f63
|
delete endpoint getWorkerInfo
gitea/salix/dev Build queued...
Details
|
2019-11-19 11:51:47 +01:00 |
|
Bernat
|
12825f0503
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-19 11:43:00 +01:00 |
|
Carlos Jimenez Ruiz
|
f998a04808
|
#1852 worker.time-control
|
2019-11-18 16:37:33 +01:00 |
|
Carlos Jimenez Ruiz
|
3c2ad2df48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 12:35:30 +01:00 |
|
Carlos Jimenez Ruiz
|
7c199b5d74
|
#1852 worker.time-control
|
2019-11-18 11:00:09 +01:00 |
|
Joan Sanchez
|
c83a97d7ec
|
holidays fix #1853
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:44:11 +01:00 |
|
Carlos Jimenez Ruiz
|
d1b114de59
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-15 10:37:42 +01:00 |
|
Joan Sanchez
|
ddb19cb198
|
added event
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:03:46 +01:00 |
|
Carlos Jimenez Ruiz
|
8629b72d55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-14 14:22:22 +01:00 |
|
Carlos Jimenez Ruiz
|
34bd35ce4e
|
#1852 worker.time-control
|
2019-11-14 14:20:05 +01:00 |
|
Juan Ferrer
|
4436acec10
|
Merge
|
2019-11-14 14:07:48 +01:00 |
|
Joan Sanchez
|
5561ff169e
|
deprecated worker.sendMessage()
|
2019-11-14 11:21:08 +01:00 |
|
Bernat
|
dfd29ced70
|
1711 delete references
|
2019-11-13 11:04:52 +01:00 |
|
Juan Ferrer
|
976782738e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor
|
2019-11-10 13:27:31 +01:00 |
|
Juan Ferrer
|
515234187a
|
First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit
Details
|
2019-11-10 11:08:44 +01:00 |
|
Carlos Jimenez Ruiz
|
76f3dc48e5
|
#1852 worker.time-control
|
2019-11-05 11:57:05 +01:00 |
|
Carlos Jimenez Ruiz
|
b9be0188d8
|
manual merge
|
2019-11-05 09:05:00 +01:00 |
|
Carlos Jimenez Ruiz
|
03ab88bcd9
|
#1852 worker.time-control
|
2019-11-05 08:59:48 +01:00 |